Upstreaming Cygprofile for Android.

chrome/browser/chrome_content_browser_client.cc

 // Copyright (c) 2012 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/browser/chrome_content_browser_client.h"
 
 #include <set>
 #include <utility>
 #include <vector>
 
@@ skipping 1490 matching lines @@
 void ChromeContentBrowserClient::ClearInspectorSettings(RenderViewHost* rvh) {
   content::BrowserContext* browser_context =
       rvh->GetProcess()->GetBrowserContext();
   Profile::FromBrowserContext(browser_context)->GetPrefs()->
       ClearPref(prefs::kWebKitInspectorSettings);
 }
 
 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.
   handler->AddHandlerPair(&WillHandleBrowserAboutURL,
                           BrowserURLHandler::null_handler());
   // chrome: & friends.
   handler->AddHandlerPair(&HandleWebUI,
                           BrowserURLHandler::null_handler());
 }
 
@@ skipping 121 matching lines @@
     io_thread_application_locale_ = locale;
 }
 
 void ChromeContentBrowserClient::SetApplicationLocaleOnIOThread(
     const std::string& locale) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   io_thread_application_locale_ = locale;
 }
 
 }  // namespace chrome