Mark ChromeViewHostMsg_DetailedConsoleMessageAdded as extensions-only.

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

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

chrome/browser/extensions/chrome_extension_web_contents_observer.cc

@@ -49,12 +49,16 @@ bool ChromeExtensionWebContentsObserver::OnMessageReceived(
 bool ChromeExtensionWebContentsObserver::OnMessageReceived(
     const IPC::Message& message,
     content::RenderFrameHost* render_frame_host) {
+#if defined(ENABLE_EXTENSIONS)
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP(ChromeExtensionWebContentsObserver, message)
     IPC_MESSAGE_HANDLER(ChromeViewHostMsg_DetailedConsoleMessageAdded,
                         OnDetailedConsoleMessageAdded)
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
+#else
+  bool handled = false;
+#endif
   return handled;
 }
 
@@ -63,6 +67,7 @@ void ChromeExtensionWebContentsObserver::OnDetailedConsoleMessageAdded(
     const base::string16& source,
     const StackTrace& stack_trace,
     int32 severity_level) {
+#if defined(ENABLE_EXTENSIONS)
   if (!IsSourceFromAnExtension(source))
     return;
 
@@ -83,6 +88,7 @@ void ChromeExtensionWebContentsObserver::OnDetailedConsoleMessageAdded(
                            static_cast<logging::LogSeverity>(severity_level),
                            render_view_host->GetRoutingID(),
                            render_view_host->GetProcess()->GetID())));
+#endif
 }
 
 void ChromeExtensionWebContentsObserver::OnPostMessage(int port_id,

chrome/browser/extensions/tab_helper.cc

@@ -318,12 +318,16 @@ bool TabHelper::OnMessageReceived(const IPC::Message& message) {
 
 bool TabHelper::OnMessageReceived(const IPC::Message& message,
                                   content::RenderFrameHost* render_frame_host) {
+#if defined(ENABLE_EXTENSIONS)
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP(TabHelper, message)
     IPC_MESSAGE_HANDLER(ChromeViewHostMsg_DetailedConsoleMessageAdded,
                         OnDetailedConsoleMessageAdded)
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
+#else
+  bool handled = false;
+#endif
   return handled;
 }
 
@@ -472,6 +476,7 @@ void TabHelper::OnDetailedConsoleMessageAdded(
     const base::string16& source,
     const StackTrace& stack_trace,
     int32 severity_level) {
+#if defined(ENABLE_EXTENSIONS)
   if (IsSourceFromAnExtension(source)) {
     content::RenderViewHost* rvh = web_contents()->GetRenderViewHost();
     ErrorConsole::Get(profile_)->ReportError(
@@ -487,6 +492,7 @@ void TabHelper::OnDetailedConsoleMessageAdded(
             rvh->GetRoutingID(),
             rvh->GetProcess()->GetID())));
   }
+#endif
 }
 
 const Extension* TabHelper::GetExtension(const std::string& extension_app_id) {

chrome/chrome_renderer.gypi

@@ -60,6 +60,8 @@
         'renderer/extensions/chrome_extension_helper.h',
         'renderer/extensions/chrome_extensions_dispatcher_delegate.cc',
         'renderer/extensions/chrome_extensions_dispatcher_delegate.h',
+        'renderer/extensions/chrome_extensions_render_frame_observer.cc',
+        'renderer/extensions/chrome_extensions_render_frame_observer.h',
         'renderer/extensions/chrome_extensions_renderer_client.cc',
         'renderer/extensions/chrome_extensions_renderer_client.h',
         'renderer/extensions/chrome_v8_context.cc',
@@ -315,6 +317,12 @@
             ['exclude', '^renderer/safe_browsing/'],
           ],
         }],
+        ['enable_extensions==0', {
+          'sources!': [
+            'renderer/extensions/chrome_extensions_render_frame_observer.cc',
+            'renderer/extensions/chrome_extensions_render_frame_observer.h',
+          ],
+        }],
         ['enable_webrtc==0', {
           'sources!': [
             'renderer/extensions/cast_streaming_native_handler.cc',

chrome/common/render_messages.h

@@ -707,6 +707,8 @@ IPC_MESSAGE_CONTROL2(ChromeViewMsg_SetSearchURLs,
                      std::vector<GURL> /* search_urls */,
                      GURL /* new_tab_page_url */)
 
+// TODO(thestig) Eventually separate out all the extensions messages.
+#if defined(ENABLE_EXTENSIONS)
 // Tells listeners that a detailed message was reported to the console by
 // WebKit.
 IPC_MESSAGE_ROUTED4(ChromeViewHostMsg_DetailedConsoleMessageAdded,
@@ -714,6 +716,7 @@ IPC_MESSAGE_ROUTED4(ChromeViewHostMsg_DetailedConsoleMessageAdded,
                     base::string16 /* source */,
                     extensions::StackTrace /* stack trace */,
                     int32 /* severity level */)
+#endif
 
 #if defined(ENABLE_PLUGINS)
 // Sent by the renderer to check if crash reporting is enabled.

chrome/renderer/chrome_content_renderer_client.cc

@@ -114,8 +114,8 @@
 #include "components/nacl/renderer/nacl_helper.h"
 #endif
 
-#if defined(ENABLE_WEBRTC)
-#include "chrome/renderer/media/webrtc_logging_message_filter.h"
+#if defined(ENABLE_EXTENSIONS)
+#include "chrome/renderer/extensions/chrome_extensions_render_frame_observer.h"
 #endif
 
 #if defined(ENABLE_SPELLCHECK)
@@ -123,9 +123,13 @@
 #include "chrome/renderer/spellchecker/spellcheck_provider.h"
 #endif
 
+#if defined(ENABLE_WEBRTC)
+#include "chrome/renderer/media/webrtc_logging_message_filter.h"
+#endif
+
 #if defined(OS_WIN)
 #include "chrome_elf/blacklist/blacklist.h"
-#endif  // OS_WIN
+#endif
 
 using autofill::AutofillAgent;
 using autofill::PasswordAutofillAgent;
@@ -394,6 +398,9 @@ void ChromeContentRendererClient::RenderFrameCreated(
         chrome_observer_->content_setting_rules());
   }
 
+#if defined(ENABLE_EXTENSIONS)
+  new extensions::ChromeExtensionsRenderFrameObserver(render_frame);
+#endif
   new extensions::ExtensionFrameHelper(render_frame,
                                        extension_dispatcher_.get());
 

chrome/renderer/chrome_render_frame_observer.cc

@@ -4,7 +4,6 @@
 
 #include "chrome/renderer/chrome_render_frame_observer.h"
 
-#include "base/strings/string_split.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/common/prerender_messages.h"
 #include "chrome/common/print_messages.h"
@@ -12,7 +11,6 @@
 #include "chrome/renderer/prerender/prerender_helper.h"
 #include "chrome/renderer/printing/print_web_view_helper.h"
 #include "content/public/renderer/render_frame.h"
-#include "extensions/common/stack_frame.h"
 #include "skia/ext/image_operations.h"
 #include "skia/ext/platform_canvas.h"
 #include "third_party/WebKit/public/platform/WebImage.h"
@@ -24,61 +22,6 @@ using blink::WebElement;
 using blink::WebNode;
 
 namespace {
-// The delimiter for a stack trace provided by WebKit.
-const char kStackFrameDelimiter[] = "\n    at ";
-
-// Get a stack trace from a WebKit console message.
-// There are three possible scenarios:
-// 1. WebKit gives us a stack trace in |stack_trace|.
-// 2. The stack trace is embedded in the error |message| by an internal
-//    script. This will be more useful than |stack_trace|, since |stack_trace|
-//    will include the internal bindings trace, instead of a developer's code.
-// 3. No stack trace is included. In this case, we should mock one up from
-//    the given line number and source.
-// |message| will be populated with the error message only (i.e., will not
-// include any stack trace).
-extensions::StackTrace GetStackTraceFromMessage(
-    base::string16* message,
-    const base::string16& source,
-    const base::string16& stack_trace,
-    int32 line_number) {
-  extensions::StackTrace result;
-  std::vector<base::string16> pieces;
-  size_t index = 0;
-
-  if (message->find(base::UTF8ToUTF16(kStackFrameDelimiter)) !=
-          base::string16::npos) {
-    base::SplitStringUsingSubstr(*message,
-                                 base::UTF8ToUTF16(kStackFrameDelimiter),
-                                 &pieces);
-    *message = pieces[0];
-    index = 1;
-  } else if (!stack_trace.empty()) {
-    base::SplitStringUsingSubstr(stack_trace,
-                                 base::UTF8ToUTF16(kStackFrameDelimiter),
-                                 &pieces);
-  }
-
-  // If we got a stack trace, parse each frame from the text.
-  if (index < pieces.size()) {
-    for (; index < pieces.size(); ++index) {
-      scoped_ptr<extensions::StackFrame> frame =
-          extensions::StackFrame::CreateFromText(pieces[index]);
-      if (frame.get())
-        result.push_back(*frame);
-    }
-  }
-
-  if (result.empty()) {  // If we don't have a stack trace, mock one up.
-    result.push_back(
-        extensions::StackFrame(line_number,
-                               1u,  // column number
-                               source,
-                               base::string16() /* no function name */ ));
-  }
-
-  return result;
-}
 
 // If the source image is null or occupies less area than
 // |thumbnail_min_area_pixels|, we return the image unmodified.  Otherwise, we
@@ -155,22 +98,6 @@ void ChromeRenderFrameObserver::DidChangeName(
       base::UTF16ToUTF8(name)));
 }
 
-void ChromeRenderFrameObserver::DetailedConsoleMessageAdded(
-    const base::string16& message,
-    const base::string16& source,
-    const base::string16& stack_trace_string,
-    int32 line_number,
-    int32 severity_level) {
-  base::string16 trimmed_message = message;
-  extensions::StackTrace stack_trace = GetStackTraceFromMessage(
-      &trimmed_message,
-      source,
-      stack_trace_string,
-      line_number);
-  Send(new ChromeViewHostMsg_DetailedConsoleMessageAdded(
-      routing_id(), trimmed_message, source, stack_trace, severity_level));
-}
-
 void ChromeRenderFrameObserver::OnSetIsPrerendering(bool is_prerendering) {
   if (is_prerendering) {
     // If the PrerenderHelper for this frame already exists, don't create it. It

chrome/renderer/chrome_render_frame_observer.h

@@ -23,11 +23,6 @@ class ChromeRenderFrameObserver : public content::RenderFrameObserver {
   // RenderFrameObserver implementation.
   virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
   virtual void DidChangeName(const base::string16& name) OVERRIDE;
-  virtual void DetailedConsoleMessageAdded(const base::string16& message,
-                                           const base::string16& source,
-                                           const base::string16& stack_trace,
-                                           int32 line_number,
-                                           int32 severity_level) OVERRIDE;
 
   // IPC handlers
   void OnSetIsPrerendering(bool is_prerendering);

chrome/renderer/extensions/chrome_extensions_render_frame_observer.cc

+// 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.
+
+#include "chrome/renderer/extensions/chrome_extensions_render_frame_observer.h"
+
+#include "base/strings/string_split.h"
+#include "base/strings/utf_string_conversions.h"
+#include "chrome/common/render_messages.h"
+#include "extensions/common/stack_frame.h"
+
+namespace extensions {
+
+namespace {
+
+// The delimiter for a stack trace provided by WebKit.
+const char kStackFrameDelimiter[] = "\n    at ";
+
+// Get a stack trace from a WebKit console message.
+// There are three possible scenarios:
+// 1. WebKit gives us a stack trace in |stack_trace|.
+// 2. The stack trace is embedded in the error |message| by an internal
+//    script. This will be more useful than |stack_trace|, since |stack_trace|
+//    will include the internal bindings trace, instead of a developer's code.
+// 3. No stack trace is included. In this case, we should mock one up from
+//    the given line number and source.
+// |message| will be populated with the error message only (i.e., will not
+// include any stack trace).
+StackTrace GetStackTraceFromMessage(
+    base::string16* message,
+    const base::string16& source,
+    const base::string16& stack_trace,
+    int32 line_number) {
+  StackTrace result;
+  std::vector<base::string16> pieces;
+  size_t index = 0;
+
+  if (message->find(base::UTF8ToUTF16(kStackFrameDelimiter)) !=
+          base::string16::npos) {
+    base::SplitStringUsingSubstr(*message,
+                                 base::UTF8ToUTF16(kStackFrameDelimiter),
+                                 &pieces);
+    *message = pieces[0];
+    index = 1;
+  } else if (!stack_trace.empty()) {
+    base::SplitStringUsingSubstr(stack_trace,
+                                 base::UTF8ToUTF16(kStackFrameDelimiter),
+                                 &pieces);
+  }
+
+  // If we got a stack trace, parse each frame from the text.
+  if (index < pieces.size()) {
+    for (; index < pieces.size(); ++index) {
+      scoped_ptr<StackFrame> frame = StackFrame::CreateFromText(pieces[index]);
+      if (frame.get())
+        result.push_back(*frame);
+    }
+  }
+
+  if (result.empty()) {  // If we don't have a stack trace, mock one up.
+    result.push_back(
+        StackFrame(line_number,
+                   1u,  // column number
+                   source,
+                   base::string16() /* no function name */ ));
+  }
+
+  return result;
+}
+
+}  // namespace
+
+ChromeExtensionsRenderFrameObserver::ChromeExtensionsRenderFrameObserver(
+    content::RenderFrame* render_frame)
+    : content::RenderFrameObserver(render_frame) {
+}
+
+ChromeExtensionsRenderFrameObserver::~ChromeExtensionsRenderFrameObserver() {
+}
+
+void ChromeExtensionsRenderFrameObserver::DetailedConsoleMessageAdded(
+    const base::string16& message,
+    const base::string16& source,
+    const base::string16& stack_trace_string,
+    int32 line_number,
+    int32 severity_level) {
+  base::string16 trimmed_message = message;
+  StackTrace stack_trace = GetStackTraceFromMessage(
+      &trimmed_message,
+      source,
+      stack_trace_string,
+      line_number);
+  Send(new ChromeViewHostMsg_DetailedConsoleMessageAdded(
+      routing_id(), trimmed_message, source, stack_trace, severity_level));
+}
+
+}  // namespace extensions

chrome/renderer/extensions/chrome_extensions_render_frame_observer.h

+// 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.
+
+#ifndef CHROME_RENDERER_EXTENSIONS_CHROME_EXTENSIONS_RENDER_FRAME_OBSERVER_H_
+#define CHROME_RENDERER_EXTENSIONS_CHROME_EXTENSIONS_RENDER_FRAME_OBSERVER_H_
+
+#include "base/basictypes.h"
+#include "content/public/renderer/render_frame_observer.h"
+
+namespace extensions {
+
+// This class holds the extensions specific parts of RenderFrame, and has the
+// same lifetime.
+class ChromeExtensionsRenderFrameObserver
+    : public content::RenderFrameObserver {
+ public:
+  explicit ChromeExtensionsRenderFrameObserver(
+      content::RenderFrame* render_frame);
+  virtual ~ChromeExtensionsRenderFrameObserver();
+
+ private:
+  // RenderFrameObserver implementation.
+  virtual void DetailedConsoleMessageAdded(const base::string16& message,
+                                           const base::string16& source,
+                                           const base::string16& stack_trace,
+                                           int32 line_number,
+                                           int32 severity_level) OVERRIDE;
+
+  DISALLOW_COPY_AND_ASSIGN(ChromeExtensionsRenderFrameObserver);
+};
+
+}  // namespace extensions
+
+#endif  // CHROME_RENDERER_EXTENSIONS_CHROME_EXTENSIONS_RENDER_FRAME_OBSERVER_H_
+