Added ChromeOS-specific NetworkChangeNotifier specialization that is wired directly to flimflam.

chrome/browser/browser_main.cc

Index: chrome/browser/browser_main.cc
===================================================================
--- chrome/browser/browser_main.cc	(revision 85626)
+++ chrome/browser/browser_main.cc	(working copy)
@@ -49,8 +49,11 @@
 #include "chrome/browser/metrics/metrics_log.h"
 #include "chrome/browser/metrics/metrics_service.h"
 #include "chrome/browser/metrics/thread_watcher.h"
+#include "chrome/browser/net/blob_url_request_job_factory.h"
 #include "chrome/browser/net/chrome_dns_cert_provenance_checker.h"
 #include "chrome/browser/net/chrome_dns_cert_provenance_checker_factory.h"
+#include "chrome/browser/net/file_system_url_request_job_factory.h"
+#include "chrome/browser/net/metadata_url_request.h"
 #include "chrome/browser/net/predictor_api.h"
 #include "chrome/browser/net/sdch_dictionary_fetcher.h"
 #include "chrome/browser/net/websocket_experiment/websocket_experiment_runner.h"
@@ -142,6 +145,7 @@
 #include "chrome/browser/chromeos/login/screen_locker.h"
 #include "chrome/browser/chromeos/login/user_manager.h"
 #include "chrome/browser/chromeos/metrics_cros_settings_provider.h"
+#include "chrome/browser/chromeos/net/network_change_notifier_chromeos.h"
 #include "chrome/browser/chromeos/system_key_event_listener.h"
 #include "chrome/browser/chromeos/web_socket_proxy_controller.h"
 #include "chrome/browser/oom_priority_manager.h"
@@ -529,8 +533,15 @@
   // TODO(viettrungluu): should these really go before setting the thread name?
   system_monitor_.reset(new ui::SystemMonitor);
   hi_res_timer_manager_.reset(new HighResolutionTimerManager);
+#if defined(OS_CHROMEOS)

[oshima, 2011/05/18 01:28:45]

this looks wrong?

[zel, 2011/05/18 01:34:00]

Yes, pressed ctrl+z too many times here. Done.

   network_change_notifier_.reset(net::NetworkChangeNotifier::Create());
-
+#else
+  // TODO(zelidrag): We need to move cros library glue code outside of
+  // chrome/browser directory to avoid check_deps issues and then migrate
+  // NetworkChangeNotifierCros class to net/base where other OS implementations
+  // live.
+  network_change_notifier_.reset(new chromeos::NetworkChangeNotifierChromeos());
+#endif
   InitializeMainThread();
 
   PostMainMessageLoopStart();
@@ -1687,6 +1698,14 @@
   // Configure modules that need access to resources.
   net::NetModule::SetResourceProvider(chrome_common_net::NetResourceProvider);
 
+  // Register our global network handler for chrome:// and
+  // chrome-extension:// URLs.
+  ChromeURLDataManagerBackend::Register();
+  RegisterExtensionProtocols();
+  RegisterMetadataURLRequestHandler();
+  RegisterBlobURLRequestJobFactory();
+  RegisterFileSystemURLRequestJobFactory();

[oshima, 2011/05/18 01:28:45]

These wasn't here before. Is this intentional?
They're not ifdef'ed so will be enabled on non chromeos build as well.

[zel, 2011/05/18 01:34:00]

Hmm. I have no idea where that comes from. Let me take it out.

+
   // In unittest mode, this will do nothing.  In normal mode, this will create
   // the global GoogleURLTracker and IntranetRedirectDetector instances, which
   // will promptly go to sleep for five and seven seconds, respectively (to