summaryrefslogtreecommitdiffstats
path: root/chrome/browser/extensions/extension_browsertest.cc
diff options
context:
space:
mode:
authorrdevlin.cronin@chromium.org <rdevlin.cronin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-07-24 23:20:27 +0000
committerrdevlin.cronin@chromium.org <rdevlin.cronin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-07-24 23:20:27 +0000
commitbf3d9dfc19173760812dfcf308c852eabf894a18 (patch)
tree09882a66b43ee3901a6eb80107eab4db5a5ea5ba /chrome/browser/extensions/extension_browsertest.cc
parent0758e62b5772c5a15bbeb7a211607bae9b05facb (diff)
downloadchromium_src-bf3d9dfc19173760812dfcf308c852eabf894a18.zip
chromium_src-bf3d9dfc19173760812dfcf308c852eabf894a18.tar.gz
chromium_src-bf3d9dfc19173760812dfcf308c852eabf894a18.tar.bz2
Moved CrxInstaller and CrxInstallerError into extensions namespace
BUG=134756, 117261 Review URL: https://chromiumcodereview.appspot.com/10683003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@148244 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/extension_browsertest.cc')
-rw-r--r--chrome/browser/extensions/extension_browsertest.cc10
1 files changed, 5 insertions, 5 deletions
diff --git a/chrome/browser/extensions/extension_browsertest.cc b/chrome/browser/extensions/extension_browsertest.cc
index 960e3a0..b89ae3b 100644
--- a/chrome/browser/extensions/extension_browsertest.cc
+++ b/chrome/browser/extensions/extension_browsertest.cc
@@ -245,7 +245,7 @@ class MockAbortExtensionInstallPrompt : public ExtensionInstallPrompt {
virtual void OnInstallSuccess(const Extension* extension, SkBitmap* icon) {}
- virtual void OnInstallFailure(const CrxInstallerError& error) {}
+ virtual void OnInstallFailure(const extensions::CrxInstallerError& error) {}
};
class MockAutoConfirmExtensionInstallPrompt : public ExtensionInstallPrompt {
@@ -312,18 +312,18 @@ const Extension* ExtensionBrowserTest::InstallOrUpdateExtension(
if (crx_path.empty())
return NULL;
- scoped_refptr<CrxInstaller> installer(
- CrxInstaller::Create(service, install_ui));
+ scoped_refptr<extensions::CrxInstaller> installer(
+ extensions::CrxInstaller::Create(service, install_ui));
installer->set_expected_id(id);
installer->set_is_gallery_install(from_webstore);
if (!from_webstore) {
installer->set_off_store_install_allow_reason(
- CrxInstaller::OffStoreInstallAllowedInTest);
+ extensions::CrxInstaller::OffStoreInstallAllowedInTest);
}
content::NotificationRegistrar registrar;
registrar.Add(this, chrome::NOTIFICATION_CRX_INSTALLER_DONE,
- content::Source<CrxInstaller>(installer.get()));
+ content::Source<extensions::CrxInstaller>(installer.get()));
installer->InstallCrx(crx_path);