5 files changed, 8 insertions, 22 deletions
diff --git a/extensions/shell/browser/shell_browser_main_parts.cc b/extensions/shell/browser/shell_browser_main_parts.cc
index 073dacb..0153679 100644
--- a/extensions/shell/browser/shell_browser_main_parts.cc
+++ b/extensions/shell/browser/shell_browser_main_parts.cc
@@ -73,13 +73,6 @@ using content::BrowserThread;
 
 namespace extensions {
 
-namespace {
-
-void CrxInstallComplete(bool success) {
-  VLOG(1) << "CRX download complete. Success: " << success;
-}
-}
-
 ShellBrowserMainParts::ShellBrowserMainParts(
     const content::MainFunctionParams& parameters,
     ShellBrowserMainDelegate* browser_main_delegate)
@@ -211,17 +204,6 @@ void ShellBrowserMainParts::PreMainMessageLoopRun() {
       base::Bind(nacl::NaClProcessHost::EarlyStartup));
 #endif
 
-  // TODO(rockot): Remove this temporary hack test.
-  std::string install_crx_id =
-      cmd->GetSwitchValueASCII(switches::kAppShellInstallCrx);
-  if (install_crx_id.size() != 0) {
-    CHECK(install_crx_id.size() == 32)
-        << "Extension ID must be exactly 32 characters long.";
-    UpdateService* update_service = UpdateService::Get(browser_context_.get());
-    update_service->DownloadAndInstall(install_crx_id,
-                                       base::Bind(CrxInstallComplete));
-  }
-
   devtools_http_handler_.reset(
       content::ShellDevToolsManagerDelegate::CreateHttpHandler(
           browser_context_.get()));
diff --git a/extensions/shell/browser/shell_extension_system.cc b/extensions/shell/browser/shell_extension_system.cc
index 0457491..b6cff6a 100644
--- a/extensions/shell/browser/shell_extension_system.cc
+++ b/extensions/shell/browser/shell_extension_system.cc
@@ -176,6 +176,12 @@ scoped_ptr<ExtensionSet> ShellExtensionSystem::GetDependentExtensions(
   return make_scoped_ptr(new ExtensionSet());
 }
 
+void ShellExtensionSystem::InstallUpdate(const std::string& extension_id,
+                                         const base::FilePath& temp_dir) {
+  NOTREACHED();
+  base::DeleteFile(temp_dir, true /* recursive */);
+}
+
 void ShellExtensionSystem::OnExtensionRegisteredWithRequestContexts(
     scoped_refptr<Extension> extension) {
   ExtensionRegistry* registry = ExtensionRegistry::Get(browser_context_);
diff --git a/extensions/shell/browser/shell_extension_system.h b/extensions/shell/browser/shell_extension_system.h
index f042f2d..ca2cb5e 100644
--- a/extensions/shell/browser/shell_extension_system.h
+++ b/extensions/shell/browser/shell_extension_system.h
@@ -64,6 +64,8 @@ class ShellExtensionSystem : public ExtensionSystem {
   ContentVerifier* content_verifier() override;
   scoped_ptr<ExtensionSet> GetDependentExtensions(
       const Extension* extension) override;
+  void InstallUpdate(const std::string& extension_id,
+                     const base::FilePath& temp_dir) override;
 
  private:
   void OnExtensionRegisteredWithRequestContexts(
diff --git a/extensions/shell/common/switches.cc b/extensions/shell/common/switches.cc
index fbb5783..66bd7e5 100644
--- a/extensions/shell/common/switches.cc
+++ b/extensions/shell/common/switches.cc
@@ -13,9 +13,6 @@ const char kAppShellAllowRoaming[] = "app-shell-allow-roaming";
 // Size for the host window to create (i.e. "800x600").
 const char kAppShellHostWindowSize[] = "app-shell-host-window-size";
 
-// ID of an extension CRX to be downloaded from the web store.
-const char kAppShellInstallCrx[] = "app-shell-install-crx";
-
 // SSID of the preferred WiFi network.
 const char kAppShellPreferredNetwork[] = "app-shell-preferred-network";
 
diff --git a/extensions/shell/common/switches.h b/extensions/shell/common/switches.h
index b6b3932..7cfe1d6 100644
--- a/extensions/shell/common/switches.h
+++ b/extensions/shell/common/switches.h
@@ -12,7 +12,6 @@ namespace switches {
 // alongside the definition of their values in the .cc file.
 extern const char kAppShellAllowRoaming[];
 extern const char kAppShellHostWindowSize[];
-extern const char kAppShellInstallCrx[];
 extern const char kAppShellPreferredNetwork[];
 extern const char kAppShellRefreshToken[];
 extern const char kAppShellUser[];