6 files changed, 1 insertions, 20 deletions
diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
index 1df60b6..bfe0d4e 100644
--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
@@ -318,7 +318,6 @@ void ChromeContentBrowserClient::AppendExtraCommandLineSwitches(
       switches::kEnableCrxlessWebApps,
       switches::kEnableExperimentalExtensionApis,
       switches::kEnableInBrowserThumbnailing,
-      switches::kEnableInlineWebstoreInstall,
       switches::kEnableIPCFuzzing,
       switches::kEnableNaCl,
       switches::kEnablePrintPreview,
diff --git a/chrome/browser/extensions/extension_tab_helper.cc b/chrome/browser/extensions/extension_tab_helper.cc
index 81615c4..df7209c 100644
--- a/chrome/browser/extensions/extension_tab_helper.cc
+++ b/chrome/browser/extensions/extension_tab_helper.cc
@@ -4,7 +4,6 @@
 
 #include "chrome/browser/extensions/extension_tab_helper.h"
 
-#include "base/command_line.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/webstore_inline_installer.h"
 #include "chrome/browser/profiles/profile.h"
@@ -14,7 +13,6 @@
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper_delegate.h"
 #include "chrome/common/chrome_notification_types.h"
-#include "chrome/common/chrome_switches.h"
 #include "chrome/common/extensions/extension_action.h"
 #include "chrome/common/extensions/extension_constants.h"
 #include "chrome/common/extensions/extension_icon_set.h"
@@ -152,11 +150,6 @@ void ExtensionTabHelper::OnInlineWebstoreInstall(
     int install_id,
     const std::string& webstore_item_id,
     const GURL& requestor_url) {
-  if (!CommandLine::ForCurrentProcess()->HasSwitch(
-          switches::kEnableInlineWebstoreInstall)) {
-    return;
-  }
-
   scoped_refptr<WebstoreInlineInstaller> installer(new WebstoreInlineInstaller(
       tab_contents(), install_id, webstore_item_id, requestor_url, this));
   installer->BeginInstall();
diff --git a/chrome/browser/extensions/webstore_inline_install_browsertest.cc b/chrome/browser/extensions/webstore_inline_install_browsertest.cc
index bd91434..f6af718 100644
--- a/chrome/browser/extensions/webstore_inline_install_browsertest.cc
+++ b/chrome/browser/extensions/webstore_inline_install_browsertest.cc
@@ -46,8 +46,6 @@ class WebstoreInlineInstallTest : public InProcessBrowserTest {
     GURL crx_url = GenerateTestServerUrl(kWebstoreDomain, "extension.crx");
     CommandLine::ForCurrentProcess()->AppendSwitchASCII(
         switches::kAppsGalleryUpdateURL, crx_url.spec());
-
-    command_line->AppendSwitch(switches::kEnableInlineWebstoreInstall);
   }
 
   virtual void SetUpInProcessBrowserTestFixture() OVERRIDE {
diff --git a/chrome/common/chrome_switches.cc b/chrome/common/chrome_switches.cc
index 9ca489e..1f654b7 100644
--- a/chrome/common/chrome_switches.cc
+++ b/chrome/common/chrome_switches.cc
@@ -451,10 +451,6 @@ const char kEnableHistoryQuickProvider[]    = "enable-history-quick-provider";
 // if we need to update thumbnails.
 const char kEnableInBrowserThumbnailing[]   = "enable-in-browser-thumbnailing";
 
-// Enables web developers to initiate inline installation of Chrome Web Store
-// items.
-const char kEnableInlineWebstoreInstall[]   = "enable-inline-webstore-install";
-
 // Enable IPv6 support, even if probes suggest that it may not be fully
 // supported.  Some probes may require internet connections, and this flag will
 // allow support independent of application testing.
diff --git a/chrome/common/chrome_switches.h b/chrome/common/chrome_switches.h
index 0c538fd..1aa0469 100644
--- a/chrome/common/chrome_switches.h
+++ b/chrome/common/chrome_switches.h
@@ -131,7 +131,6 @@ extern const char kEnableFastback[];
 extern const char kEnableFileCookies[];
 extern const char kEnableHistoryQuickProvider[];
 extern const char kEnableInBrowserThumbnailing[];
-extern const char kEnableInlineWebstoreInstall[];
 extern const char kEnableIPv6[];
 extern const char kEnableIPCFuzzing[];
 extern const char kEnableIPPooling[];
diff --git a/chrome/renderer/extensions/extension_dispatcher.cc b/chrome/renderer/extensions/extension_dispatcher.cc
index 85c4e70..7e92b53 100644
--- a/chrome/renderer/extensions/extension_dispatcher.cc
+++ b/chrome/renderer/extensions/extension_dispatcher.cc
@@ -85,11 +85,7 @@ void ExtensionDispatcher::WebKitInitialized() {
   }
 
   RegisterExtension(extensions_v8::ChromeAppExtension::Get(this), false);
-
-  if (CommandLine::ForCurrentProcess()->HasSwitch(
-          switches::kEnableInlineWebstoreInstall)) {
-    RegisterExtension(ChromeWebstoreExtension::Get(), false);
-  }
+  RegisterExtension(ChromeWebstoreExtension::Get(), false);
 
   // Add v8 extensions related to chrome extensions.
   RegisterExtension(ExtensionProcessBindings::Get(this), true);