Massively simplify the NetworkChangeNotifier infrastructure:...

chrome/service/cloud_print/cloud_print_proxy_backend.cc

 // 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/service/cloud_print/cloud_print_proxy_backend.h"
 
 #include "base/file_util.h"
 #include "base/md5.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/service/cloud_print/cloud_print_consts.h"
 #include "chrome/service/cloud_print/cloud_print_helpers.h"
 #include "chrome/service/cloud_print/printer_job_handler.h"
 #include "chrome/common/net/notifier/listener/mediator_thread_impl.h"
 #include "chrome/common/net/notifier/listener/talk_mediator_impl.h"
 #include "chrome/service/gaia/service_gaia_authenticator.h"
-#include "chrome/service/net/service_network_change_notifier_thread.h"
 #include "chrome/service/service_process.h"
 
 #include "googleurl/src/gurl.h"
 #include "net/url_request/url_request_status.h"
 
 // The real guts of SyncBackendHost, to keep the public client API clean.
 class CloudPrintProxyBackend::Core
     : public base::RefCountedThreadSafe<CloudPrintProxyBackend::Core>,
       public URLFetcherDelegate,
       public cloud_print::PrintServerWatcherDelegate,
@@ skipping 269 matching lines @@
     return;  // No print system available, fail initalization.
   }
 
   // TODO(sanjeevr): Validate the tokens.
   auth_token_ = cloud_print_token;
 
   const bool kInitializeSsl = true;
   const bool kConnectImmediately = false;
   const bool kInvalidateXmppAuthToken = false;
   talk_mediator_.reset(new notifier::TalkMediatorImpl(
-      new notifier::MediatorThreadImpl(
-          g_service_process->network_change_notifier_thread()),
-      kInitializeSsl, kConnectImmediately, kInvalidateXmppAuthToken));
+      new notifier::MediatorThreadImpl(), kInitializeSsl, kConnectImmediately,
+      kInvalidateXmppAuthToken));
   talk_mediator_->AddSubscribedServiceUrl(kCloudPrintTalkServiceUrl);
   talk_mediator_->SetDelegate(this);
   talk_mediator_->SetAuthToken(email, cloud_print_xmpp_token,
                                kSyncGaiaServiceId);
   talk_mediator_->Login();
 
   print_server_watcher_ = print_system_->CreatePrintServerWatcher();
   print_server_watcher_->StartWatching(this);
 
   proxy_id_ = proxy_id;
@@ skipping 324 matching lines @@
     StartRegistration();
   }
 }
 
 // PrinterJobHandler::Delegate implementation
 void CloudPrintProxyBackend::Core::OnPrinterJobHandlerShutdown(
     PrinterJobHandler* job_handler, const std::string& printer_id) {
   job_handler_map_.erase(printer_id);
 }