Mark ChromeViewHostMsg_DetailedConsoleMessageAdded as extensions-only.

chrome/browser/extensions/tab_helper.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.

[Yoyo Zhou, 2014/06/06 21:44:28]

Probably not for this patch, but in chrome/browser/ui/tab_helpers.cc is where
this gets included in the first place, and maybe could be excluded instead.

Looking over that file, which is in its current form due to
https://code.google.com/p/chromium/issues/detail?id=337600 , I think there are a
few other extensions tab helpers that are included on Android, perhaps
incorrectly.

[Lei Zhang, 2014/06/06 21:56:24]

I'll be happy to keep separating extensions bits until I fix bug 305852 / finish
auditing chrome IPC messages. If I encounter this file again, I'll take another
stab at removing it from non-extensions builds.

 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/extensions/tab_helper.h"
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/chrome_notification_types.h"
@@ skipping 299 matching lines @@
                         OnContentScriptsExecuting)
     IPC_MESSAGE_HANDLER(ExtensionHostMsg_OnWatchedPageChange,
                         OnWatchedPageChange)
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
   return handled;
 }
 
 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;
 }
 
 void TabHelper::DidCloneToNewWebContents(WebContents* old_web_contents,
                                          WebContents* new_web_contents) {
   // When the WebContents that this is attached to is cloned, give the new clone
   // a TabHelper and copy state over.
   CreateForWebContents(new_web_contents);
   TabHelper* new_helper = FromWebContents(new_web_contents);
 
@@ skipping 128 matching lines @@
         web_contents(), css_selectors);
   }
 #endif  // defined(ENABLE_EXTENSIONS)
 }
 
 void TabHelper::OnDetailedConsoleMessageAdded(
     const base::string16& message,
     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(
         scoped_ptr<ExtensionError>(new RuntimeError(
             extension_app_ ? extension_app_->id() : std::string(),
             profile_->IsOffTheRecord(),
             source,
             message,
             stack_trace,
             web_contents() ?
                 web_contents()->GetLastCommittedURL() : GURL::EmptyGURL(),
             static_cast<logging::LogSeverity>(severity_level),
             rvh->GetRoutingID(),
             rvh->GetProcess()->GetID())));
   }
+#endif
 }
 
 const Extension* TabHelper::GetExtension(const std::string& extension_app_id) {
   if (extension_app_id.empty())
     return NULL;
 
   Profile* profile =
       Profile::FromBrowserContext(web_contents()->GetBrowserContext());
   ExtensionService* extension_service = profile->GetExtensionService();
   if (!extension_service || !extension_service->is_ready())
@@ skipping 88 matching lines @@
   }
 }
 
 void TabHelper::SetTabId(RenderViewHost* render_view_host) {
   render_view_host->Send(
       new ExtensionMsg_SetTabId(render_view_host->GetRoutingID(),
                                 SessionID::IdForTab(web_contents())));
 }
 
 }  // namespace extensions