Massively simplify the NetworkChangeNotifier infrastructure:...

chrome/browser/sync/notifier/server_notifier_thread.h

 // 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.
 //
 // This class is the (hackish) way to use the XMPP parts of
 // MediatorThread for server-issued notifications.
 //
 // TODO(akalin): Decomp MediatorThread into an XMPP service part and a
 // notifications-specific part and use the XMPP service part for
 // server-issued notifications.
 
 #ifndef CHROME_BROWSER_SYNC_NOTIFIER_SERVER_NOTIFIER_THREAD_H_
 #define CHROME_BROWSER_SYNC_NOTIFIER_SERVER_NOTIFIER_THREAD_H_
 
 #include <string>
 #include <vector>
 
 #include "base/scoped_ptr.h"
 #include "base/task.h"
 #include "chrome/common/net/notifier/listener/mediator_thread_impl.h"
 #include "google/cacheinvalidation/invalidation-client.h"
 
-namespace chrome_common_net {
-class NetworkChangeNotifierThread;
-}  // namespace chrome_common_net
-
 namespace sync_notifier {
 
 class ChromeInvalidationClient;
 
 class ServerNotifierThread
     : public notifier::MediatorThreadImpl,
       public invalidation::InvalidationListener {
  public:
-  explicit ServerNotifierThread(
-      chrome_common_net::NetworkChangeNotifierThread*
-          network_change_notifier_thread);
+  ServerNotifierThread();
 
   virtual ~ServerNotifierThread();
 
   // Overridden to start listening to server notifications.
   virtual void ListenForUpdates();
 
   // Overridden to immediately notify the delegate that subscriptions
   // (i.e., notifications) are on.  Must be called only after a call
   // to ListenForUpdates().
   virtual void SubscribeForUpdates(
@@ skipping 43 matching lines @@
   void StopInvalidationListener();
 
   scoped_ptr<ChromeInvalidationClient> chrome_invalidation_client_;
 };
 
 }  // namespace sync_notifier
 
 DISABLE_RUNNABLE_METHOD_REFCOUNT(sync_notifier::ServerNotifierThread);
 
 #endif  // CHROME_BROWSER_SYNC_NOTIFIER_SERVER_NOTIFIER_THREAD_H_