Rename two ipc messages in WebViewGuest and move their sender/handler to extensions:

- Rename ChromeViewHostMsg_UpdateFrameName to ExtensionHostMsg_UpdateFrameName.
- Rename ChromeViewMsg_SetName to ExtensionMsg_SetName.

BUG=352290

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

Cr-Commit-Position: refs/heads/master@{#290326}
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@290326 0039d316-1c4b-4281-b951-d872f2087c98

15 files changed, 63 insertions, 60 deletions

diff --git a/chrome/browser/extensions/chrome_extension_web_contents_observer.cc b/chrome/browser/extensions/chrome_extension_web_contents_observer.cc
index 99b4370..a407d62 100644
--- a/chrome/browser/extensions/chrome_extension_web_contents_observer.cc
+++ b/chrome/browser/extensions/chrome_extension_web_contents_observer.cc
@@ -12,6 +12,7 @@
 #include "content/public/browser/render_view_host.h"
 #include "extensions/browser/extension_registry.h"
 #include "extensions/browser/extension_system.h"
+#include "extensions/common/extension_messages.h"
 #include "extensions/common/extension_urls.h"
 
 using content::BrowserContext;
@@ -38,7 +39,7 @@ bool ChromeExtensionWebContentsObserver::OnMessageReceived(
     content::RenderFrameHost* render_frame_host) {
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP(ChromeExtensionWebContentsObserver, message)
-    IPC_MESSAGE_HANDLER(ChromeViewHostMsg_DetailedConsoleMessageAdded,
+    IPC_MESSAGE_HANDLER(ExtensionHostMsg_DetailedConsoleMessageAdded,
                         OnDetailedConsoleMessageAdded)
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
diff --git a/chrome/browser/extensions/tab_helper.cc b/chrome/browser/extensions/tab_helper.cc
index ac6ee8f..b541bb0 100644
--- a/chrome/browser/extensions/tab_helper.cc
+++ b/chrome/browser/extensions/tab_helper.cc
@@ -291,7 +291,7 @@ bool TabHelper::OnMessageReceived(const IPC::Message& message,
                                   content::RenderFrameHost* render_frame_host) {
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP(TabHelper, message)
-    IPC_MESSAGE_HANDLER(ChromeViewHostMsg_DetailedConsoleMessageAdded,
+    IPC_MESSAGE_HANDLER(ExtensionHostMsg_DetailedConsoleMessageAdded,
                         OnDetailedConsoleMessageAdded)
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
diff --git a/chrome/browser/guest_view/web_view/web_view_guest.cc b/chrome/browser/guest_view/web_view/web_view_guest.cc
index 88c1184..504e799 100644
--- a/chrome/browser/guest_view/web_view/web_view_guest.cc
+++ b/chrome/browser/guest_view/web_view/web_view_guest.cc
@@ -21,7 +21,6 @@
 #include "chrome/browser/ui/pdf/pdf_tab_helper.h"
 #include "chrome/browser/ui/zoom/zoom_controller.h"
 #include "chrome/common/chrome_version_info.h"
-#include "chrome/common/extensions/chrome_extension_messages.h"
 #include "chrome/common/render_messages.h"
 #include "components/renderer_context_menu/context_menu_delegate.h"
 #include "content/public/browser/browser_thread.h"
@@ -49,6 +48,7 @@
 #include "extensions/browser/guest_view/guest_view_constants.h"
 #include "extensions/browser/guest_view/guest_view_manager.h"
 #include "extensions/common/constants.h"
+#include "extensions/common/extension_messages.h"
 #include "ipc/ipc_message_macros.h"
 #include "net/base/escape.h"
 #include "net/base/net_errors.h"
@@ -417,7 +417,8 @@ void WebViewGuest::GuestDestroyed() {
 void WebViewGuest::GuestReady() {
   // The guest RenderView should always live in an isolated guest process.
   CHECK(guest_web_contents()->GetRenderProcessHost()->IsIsolatedGuest());
-  Send(new ChromeViewMsg_SetName(guest_web_contents()->GetRoutingID(), name_));
+  Send(new ExtensionMsg_SetFrameName(
+      guest_web_contents()->GetRoutingID(), name_));
 }
 
 void WebViewGuest::GuestSizeChangedDueToAutoSize(const gfx::Size& old_size,
@@ -536,8 +537,8 @@ void WebViewGuest::LoadAbort(bool is_top_level,
       new GuestViewBase::Event(webview::kEventLoadAbort, args.Pass()));
 }
 
-void WebViewGuest::OnUpdateFrameName(bool is_top_level,
-                                     const std::string& name) {
+void WebViewGuest::OnFrameNameChanged(bool is_top_level,
+                                      const std::string& name) {
   if (!is_top_level)
     return;
 
@@ -778,7 +779,7 @@ bool WebViewGuest::OnMessageReceived(const IPC::Message& message,
                                      RenderFrameHost* render_frame_host) {
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP(WebViewGuest, message)
-    IPC_MESSAGE_HANDLER(ChromeViewHostMsg_UpdateFrameName, OnUpdateFrameName)
+    IPC_MESSAGE_HANDLER(ExtensionHostMsg_FrameNameChanged, OnFrameNameChanged)
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
   return handled;
@@ -1087,7 +1088,7 @@ void WebViewGuest::SetName(const std::string& name) {
     return;
   name_ = name;
 
-  Send(new ChromeViewMsg_SetName(routing_id(), name_));
+  Send(new ExtensionMsg_SetFrameName(routing_id(), name_));
 }
 
 void WebViewGuest::SetZoom(double zoom_factor) {
diff --git a/chrome/browser/guest_view/web_view/web_view_guest.h b/chrome/browser/guest_view/web_view/web_view_guest.h
index 45a9f34..dd9bb86 100644
--- a/chrome/browser/guest_view/web_view/web_view_guest.h
+++ b/chrome/browser/guest_view/web_view/web_view_guest.h
@@ -323,7 +323,7 @@ class WebViewGuest : public GuestView<WebViewGuest>,
                  const GURL& url,
                  const std::string& error_type);
 
-  void OnUpdateFrameName(bool is_top_level, const std::string& name);
+  void OnFrameNameChanged(bool is_top_level, const std::string& name);
 
   // Creates a new guest window owned by this WebViewGuest.
   void CreateNewGuestWebViewWindow(const content::OpenURLParams& params);
diff --git a/chrome/chrome_renderer.gypi b/chrome/chrome_renderer.gypi
index a75f843..a4ea2a8 100644
--- a/chrome/chrome_renderer.gypi
+++ b/chrome/chrome_renderer.gypi
@@ -127,8 +127,6 @@
       'renderer/extensions/app_window_custom_bindings.h',
       'renderer/extensions/automation_internal_custom_bindings.cc',
       'renderer/extensions/automation_internal_custom_bindings.h',
-      'renderer/extensions/chrome_extensions_render_frame_observer.cc',
-      'renderer/extensions/chrome_extensions_render_frame_observer.h',
       'renderer/extensions/chrome_v8_extension_handler.cc',
       'renderer/extensions/chrome_v8_extension_handler.h',
       'renderer/extensions/enterprise_platform_keys_natives.cc',
diff --git a/chrome/common/extensions/chrome_extension_messages.h b/chrome/common/extensions/chrome_extension_messages.h
index 42c915a..e633580 100644
--- a/chrome/common/extensions/chrome_extension_messages.h
+++ b/chrome/common/extensions/chrome_extension_messages.h
@@ -25,13 +25,6 @@ IPC_ENUM_TRAITS_MAX_VALUE(extensions::api::webstore::InstallStage,
 IPC_ENUM_TRAITS_MAX_VALUE(extensions::webstore_install::Result,
                           extensions::webstore_install::RESULT_LAST)
 
-IPC_STRUCT_TRAITS_BEGIN(extensions::StackFrame)
-  IPC_STRUCT_TRAITS_MEMBER(line_number)
-  IPC_STRUCT_TRAITS_MEMBER(column_number)
-  IPC_STRUCT_TRAITS_MEMBER(source)
-  IPC_STRUCT_TRAITS_MEMBER(function)
-IPC_STRUCT_TRAITS_END()
-
 IPC_STRUCT_TRAITS_BEGIN(WebApplicationInfo::IconInfo)
   IPC_STRUCT_TRAITS_MEMBER(url)
   IPC_STRUCT_TRAITS_MEMBER(width)
@@ -52,10 +45,6 @@ IPC_STRUCT_TRAITS_END()
 // ExtensionHostMsg_DidGetApplicationInfo.
 IPC_MESSAGE_ROUTED0(ChromeExtensionMsg_GetApplicationInfo)
 
-// Set the top-level frame to the provided name.
-IPC_MESSAGE_ROUTED1(ChromeViewMsg_SetName,
-                    std::string /* frame_name */)
-
 // Toggles visual muting of the render view area. This is on when a constrained
 // window is showing.
 IPC_MESSAGE_ROUTED1(ChromeViewMsg_SetVisuallyDeemphasized,
@@ -81,11 +70,6 @@ IPC_MESSAGE_ROUTED4(ExtensionMsg_InlineWebstoreInstallResponse,
 
 // Messages sent from the renderer to the browser.
 
-// Informs the browser of updated frame names.
-IPC_MESSAGE_ROUTED2(ChromeViewHostMsg_UpdateFrameName,
-                    bool /* is_top_level */,
-                    std::string /* name */)
-
 // Sent by the renderer to check if a URL has permission to trigger a clipboard
 // read/write operation from the DOM.
 IPC_SYNC_MESSAGE_CONTROL1_1(ChromeViewHostMsg_CanTriggerClipboardRead,
@@ -95,14 +79,6 @@ IPC_SYNC_MESSAGE_CONTROL1_1(ChromeViewHostMsg_CanTriggerClipboardWrite,
                             GURL /* origin */,
                             bool /* allowed */)
 
-// Tells listeners that a detailed message was reported to the console by
-// WebKit.
-IPC_MESSAGE_ROUTED4(ChromeViewHostMsg_DetailedConsoleMessageAdded,
-                    base::string16 /* message */,
-                    base::string16 /* source */,
-                    extensions::StackTrace /* stack trace */,
-                    int32 /* severity level */)
-
 // Sent by the renderer to implement chrome.webstore.install().
 IPC_MESSAGE_ROUTED5(ExtensionHostMsg_InlineWebstoreInstall,
                     int32 /* install id */,
diff --git a/chrome/renderer/chrome_content_renderer_client.cc b/chrome/renderer/chrome_content_renderer_client.cc
index 84dd16c..2aa64c2 100644
--- a/chrome/renderer/chrome_content_renderer_client.cc
+++ b/chrome/renderer/chrome_content_renderer_client.cc
@@ -119,7 +119,7 @@
 #endif
 
 #if defined(ENABLE_EXTENSIONS)
-#include "chrome/renderer/extensions/chrome_extensions_render_frame_observer.h"
+#include "extensions/renderer/extensions_render_frame_observer.h"
 #endif
 
 #if defined(ENABLE_SPELLCHECK)
@@ -430,7 +430,7 @@ void ChromeContentRendererClient::RenderFrameCreated(
   }
 
 #if defined(ENABLE_EXTENSIONS)
-  new extensions::ChromeExtensionsRenderFrameObserver(render_frame);
+  new extensions::ExtensionsRenderFrameObserver(render_frame);
 #endif
   new extensions::ExtensionFrameHelper(render_frame,
                                        extension_dispatcher_.get());
diff --git a/chrome/renderer/chrome_render_view_observer.cc b/chrome/renderer/chrome_render_view_observer.cc
index bbfe199..5ab3470 100644
--- a/chrome/renderer/chrome_render_view_observer.cc
+++ b/chrome/renderer/chrome_render_view_observer.cc
@@ -175,7 +175,6 @@ bool ChromeRenderViewObserver::OnMessageReceived(const IPC::Message& message) {
     IPC_MESSAGE_HANDLER(ChromeViewMsg_WebUIJavaScript, OnWebUIJavaScript)
 #endif
 #if defined(ENABLE_EXTENSIONS)
-    IPC_MESSAGE_HANDLER(ChromeViewMsg_SetName, OnSetName)
     IPC_MESSAGE_HANDLER(ChromeViewMsg_SetVisuallyDeemphasized,
                         OnSetVisuallyDeemphasized)
 #endif
@@ -303,12 +302,6 @@ void ChromeRenderViewObserver::OnSetClientSidePhishingDetection(
 }
 
 #if defined(ENABLE_EXTENSIONS)
-void ChromeRenderViewObserver::OnSetName(const std::string& name) {
-  blink::WebView* web_view = render_view()->GetWebView();
-  if (web_view)
-    web_view->mainFrame()->setName(WebString::fromUTF8(name));
-}
-
 void ChromeRenderViewObserver::OnSetVisuallyDeemphasized(bool deemphasized) {
   bool already_deemphasized = !!dimmed_color_overlay_.get();
   if (already_deemphasized == deemphasized)
diff --git a/chrome/renderer/chrome_render_view_observer.h b/chrome/renderer/chrome_render_view_observer.h
index 35df871..c4edee9 100644
--- a/chrome/renderer/chrome_render_view_observer.h
+++ b/chrome/renderer/chrome_render_view_observer.h
@@ -57,7 +57,6 @@ class ChromeRenderViewObserver : public content::RenderViewObserver {
   void OnWebUIJavaScript(const base::string16& javascript);
 #endif
 #if defined(ENABLE_EXTENSIONS)
-  void OnSetName(const std::string& name);
   void OnSetVisuallyDeemphasized(bool deemphasized);
 #endif
 #if defined(OS_ANDROID)
diff --git a/extensions/common/extension_messages.h b/extensions/common/extension_messages.h
index 5878603..fc3071f 100644
--- a/extensions/common/extension_messages.h
+++ b/extensions/common/extension_messages.h
@@ -20,6 +20,7 @@
 #include "extensions/common/permissions/permission_set.h"
 #include "extensions/common/permissions/socket_permission_data.h"
 #include "extensions/common/permissions/usb_device_permission_data.h"
+#include "extensions/common/stack_frame.h"
 #include "extensions/common/url_pattern.h"
 #include "extensions/common/url_pattern_set.h"
 #include "extensions/common/user_script.h"
@@ -180,6 +181,13 @@ IPC_STRUCT_TRAITS_BEGIN(extensions::SocketPermissionData)
   IPC_STRUCT_TRAITS_MEMBER(entry())
 IPC_STRUCT_TRAITS_END()
 
+IPC_STRUCT_TRAITS_BEGIN(extensions::StackFrame)
+  IPC_STRUCT_TRAITS_MEMBER(line_number)
+  IPC_STRUCT_TRAITS_MEMBER(column_number)
+  IPC_STRUCT_TRAITS_MEMBER(source)
+  IPC_STRUCT_TRAITS_MEMBER(function)
+IPC_STRUCT_TRAITS_END()
+
 IPC_STRUCT_TRAITS_BEGIN(extensions::UsbDevicePermissionData)
   IPC_STRUCT_TRAITS_MEMBER(vendor_id())
   IPC_STRUCT_TRAITS_MEMBER(product_id())
@@ -349,6 +357,10 @@ IPC_MESSAGE_ROUTED5(ExtensionMsg_MessageInvoke,
 IPC_MESSAGE_CONTROL1(ExtensionMsg_SetFunctionNames,
                      std::vector<std::string>)
 
+// Set the top-level frame to the provided name.
+IPC_MESSAGE_ROUTED1(ExtensionMsg_SetFrameName,
+                    std::string /* frame_name */)
+
 // Tell the renderer process the platforms system font.
 IPC_MESSAGE_CONTROL2(ExtensionMsg_SetSystemFont,
                      std::string /* font_family */,
@@ -693,3 +705,16 @@ IPC_MESSAGE_ROUTED1(ExtensionHostMsg_OnWatchedPageChange,
 // Sent by the renderer when it has received a Blob handle from the browser.
 IPC_MESSAGE_CONTROL1(ExtensionHostMsg_TransferBlobsAck,
                      std::vector<std::string> /* blob_uuids */)
+
+// Informs of updated frame names.
+IPC_MESSAGE_ROUTED2(ExtensionHostMsg_FrameNameChanged,
+                    bool /* is_top_level */,
+                    std::string /* name */)
+
+// Tells listeners that a detailed message was reported to the console by
+// WebKit.
+IPC_MESSAGE_ROUTED4(ExtensionHostMsg_DetailedConsoleMessageAdded,
+                    base::string16 /* message */,
+                    base::string16 /* source */,
+                    extensions::StackTrace /* stack trace */,
+                    int32 /* severity level */)
diff --git a/extensions/extensions.gyp b/extensions/extensions.gyp
index a418717..99d98fc 100644
--- a/extensions/extensions.gyp
+++ b/extensions/extensions.gyp
@@ -610,6 +610,8 @@
         'renderer/event_bindings.h',
         'renderer/extension_helper.cc',
         'renderer/extension_helper.h',
+        'renderer/extensions_render_frame_observer.cc',
+        'renderer/extensions_render_frame_observer.h',
         'renderer/extensions_renderer_client.cc',
         'renderer/extensions_renderer_client.h',
         'renderer/extension_groups.h',
diff --git a/extensions/renderer/extension_helper.cc b/extensions/renderer/extension_helper.cc
index 95d1f8a..e9da0f5 100644
--- a/extensions/renderer/extension_helper.cc
+++ b/extensions/renderer/extension_helper.cc
@@ -137,6 +137,7 @@ bool ExtensionHelper::OnMessageReceived(const IPC::Message& message) {
     IPC_MESSAGE_HANDLER(ExtensionMsg_DeliverMessage, OnExtensionDeliverMessage)
     IPC_MESSAGE_HANDLER(ExtensionMsg_DispatchOnDisconnect,
                         OnExtensionDispatchOnDisconnect)
+    IPC_MESSAGE_HANDLER(ExtensionMsg_SetFrameName, OnSetFrameName)
     IPC_MESSAGE_HANDLER(ExtensionMsg_SetTabId, OnSetTabId)
     IPC_MESSAGE_HANDLER(ExtensionMsg_UpdateBrowserWindowId,
                         OnUpdateBrowserWindowId)
@@ -228,6 +229,12 @@ void ExtensionHelper::OnNotifyRendererViewType(ViewType type) {
   view_type_ = type;
 }
 
+void ExtensionHelper::OnSetFrameName(const std::string& name) {
+  blink::WebView* web_view = render_view()->GetWebView();
+  if (web_view)
+    web_view->mainFrame()->setName(blink::WebString::fromUTF8(name));
+}
+
 void ExtensionHelper::OnSetTabId(int init_tab_id) {
   CHECK_EQ(tab_id_, -1);
   CHECK_GE(init_tab_id, 0);
diff --git a/extensions/renderer/extension_helper.h b/extensions/renderer/extension_helper.h
index 3dcb566..49f317b 100644
--- a/extensions/renderer/extension_helper.h
+++ b/extensions/renderer/extension_helper.h
@@ -85,6 +85,7 @@ class ExtensionHelper
   void OnAddMessageToConsole(content::ConsoleMessageLevel level,
                              const std::string& message);
   void OnAppWindowClosed();
+  void OnSetFrameName(const std::string& name);
 
   Dispatcher* dispatcher_;
 
diff --git a/chrome/renderer/extensions/chrome_extensions_render_frame_observer.cc b/extensions/renderer/extensions_render_frame_observer.cc
index e6fce19..7877bb6 100644
--- a/chrome/renderer/extensions/chrome_extensions_render_frame_observer.cc
+++ b/extensions/renderer/extensions_render_frame_observer.cc
@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/renderer/extensions/chrome_extensions_render_frame_observer.h"
+#include "extensions/renderer/extensions_render_frame_observer.h"
 
 #include "base/strings/string_split.h"
 #include "base/strings/utf_string_conversions.h"
-#include "chrome/common/extensions/chrome_extension_messages.h"
 #include "content/public/renderer/render_frame.h"
+#include "extensions/common/extension_messages.h"
 #include "extensions/common/stack_frame.h"
 #include "third_party/WebKit/public/web/WebFrame.h"
 
@@ -72,15 +72,15 @@ StackTrace GetStackTraceFromMessage(
 
 }  // namespace
 
-ChromeExtensionsRenderFrameObserver::ChromeExtensionsRenderFrameObserver(
+ExtensionsRenderFrameObserver::ExtensionsRenderFrameObserver(
     content::RenderFrame* render_frame)
     : content::RenderFrameObserver(render_frame) {
 }
 
-ChromeExtensionsRenderFrameObserver::~ChromeExtensionsRenderFrameObserver() {
+ExtensionsRenderFrameObserver::~ExtensionsRenderFrameObserver() {
 }
 
-void ChromeExtensionsRenderFrameObserver::DetailedConsoleMessageAdded(
+void ExtensionsRenderFrameObserver::DetailedConsoleMessageAdded(
     const base::string16& message,
     const base::string16& source,
     const base::string16& stack_trace_string,
@@ -92,13 +92,13 @@ void ChromeExtensionsRenderFrameObserver::DetailedConsoleMessageAdded(
       source,
       stack_trace_string,
       line_number);
-  Send(new ChromeViewHostMsg_DetailedConsoleMessageAdded(
+  Send(new ExtensionHostMsg_DetailedConsoleMessageAdded(
       routing_id(), trimmed_message, source, stack_trace, severity_level));
 }
 
-void ChromeExtensionsRenderFrameObserver::DidChangeName(
+void ExtensionsRenderFrameObserver::DidChangeName(
     const base::string16& name) {
-  Send(new ChromeViewHostMsg_UpdateFrameName(
+  Send(new ExtensionHostMsg_FrameNameChanged(
       routing_id(),
       !render_frame()->GetWebFrame()->parent(),
       base::UTF16ToUTF8(name)));
diff --git a/chrome/renderer/extensions/chrome_extensions_render_frame_observer.h b/extensions/renderer/extensions_render_frame_observer.h
index 46a5d94..d865d8e 100644
--- a/chrome/renderer/extensions/chrome_extensions_render_frame_observer.h
+++ b/extensions/renderer/extensions_render_frame_observer.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_RENDERER_EXTENSIONS_CHROME_EXTENSIONS_RENDER_FRAME_OBSERVER_H_
-#define CHROME_RENDERER_EXTENSIONS_CHROME_EXTENSIONS_RENDER_FRAME_OBSERVER_H_
+#ifndef EXTENSIONS_RENDERER_EXTENSIONS_RENDER_FRAME_OBSERVER_H_
+#define EXTENSIONS_RENDERER_EXTENSIONS_RENDER_FRAME_OBSERVER_H_
 
 #include "base/basictypes.h"
 #include "content/public/renderer/render_frame_observer.h"
@@ -12,12 +12,12 @@ namespace extensions {
 
 // This class holds the extensions specific parts of RenderFrame, and has the
 // same lifetime.
-class ChromeExtensionsRenderFrameObserver
+class ExtensionsRenderFrameObserver
     : public content::RenderFrameObserver {
  public:
-  explicit ChromeExtensionsRenderFrameObserver(
+  explicit ExtensionsRenderFrameObserver(
       content::RenderFrame* render_frame);
-  virtual ~ChromeExtensionsRenderFrameObserver();
+  virtual ~ExtensionsRenderFrameObserver();
 
  private:
   // RenderFrameObserver implementation.
@@ -28,10 +28,10 @@ class ChromeExtensionsRenderFrameObserver
                                            int32 severity_level) OVERRIDE;
   virtual void DidChangeName(const base::string16& name) OVERRIDE;
 
-  DISALLOW_COPY_AND_ASSIGN(ChromeExtensionsRenderFrameObserver);
+  DISALLOW_COPY_AND_ASSIGN(ExtensionsRenderFrameObserver);
 };
 
 }  // namespace extensions
 
-#endif  // CHROME_RENDERER_EXTENSIONS_CHROME_EXTENSIONS_RENDER_FRAME_OBSERVER_H_
+#endif  // EXTENSIONS_RENDERER_EXTENSIONS_RENDER_FRAME_OBSERVER_H_