Massively simplify the NetworkChangeNotifier infrastructure:...

chrome/browser/sync/notifier/server_notifier_thread.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/browser/sync/notifier/server_notifier_thread.h"
 
 #include <string>
 #include <vector>
 
 #include "base/logging.h"
 #include "chrome/browser/sync/notifier/cache_invalidation_packet_handler.h"
 #include "chrome/browser/sync/notifier/chrome_invalidation_client.h"
 #include "chrome/browser/sync/notifier/chrome_system_resources.h"
 #include "chrome/browser/sync/notifier/invalidation_util.h"
 #include "chrome/common/net/notifier/listener/notification_defines.h"
 #include "google/cacheinvalidation/invalidation-client-impl.h"
 #include "talk/xmpp/jid.h"
 
 namespace sync_notifier {
 
-ServerNotifierThread::ServerNotifierThread(
-    chrome_common_net::NetworkChangeNotifierThread*
-        network_change_notifier_thread)
-    : notifier::MediatorThreadImpl(network_change_notifier_thread) {}
+ServerNotifierThread::ServerNotifierThread() {}
 
 ServerNotifierThread::~ServerNotifierThread() {}
 
 void ServerNotifierThread::ListenForUpdates() {
   DCHECK_EQ(MessageLoop::current(), parent_message_loop_);
   worker_message_loop()->PostTask(
       FROM_HERE,
       NewRunnableMethod(this,
                         &ServerNotifierThread::StartInvalidationListener));
 }
@@ skipping 157 matching lines @@
   DCHECK_EQ(MessageLoop::current(), worker_message_loop());
 
   if (chrome_invalidation_client_.get()) {
     // TODO(akalin): Need to do unregisters here?
     chrome_invalidation_client_->Stop();
   }
   chrome_invalidation_client_.reset();
 }
 
 }  // namespace sync_notifier