Add autodetection of "intranet" redirection, for ISPs etc. that send typos an...

chrome/browser/browser_process_impl.cc

-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 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/browser_process_impl.h"
 
 #include "app/clipboard/clipboard.h"
 #include "app/l10n_util.h"
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "base/thread.h"
 #include "base/waitable_event.h"
 #include "chrome/browser/browser_main.h"
 #include "chrome/browser/browser_trial.h"
 #include "chrome/browser/chrome_thread.h"
 #include "chrome/browser/debugger/debugger_wrapper.h"
 #include "chrome/browser/debugger/devtools_manager.h"
 #include "chrome/browser/download/download_file.h"
 #include "chrome/browser/download/save_file_manager.h"
 #include "chrome/browser/google_url_tracker.h"
 #include "chrome/browser/icon_manager.h"
+#include "chrome/browser/intranet_redirect_detector.h"
 #include "chrome/browser/metrics/metrics_service.h"
 #include "chrome/browser/net/dns_global.h"
 #include "chrome/browser/net/sdch_dictionary_fetcher.h"
 #include "chrome/browser/notifications/notification_ui_manager.h"
 #include "chrome/browser/plugin_service.h"
 #include "chrome/browser/profile_manager.h"
 #include "chrome/browser/renderer_host/render_process_host.h"
 #include "chrome/browser/renderer_host/resource_dispatcher_host.h"
 #include "chrome/browser/safe_browsing/safe_browsing_service.h"
 #include "chrome/common/child_process_host.h"
@@ skipping 142 matching lines @@
   // NotificationService. NotificationService won't be destroyed until after
   // this destructor is run.
   automation_provider_list_.reset();
 
   // We need to shutdown the SdchDictionaryFetcher as it regularly holds
   // a pointer to a URLFetcher, and that URLFetcher (upon destruction) will do
   // a PostDelayedTask onto the IO thread.  This shutdown call will both discard
   // any pending URLFetchers, and avoid creating any more.
   SdchDictionaryFetcher::Shutdown();
 
-  // We need to destroy the MetricsService and GoogleURLTracker before the
-  // io_thread_ gets destroyed, since both destructors can call the URLFetcher
-  // destructor, which does an PostDelayedTask operation on the IO thread.  (The
-  // IO thread will handle that URLFetcher operation before going away.)
+  // We need to destroy the MetricsService, GoogleURLTracker, and
+  // IntranetRedirectDetector before the io_thread_ gets destroyed, since their
+  // destructors can call the URLFetcher destructor, which does a
+  // PostDelayedTask operation on the IO thread.  (The IO thread will handle
+  // that URLFetcher operation before going away.)
   metrics_service_.reset();
   google_url_tracker_.reset();
+  intranet_redirect_detector_.reset();
 
   // Need to clear profiles (download managers) before the io_thread_.
   profile_manager_.reset();
 
   // Debugger must be cleaned up before IO thread and NotificationService.
   debugger_wrapper_ = NULL;
 
   if (resource_dispatcher_host_.get()) {
     // Need to tell Safe Browsing Service that the IO thread is going away
     // since it cached a pointer to it.
@@ skipping 253 matching lines @@
   created_devtools_manager_ = true;
   devtools_manager_ = new DevToolsManager();
 }
 
 void BrowserProcessImpl::CreateGoogleURLTracker() {
   DCHECK(google_url_tracker_.get() == NULL);
   scoped_ptr<GoogleURLTracker> google_url_tracker(new GoogleURLTracker);
   google_url_tracker_.swap(google_url_tracker);
 }
 
+void BrowserProcessImpl::CreateIntranetRedirectDetector() {
+  DCHECK(intranet_redirect_detector_.get() == NULL);
+  scoped_ptr<IntranetRedirectDetector> intranet_redirect_detector(
+      new IntranetRedirectDetector);
+  intranet_redirect_detector_.swap(intranet_redirect_detector);
+}
+
 void BrowserProcessImpl::CreateNotificationUIManager() {
   DCHECK(notification_ui_manager_.get() == NULL);
   notification_ui_manager_.reset(NotificationUIManager::Create());
   created_notification_ui_manager_ = true;
 }
 
 // The BrowserProcess object must outlive the file thread so we use traits
 // which don't do any management.
 template <>
 struct RunnableMethodTraits<BrowserProcessImpl> {
@@ skipping 50 matching lines @@
   DCHECK(file_thread_->message_loop() == MessageLoop::current());
   bool result = false;
 
   FilePath inspector_dir;
   if (PathService::Get(chrome::DIR_INSPECTOR, &inspector_dir)) {
     result = file_util::PathExists(inspector_dir);
   }
 
   have_inspector_files_ = result;
 }