Revert 279748 "Rename webview API related files to web_view_inte..."

> Rename webview API related files to web_view_internal.
> webview.json -> web_view_internal.json
> 
> NOTRY=True
> BUG=388380
> Test=Internal cleanup, no visible change.
> 
> Review URL: https://codereview.chromium.org/347143004

TBR=lazyboy@chromium.org

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@279755 0039d316-1c4b-4281-b951-d872f2087c98

chrome/browser/extensions/api/declarative/declarative_api.cc

@@ -9,7 +9,6 @@
 #include "base/task_runner_util.h"
 #include "base/values.h"
 #include "chrome/browser/extensions/api/declarative/rules_registry_service.h"
-#include "chrome/browser/guest_view/web_view/web_view_constants.h"
 #include "chrome/browser/guest_view/web_view/web_view_guest.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/extensions/api/events.h"
@@ -32,23 +31,20 @@ namespace extensions {
 namespace {
 
 const char kWebRequest[] = "declarativeWebRequest.";
+const char kWebView[] = "webview.";
 const char kWebViewExpectedError[] = "Webview event with Webview ID expected.";
 
 bool IsWebViewEvent(const std::string& event_name) {
   // Sample event names:
-  // webViewInternal.onRequest.
-  // webViewInternal.onMessage.
-  return event_name.compare(0,
-                            strlen(webview::kWebViewEventPrefix),
-                            webview::kWebViewEventPrefix) == 0;
+  // webview.onRequest.
+  // webview.OnMessage.
+  return event_name.compare(0, strlen(kWebView), kWebView) == 0;
 }
 
 std::string GetWebRequestEventName(const std::string& event_name) {
   std::string web_request_event_name(event_name);
-  if (IsWebViewEvent(web_request_event_name)) {
-    web_request_event_name.replace(
-        0, strlen(webview::kWebViewEventPrefix), kWebRequest);
-  }
+  if (IsWebViewEvent(web_request_event_name))
+    web_request_event_name.replace(0, strlen(kWebView), kWebRequest);
   return web_request_event_name;
 }
 

chrome/browser/extensions/api/web_request/web_request_api.cc

@@ -92,7 +92,8 @@ namespace activitylog = activity_log_web_request_constants;
 
 namespace {
 
-const char kWebRequestEventPrefix[] = "webRequest.";
+const char kWebRequest[] = "webRequest";
+const char kWebView[] = "webview";
 
 // List of all the webRequest events.
 const char* const kWebRequestEvents[] = {
@@ -139,11 +140,8 @@ const char* GetRequestStageAsString(
 
 bool IsWebRequestEvent(const std::string& event_name) {
   std::string web_request_event_name(event_name);
-  if (StartsWithASCII(
-          web_request_event_name, webview::kWebViewEventPrefix, true)) {
-    web_request_event_name.replace(
-        0, strlen(webview::kWebViewEventPrefix), kWebRequestEventPrefix);
-  }
+  if (web_request_event_name.find(kWebView) != std::string::npos)
+    web_request_event_name.replace(0, sizeof(kWebView) - 1, kWebRequest);
   return std::find(kWebRequestEvents, ARRAYEND(kWebRequestEvents),
                    web_request_event_name) != ARRAYEND(kWebRequestEvents);
 }
@@ -456,8 +454,7 @@ WebRequestAPI::WebRequestAPI(content::BrowserContext* context)
     event_router->RegisterObserver(this, event_name);
 
     // Also observe the corresponding webview event.
-    event_name.replace(
-        0, sizeof(kWebRequestEventPrefix) - 1, webview::kWebViewEventPrefix);
+    event_name.replace(0, sizeof(kWebRequest) - 1, kWebView);
     event_router->RegisterObserver(this, event_name);
   }
 }
@@ -1469,10 +1466,8 @@ void ExtensionWebRequestEventRouter::GetMatchingListenersImpl(
   ExtensionRendererState::WebViewInfo web_view_info;
   bool is_web_view_guest = ExtensionRendererState::GetInstance()->
       GetWebViewInfo(render_process_host_id, routing_id, &web_view_info);
-  if (is_web_view_guest) {
-    web_request_event_name.replace(
-        0, sizeof(kWebRequestEventPrefix) - 1, webview::kWebViewEventPrefix);
-  }
+  if (is_web_view_guest)
+    web_request_event_name.replace(0, sizeof(kWebRequest) - 1, kWebView);
 
   std::set<EventListener>& listeners =
       listeners_[profile][web_request_event_name];