diff options
| author | mpcomplete@chromium.org <mpcomplete@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-26 19:11:38 +0000 |
|---|---|---|
| committer | mpcomplete@chromium.org <mpcomplete@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-26 19:11:38 +0000 |
| commit | c366ad280c032aed580af147b2285d45649ad29b (patch) | |
| tree | 8aef07bf9b5b862e1c623826c527492c9fe12dee /chrome/browser/cocoa | |
| parent | d6b3999f71631506c1b390707f205929bdfa221e (diff) | |
| download | chromium_src-c366ad280c032aed580af147b2285d45649ad29b.zip chromium_src-c366ad280c032aed580af147b2285d45649ad29b.tar.gz chromium_src-c366ad280c032aed580af147b2285d45649ad29b.tar.bz2 | |
Revert r63919 "Part 2 of immutable Extension refactor."
Compile failure on Linux x64.
BUG=56558
TEST=no functional change
TBR=aa
Review URL: http://codereview.chromium.org/4156002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@63925 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/cocoa')
| -rw-r--r-- | chrome/browser/cocoa/extension_installed_bubble_controller_unittest.mm | 16 | ||||
| -rw-r--r-- | chrome/browser/cocoa/extensions/extension_install_prompt_controller_unittest.mm | 9 |
2 files changed, 14 insertions, 11 deletions
diff --git a/chrome/browser/cocoa/extension_installed_bubble_controller_unittest.mm b/chrome/browser/cocoa/extension_installed_bubble_controller_unittest.mm index ad68c85..adcc426 100644 --- a/chrome/browser/cocoa/extension_installed_bubble_controller_unittest.mm +++ b/chrome/browser/cocoa/extension_installed_bubble_controller_unittest.mm @@ -75,8 +75,7 @@ class ExtensionInstalledBubbleControllerTest : public CocoaTest { // Create a skeletal framework of either page action or browser action // type. This extension only needs to have a type and a name to initialize // the ExtensionInstalledBubble for unit testing. - scoped_refptr<Extension> CreateExtension( - extension_installed_bubble::ExtensionType type) { + Extension* CreateExtension(extension_installed_bubble::ExtensionType type) { FilePath path; PathService::Get(chrome::DIR_TEST_DATA, &path); path = path.AppendASCII("extensions").AppendASCII("dummy"); @@ -99,9 +98,10 @@ class ExtensionInstalledBubbleControllerTest : public CocoaTest { extension_input_value.Set(keys::kBrowserAction, browser_action); } + Extension* extension = new Extension(path); std::string error; - return Extension::Create( - path, Extension::INVALID, extension_input_value, false, &error); + extension->InitFromValue(extension_input_value, false, &error); + return extension; } // Allows us to create the window and browser for testing. @@ -114,7 +114,7 @@ class ExtensionInstalledBubbleControllerTest : public CocoaTest { Browser* browser_; // weak, owned by BrowserTestHelper. // Skeleton extension to be tested; reinitialized for each test. - scoped_refptr<Extension> extension_; + scoped_ptr<Extension> extension_; // The icon_ to be loaded into the bubble window. SkBitmap icon_; @@ -122,7 +122,8 @@ class ExtensionInstalledBubbleControllerTest : public CocoaTest { // Confirm that window sizes are set correctly for a page action extension. TEST_F(ExtensionInstalledBubbleControllerTest, PageActionTest) { - extension_ = CreateExtension(extension_installed_bubble::kPageAction); + extension_.reset( + CreateExtension(extension_installed_bubble::kPageAction)); ExtensionInstalledBubbleControllerForTest* controller = [[ExtensionInstalledBubbleControllerForTest alloc] initWithParentWindow:window_ @@ -165,7 +166,8 @@ TEST_F(ExtensionInstalledBubbleControllerTest, PageActionTest) { } TEST_F(ExtensionInstalledBubbleControllerTest, BrowserActionTest) { - extension_ = CreateExtension(extension_installed_bubble::kBrowserAction); + extension_.reset( + CreateExtension(extension_installed_bubble::kBrowserAction)); ExtensionInstalledBubbleControllerForTest* controller = [[ExtensionInstalledBubbleControllerForTest alloc] initWithParentWindow:window_ diff --git a/chrome/browser/cocoa/extensions/extension_install_prompt_controller_unittest.mm b/chrome/browser/cocoa/extensions/extension_install_prompt_controller_unittest.mm index 12eadff..f596851 100644 --- a/chrome/browser/cocoa/extensions/extension_install_prompt_controller_unittest.mm +++ b/chrome/browser/cocoa/extensions/extension_install_prompt_controller_unittest.mm @@ -60,18 +60,19 @@ public: return; } - extension_ = Extension::Create( - path.DirName(), Extension::INVALID, *value, false, &error); - if (!extension_.get()) { + scoped_ptr<Extension> extension(new Extension(path.DirName())); + if (!extension->InitFromValue(*value, false, &error)) { LOG(ERROR) << error; return; } + + extension_.reset(extension.release()); } BrowserTestHelper helper_; FilePath test_data_dir_; SkBitmap icon_; - scoped_refptr<Extension> extension_; + scoped_ptr<Extension> extension_; }; |