Moved the contextmenu webview API to stable, and removed the experimental API infrastructure.

BUG=466884

TBR=sky@chromium.org for renderer_resources.grd

Review URL: https://codereview.chromium.org/1004233002

Cr-Commit-Position: refs/heads/master@{#320731}

6 files changed, 2 insertions, 58 deletions

diff --git a/extensions/common/api/_api_features.json b/extensions/common/api/_api_features.json
index 300c9e8..9907815 100644
--- a/extensions/common/api/_api_features.json
+++ b/extensions/common/api/_api_features.json
@@ -405,24 +405,6 @@
     "contexts": ["webui"],
     "matches": ["chrome://chrome-signin/*", "chrome://oobe/*"]
   }],
-  "webViewExperimentalInternal": [{
-    "internal": true,
-    "channel": "dev",
-    "contexts": ["blessed_extension"],
-    "dependencies": ["permission:webview"]
-  },
-  {
-    "internal": true,
-    "channel": "stable",
-    "contexts": ["blessed_extension"],
-    "dependencies": ["permission:webview"],
-    "whitelist": [
-      "8C3741E3AF0B93B6E8E0DDD499BB0B74839EA578",
-      "E703483CEF33DEC18B4B6DD84B5C776FB9182BDB",
-      "1A26E32DE447A17CBE5E9750CDBA78F58539B39C",
-      "59048028102D7B4C681DBC7BC6CD980C3DC66DA3"
-    ]
-  }],
   "webViewInternal": [{
     "internal": true,
     "dependencies": ["permission:webview"],
diff --git a/extensions/renderer/dispatcher.cc b/extensions/renderer/dispatcher.cc
index 09156c3..e7b1267 100644
--- a/extensions/renderer/dispatcher.cc
+++ b/extensions/renderer/dispatcher.cc
@@ -587,8 +587,6 @@ std::vector<std::pair<std::string, int> > Dispatcher::GetJsResources() {
   resources.push_back(std::make_pair("webViewConstants",
                                      IDR_WEB_VIEW_CONSTANTS_JS));
   resources.push_back(std::make_pair("webViewEvents", IDR_WEB_VIEW_EVENTS_JS));
-  resources.push_back(std::make_pair("webViewExperimental",
-                                     IDR_WEB_VIEW_EXPERIMENTAL_JS));
   resources.push_back(std::make_pair("webViewInternal",
                                      IDR_WEB_VIEW_INTERNAL_CUSTOM_BINDINGS_JS));
   resources.push_back(
@@ -1559,10 +1557,6 @@ void Dispatcher::RequireGuestViewModules(ScriptContext* context) {
     module_system->Require("webView");
     module_system->Require("webViewApiMethods");
     module_system->Require("webViewAttributes");
-    if (context->GetAvailability("webViewExperimentalInternal")
-        .is_available()) {
-      module_system->Require("webViewExperimental");
-    }
   }
 
   // The "guestViewDeny" module must always be loaded last. It registers
diff --git a/extensions/renderer/resources/extensions_renderer_resources.grd b/extensions/renderer/resources/extensions_renderer_resources.grd
index ca9d87e..d224022 100644
--- a/extensions/renderer/resources/extensions_renderer_resources.grd
+++ b/extensions/renderer/resources/extensions_renderer_resources.grd
@@ -58,7 +58,6 @@
       <include name="IDR_WEB_VIEW_ATTRIBUTES_JS" file="guest_view/web_view/web_view_attributes.js" type="BINDATA" />
       <include name="IDR_WEB_VIEW_CONSTANTS_JS" file="guest_view/web_view/web_view_constants.js" type="BINDATA" />
       <include name="IDR_WEB_VIEW_EVENTS_JS" file="guest_view/web_view/web_view_events.js" type="BINDATA" />
-      <include name="IDR_WEB_VIEW_EXPERIMENTAL_JS" file="guest_view/web_view/web_view_experimental.js" type="BINDATA" />
       <include name="IDR_WEB_VIEW_INTERNAL_CUSTOM_BINDINGS_JS" file="guest_view/web_view/web_view_internal.js" type="BINDATA" />
       <include name="IDR_WEB_VIEW_JS" file="guest_view/web_view/web_view.js" type="BINDATA" />
 
diff --git a/extensions/renderer/resources/guest_view/web_view/web_view.js b/extensions/renderer/resources/guest_view/web_view/web_view.js
index aa1d67d..a69736b 100644
--- a/extensions/renderer/resources/guest_view/web_view/web_view.js
+++ b/extensions/renderer/resources/guest_view/web_view/web_view.js
@@ -32,11 +32,6 @@ WebViewImpl.setupElement = function(proto) {
   // Public-facing API methods.
   var apiMethods = WebViewImpl.getApiMethods();
 
-  // Add the experimental API methods, if available.
-  var experimentalApiMethods =
-      WebViewImpl.maybeGetExperimentalApiMethods();
-  apiMethods = $Array.concat(apiMethods, experimentalApiMethods);
-
   // Create default implementations for undefined API methods.
   var createDefaultApiMethod = function(m) {
     return function(var_args) {
@@ -222,11 +217,7 @@ WebViewImpl.prototype.executeCode = function(func, args) {
 }
 
 // Implemented when the ChromeWebView API is available.
-WebViewImpl.prototype.maybeGetChromeWebViewEvents = function() {};
-
-// Implemented when the experimental WebView API is available.
-WebViewImpl.maybeGetExperimentalApiMethods = function() { return []; };
-WebViewImpl.prototype.setupExperimentalContextMenus = function() {};
+WebViewImpl.prototype.maybeSetupContextMenus = function() {};
 
 GuestViewContainer.registerElement(WebViewImpl);
 
diff --git a/extensions/renderer/resources/guest_view/web_view/web_view_events.js b/extensions/renderer/resources/guest_view/web_view/web_view_events.js
index 470b49a..bae210e 100644
--- a/extensions/renderer/resources/guest_view/web_view/web_view_events.js
+++ b/extensions/renderer/resources/guest_view/web_view/web_view_events.js
@@ -22,7 +22,7 @@ function WebViewEvents(webViewImpl) {
   GuestViewEvents.call(this, webViewImpl);
 
   this.setupWebRequestEvents();
-  this.view.setupExperimentalContextMenus();
+  this.view.maybeSetupContextMenus();
 }
 
 WebViewEvents.prototype.__proto__ = GuestViewEvents.prototype;
diff --git a/extensions/renderer/resources/guest_view/web_view/web_view_experimental.js b/extensions/renderer/resources/guest_view/web_view/web_view_experimental.js
deleted file mode 100644
index 04299e9..0000000
--- a/extensions/renderer/resources/guest_view/web_view/web_view_experimental.js
+++ /dev/null
@@ -1,22 +0,0 @@
-// Copyright 2014 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// This module implements experimental API for <webview>.
-// See web_view.js and web_view_api_methods.js for details.
-//
-// <webview> Experimental API is only available on canary and dev channels of
-// Chrome.
-
-var WebViewImpl = require('webView').WebViewImpl;
-var WebViewInternal = require('webViewInternal').WebViewInternal;
-
-// An array of <webview>'s experimental API methods. See |WEB_VIEW_API_METHODS|
-// in web_view_api_methods.js for more details.
-var WEB_VIEW_EXPERIMENTAL_API_METHODS = [
-];
-
-// Registers the experimantal WebVIew API when available.
-WebViewImpl.maybeGetExperimentalApiMethods = function() {
-  return WEB_VIEW_EXPERIMENTAL_API_METHODS;
-};