diff options
| author | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-26 23:29:19 +0000 |
|---|---|---|
| committer | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-26 23:29:19 +0000 |
| commit | 844bf242eb8cf058a52dd523164278bfbde23f42 (patch) | |
| tree | 2ed5864945e7983fdbe23be2bde8fa09d758a11e /chrome/browser/extensions/extension_menu_manager_unittest.cc | |
| parent | 5bd1c88a74cefc0d924be9ba6b6f0eb23972f00c (diff) | |
| download | chromium_src-844bf242eb8cf058a52dd523164278bfbde23f42.zip chromium_src-844bf242eb8cf058a52dd523164278bfbde23f42.tar.gz chromium_src-844bf242eb8cf058a52dd523164278bfbde23f42.tar.bz2 | |
Revert 63962 (broke chromeos and chromium linux builder) - Unrevert r63919: "Part 2 of immutable Extension refactor."
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/4186002
TBR=mpcomplete@chromium.org
Review URL: http://codereview.chromium.org/4130004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@63976 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/extension_menu_manager_unittest.cc')
| -rw-r--r-- | chrome/browser/extensions/extension_menu_manager_unittest.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/extensions/extension_menu_manager_unittest.cc b/chrome/browser/extensions/extension_menu_manager_unittest.cc index 489b5c6..0b653ba 100644 --- a/chrome/browser/extensions/extension_menu_manager_unittest.cc +++ b/chrome/browser/extensions/extension_menu_manager_unittest.cc @@ -44,14 +44,14 @@ class ExtensionMenuManagerTest : public testing::Test { // Creates and returns a test Extension. The caller does *not* own the return // value. Extension* AddExtension(std::string name) { - scoped_refptr<Extension> extension = prefs_.AddExtension(name); + Extension* extension = prefs_.AddExtension(name); extensions_.push_back(extension); return extension; } protected: ExtensionMenuManager manager_; - ExtensionList extensions_; + ScopedVector<Extension> extensions_; TestExtensionPrefs prefs_; int next_id_; |