7 files changed, 3 insertions, 15 deletions
diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
index df476c6..0847e39 100644
--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
@@ -924,7 +924,6 @@ void ChromeContentBrowserClient::AppendExtraCommandLineSwitches(
       switches::kEnablePasswordGeneration,
       switches::kEnablePnacl,
       switches::kEnableWatchdog,
-      switches::kEnableWebView,
       switches::kMemoryProfiling,
       switches::kMessageLoopHistogrammer,
       switches::kNoJsRandomness,
diff --git a/chrome/browser/extensions/web_view_browsertest.cc b/chrome/browser/extensions/web_view_browsertest.cc
index 889af15..7d24a16 100644
--- a/chrome/browser/extensions/web_view_browsertest.cc
+++ b/chrome/browser/extensions/web_view_browsertest.cc
@@ -5,7 +5,6 @@
 #include "chrome/browser/automation/automation_util.h"
 #include "chrome/browser/extensions/platform_app_browsertest_util.h"
 #include "chrome/browser/ui/browser_tabstrip.h"
-#include "chrome/common/chrome_switches.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "chrome/test/base/test_launcher_utils.h"
 #include "content/public/browser/notification_service.h"
@@ -18,8 +17,6 @@ class WebViewTest : public extensions::PlatformAppBrowserTest {
  protected:
   virtual void SetUpCommandLine(CommandLine* command_line) {
     extensions::PlatformAppBrowserTest::SetUpCommandLine(command_line);
-    // Enable <webview> for running test.
-    command_line->AppendSwitch(switches::kEnableWebView);
 #if !defined(OS_MACOSX)
     CHECK(test_launcher_utils::OverrideGLImplementation(
           command_line, gfx::kGLImplementationOSMesaName)) <<
diff --git a/chrome/common/chrome_switches.cc b/chrome/common/chrome_switches.cc
index cd84232..32e45ab 100644
--- a/chrome/common/chrome_switches.cc
+++ b/chrome/common/chrome_switches.cc
@@ -658,9 +658,6 @@ const char kEnableWatchdog[]                = "enable-watchdog";
 // Uses WebSocket over SPDY.
 const char kEnableWebSocketOverSpdy[]       = "enable-websocket-over-spdy";
 
-// Enable <webview> in Chrome Apps.
-const char kEnableWebView[]                 = "enable-webview";
-
 // Explicitly allows additional ports using a comma-separated list of port
 // numbers.
 const char kExplicitlyAllowedPorts[]        = "explicitly-allowed-ports";
diff --git a/chrome/common/chrome_switches.h b/chrome/common/chrome_switches.h
index 5e2224f..9bbc768 100644
--- a/chrome/common/chrome_switches.h
+++ b/chrome/common/chrome_switches.h
@@ -182,7 +182,6 @@ extern const char kEnableSuggestionsTabPage[];
 extern const char kEnableTabGroupsContextMenu[];
 extern const char kEnableWatchdog[];
 extern const char kEnableWebSocketOverSpdy[];
-extern const char kEnableWebView[];
 extern const char kEventPageIdleTime[];
 extern const char kEventPageUnloadingTime[];
 extern const char kExplicitlyAllowedPorts[];
diff --git a/chrome/common/extensions/api/_permission_features.json b/chrome/common/extensions/api/_permission_features.json
index 0ba72aa..b9b2607 100644
--- a/chrome/common/extensions/api/_permission_features.json
+++ b/chrome/common/extensions/api/_permission_features.json
@@ -369,7 +369,7 @@
     "extension_types": ["extension", "packaged_app"]
   },
   "webview": {
-    "channel": "stable",
+    "channel": "dev",
     "extension_types": ["platform_app"]
   }
 }
diff --git a/chrome/renderer/chrome_content_renderer_client.cc b/chrome/renderer/chrome_content_renderer_client.cc
index dcd558b..39837f0 100644
--- a/chrome/renderer/chrome_content_renderer_client.cc
+++ b/chrome/renderer/chrome_content_renderer_client.cc
@@ -327,9 +327,8 @@ bool ChromeContentRendererClient::OverrideCreatePlugin(
     WebDocument document = frame->document();
     const extensions::Extension* extension =
         GetExtension(document.securityOrigin());
-    if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kEnableWebView) &&
-        extension &&
-        extension->HasAPIPermission(extensions::APIPermission::kWebView))
+    if (extension && extension->HasAPIPermission(
+        extensions::APIPermission::kWebView))
       return false;
   }
 
diff --git a/chrome/renderer/extensions/dispatcher.cc b/chrome/renderer/extensions/dispatcher.cc
index 64a975c..67f3ecf 100644
--- a/chrome/renderer/extensions/dispatcher.cc
+++ b/chrome/renderer/extensions/dispatcher.cc
@@ -803,9 +803,6 @@ void Dispatcher::DidCreateScriptContext(
     module_system->Require("platformApp");
 
   if (context_type == Feature::BLESSED_EXTENSION_CONTEXT &&
-      (CommandLine::ForCurrentProcess()->HasSwitch(switches::kEnableWebView) ||
-      (CommandLine::ForCurrentProcess()->HasSwitch(
-          switches::kEnableBrowserPluginForAllViewTypes))) &&
       extension->HasAPIPermission(APIPermission::kWebView)) {
     module_system->Require("webview");
   }