Massively simplify the NetworkChangeNotifier infrastructure:...

chrome/browser/sync/engine/syncapi.h

-// 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.
 
 // This file defines the "sync API", an interface to the syncer
 // backend that exposes (1) the core functionality of maintaining a consistent
 // local snapshot of a hierarchical object set; (2) a means to transactionally
 // access and modify those objects; (3) a means to control client/server
 // synchronization tasks, namely: pushing local object modifications to a
 // server, pulling nonlocal object modifications from a server to this client,
 // and resolving conflicts that may arise between the two; and (4) an
@@ skipping 41 matching lines @@
 #include "googleurl/src/gurl.h"
 
 namespace browser_sync {
 class ModelSafeWorkerRegistrar;
 
 namespace sessions {
 struct SyncSessionSnapshot;
 }
 }
 
-namespace chrome_common_net {
-class NetworkChangeNotifierThread;
-}
-
 // Forward declarations of internal class types so that sync API objects
 // may have opaque pointers to these types.
 namespace syncable {
 class BaseTransaction;
 class DirectoryManager;
 class Entry;
 class MutableEntry;
 class ReadTransaction;
 class ScopedDirLookup;
 class WriteTransaction;
@@ skipping 626 matching lines @@
 
   // Initialize the sync manager.  |database_location| specifies the path of
   // the directory in which to locate a sqlite repository storing the syncer
   // backend state. Initialization will open the database, or create it if it
   // does not already exist. Returns false on failure.
   // |sync_server_and_path| and |sync_server_port| represent the Chrome sync
   // server to use, and |use_ssl| specifies whether to communicate securely;
   // the default is false.
   // |gaia_service_id| is the service id used for GAIA authentication. If it's
   // null then default will be used.
-  // |network_change_notifier_thread| (which we don't own) is the
-  // thread from which we get notifications regarding changes to the
-  // network state.
   // |post_factory| will be owned internally and used to create
   // instances of an HttpPostProvider.
   // |auth_post_factory| will be owned internally and used to create
   // instances of an HttpPostProvider for communicating with GAIA.
   // TODO(timsteele): It seems like one factory should suffice, but for now to
   // avoid having to deal with threading issues since the auth code and syncer
   // code live on separate threads that run simultaneously, we just dedicate
   // one to each component. Long term we may want to reconsider the HttpBridge
   // API to take all the params in one chunk in a threadsafe manner.. which is
   // still suboptimal as there will be high contention between the two threads
@@ skipping 12 matching lines @@
   //
   // |invalidate_xmpp_auth_token| makes it so that any auth token
   // used to log into XMPP is invalidated.  This is used for testing
   // code paths related to authentication failures for XMPP only.
   bool Init(const FilePath& database_location,
             const char* sync_server_and_path,
             int sync_server_port,
             const char* gaia_service_id,
             const char* gaia_source,
             bool use_ssl,
-            chrome_common_net::NetworkChangeNotifierThread*
-                network_change_notifier_thread,
             HttpPostProviderFactory* post_factory,
             HttpPostProviderFactory* auth_post_factory,
             browser_sync::ModelSafeWorkerRegistrar* registrar,
             bool attempt_last_user_authentication,
             bool invalidate_last_user_auth_token,
             bool invalidate_xmpp_auth_token,
             const char* user_agent,
             const char* lsid,
             browser_sync::NotificationMethod notification_method);
 
@@ skipping 150 matching lines @@
   // This allows actual HttpPostProvider subclass implementations to be
   // reference counted, which is useful if a particular implementation uses
   // multiple threads to serve network requests.
   virtual void Destroy(HttpPostProviderInterface* http) = 0;
   virtual ~HttpPostProviderFactory() { }
 };
 
 }  // namespace sync_api
 
 #endif  // CHROME_BROWSER_SYNC_ENGINE_SYNCAPI_H_