Add a Content API around BrowserURLHandler.

chrome/browser/ui/browser_navigator.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/ui/browser_navigator.h"
 
 #include <algorithm>
 
 #include "base/command_line.h"
 #include "base/stringprintf.h"
@@ skipping 15 matching lines @@
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/omnibox/location_bar.h"
 #include "chrome/browser/ui/status_bubble.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
 #include "chrome/browser/web_applications/web_app.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
-#include "content/browser/browser_url_handler.h"
+#include "content/public/browser/browser_url_handler.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/render_view_host_delegate.h"
 #include "content/public/browser/web_contents.h"
 #include "net/http/http_util.h"
 
 using content::GlobalRequestID;
 using content::WebContents;
 
 namespace {
@@ skipping 580 matching lines @@
 // the URL specified in |params|.
 int GetIndexOfSingletonTab(browser::NavigateParams* params) {
   if (params->disposition != SINGLETON_TAB)
     return -1;
 
   // In case the URL was rewritten by the BrowserURLHandler we need to ensure
   // that we do not open another URL that will get redirected to the rewritten
   // URL.
   GURL rewritten_url(params->url);
   bool reverse_on_redirect = false;
-  BrowserURLHandler::GetInstance()->RewriteURLIfNecessary(
+  content::BrowserURLHandler::GetInstance()->RewriteURLIfNecessary(
       &rewritten_url,
       params->browser->profile(),
       &reverse_on_redirect);
 
   // If there are several matches: prefer the active tab by starting there.
   int start_index = std::max(0, params->browser->active_index());
   int tab_count = params->browser->tab_count();
   for (int i = 0; i < tab_count; ++i) {
     int tab_index = (start_index + i) % tab_count;
     TabContentsWrapper* tab =
@@ skipping 49 matching lines @@
       popup_bounds.height() > max_height ||
       popup_bounds.width() == 0 ||
       popup_bounds.height() == 0) {
     return NEW_FOREGROUND_TAB;
   }
   return NEW_POPUP;
 }
 #endif
 
 }  // namespace browser