Upstreaming Cygprofile for Android.

chrome/browser/chrome_content_browser_client.cc

Index: chrome/browser/chrome_content_browser_client.cc
diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
index 91907f42b228770a60a4f4fbce2f0b44b2b16ed7..5f64b65fd0bd9fbf6481afd70c60ccec278536be 100644
--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
@@ -1508,11 +1508,12 @@ void ChromeContentBrowserClient::ClearInspectorSettings(RenderViewHost* rvh) {
 void ChromeContentBrowserClient::BrowserURLHandlerCreated(
     BrowserURLHandler* handler) {
   // Add the default URL handlers.
+#if !defined(OS_ANDROID)

[digit1, 2012/07/10 10:42:59]

Might want to put a comment here, and/or a link to a crbug entry related to the
lack of extensions in Chrome for Android. I'm not sure this is part of this
specifici issue though, does that prevent startup profiling or is it related to
something different?

[felipeg, 2012/07/10 11:14:54]

This change shouldn't be here.
I mistakenly reused a git branch.
Let me revert this

   handler->AddHandlerPair(&ExtensionWebUI::HandleChromeURLOverride,
                           BrowserURLHandler::null_handler());
   handler->AddHandlerPair(BrowserURLHandler::null_handler(),
                           &ExtensionWebUI::HandleChromeURLOverrideReverse);
-
+#endif
   // about: handler. Must come before chrome: handler, since it will
   // rewrite about: urls to chrome: URLs and then expect chrome: to
   // actually handle them.