diff options
author | mpcomplete@chromium.org <mpcomplete@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-27 20:37:41 +0000 |
---|---|---|
committer | mpcomplete@chromium.org <mpcomplete@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-27 20:37:41 +0000 |
commit | 66e4eb3c01053c6642804a4f8e188bd05aab4790 (patch) | |
tree | fe227c6799230954c48cd70db60d05eae63cbe44 /chrome/browser/tabs | |
parent | a3ed6c82468f9f704a1b7e112ea3c132adb5ea2e (diff) | |
download | chromium_src-66e4eb3c01053c6642804a4f8e188bd05aab4790.zip chromium_src-66e4eb3c01053c6642804a4f8e188bd05aab4790.tar.gz chromium_src-66e4eb3c01053c6642804a4f8e188bd05aab4790.tar.bz2 |
Unrevert again r63919: "Part 2 of immutable Extension refactor."
(Last landing broke chromeos and chromium linux builder.)
I made Extension a refcounted object, and privitized the existing
con/destructor and InitFromValue. The only way to get an Extension is to call
a factory method.
In the next CL, I plan to make the factory method return a const Extension,
to guarantee that no one can modify the Extension object after creation.
Note: There was a tricky part of this CL because of the difference in
semantics between scoped_ptr and scoped_refptr. I had to be careful not to use
ptr.release(), since that would result in leaks (an un-Released AddRef).
BUG=56558
TEST=no functional change
Original Review URL: http://codereview.chromium.org/3982001
TBR=aa
Review URL: http://codereview.chromium.org/4119010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@64139 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/tabs')
-rw-r--r-- | chrome/browser/tabs/tab_strip_model_unittest.cc | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/chrome/browser/tabs/tab_strip_model_unittest.cc b/chrome/browser/tabs/tab_strip_model_unittest.cc index 976509f..906119c 100644 --- a/chrome/browser/tabs/tab_strip_model_unittest.cc +++ b/chrome/browser/tabs/tab_strip_model_unittest.cc @@ -1511,12 +1511,13 @@ TEST_F(TabStripModelTest, Apps) { #elif defined(OS_POSIX) FilePath path(FILE_PATH_LITERAL("/foo")); #endif - Extension extension_app(path); - extension_app.mutable_static_data_->launch_web_url = "http://www.google.com"; + scoped_refptr<Extension> extension_app(new Extension(path, + Extension::INVALID)); + extension_app->mutable_static_data_->launch_web_url = "http://www.google.com"; TabContents* contents1 = CreateTabContents(); - contents1->SetExtensionApp(&extension_app); + contents1->SetExtensionApp(extension_app); TabContents* contents2 = CreateTabContents(); - contents2->SetExtensionApp(&extension_app); + contents2->SetExtensionApp(extension_app); TabContents* contents3 = CreateTabContents(); SetID(contents1, 1); |