diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-13 18:17:18 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-13 18:17:18 +0000 |
| commit | 67351452e1e16cb9b01c609ce185a9e819cf2254 (patch) | |
| tree | 23a1b83b3428a729472a938a48ba9c5a1cf5c812 /chrome/test/testing_profile.cc | |
| parent | 66bc3e9561541e0a24e6c5dac7e87af5d1403c54 (diff) | |
| download | chromium_src-67351452e1e16cb9b01c609ce185a9e819cf2254.zip chromium_src-67351452e1e16cb9b01c609ce185a9e819cf2254.tar.gz chromium_src-67351452e1e16cb9b01c609ce185a9e819cf2254.tar.bz2 | |
Get rid of the ProfileId. It was added for ceee. I reverted the original change, since it led to Profile being used in content unnecessarily. I also removed the extensions usage of it and instead kept a void*.
BUG=76788
Review URL: http://codereview.chromium.org/7346024
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@92382 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/testing_profile.cc')
| -rw-r--r-- | chrome/test/testing_profile.cc | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/chrome/test/testing_profile.cc b/chrome/test/testing_profile.cc index 32abb73..dece6f6 100644 --- a/chrome/test/testing_profile.cc +++ b/chrome/test/testing_profile.cc @@ -367,10 +367,6 @@ std::string TestingProfile::GetProfileName() { return std::string("testing_profile"); } -ProfileId TestingProfile::GetRuntimeId() { - return reinterpret_cast<ProfileId>(this); -} - bool TestingProfile::IsOffTheRecord() { return incognito_; } @@ -797,12 +793,3 @@ void TestingProfile::DestroyWebDataService() { web_data_service_->Shutdown(); } - -DerivedTestingProfile::DerivedTestingProfile(Profile* profile) - : original_profile_(profile) {} - -DerivedTestingProfile::~DerivedTestingProfile() {} - -ProfileId DerivedTestingProfile::GetRuntimeId() { - return original_profile_->GetRuntimeId(); -} |