sync: hook up ServerConnectionManager <> SyncerThread2 and tie up more loose ends

chrome/browser/sync/engine/syncapi.h

 // Copyright (c) 2011 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,
@@ skipping 25 matching lines @@
 // children of a node can be enumerated in the order of their position.
 
 #ifndef CHROME_BROWSER_SYNC_ENGINE_SYNCAPI_H_
 #define CHROME_BROWSER_SYNC_ENGINE_SYNCAPI_H_
 #pragma once
 
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
+#include "base/callback.h"
 #include "base/gtest_prod_util.h"
 #include "base/memory/scoped_ptr.h"
 #include "build/build_config.h"
 #include "chrome/browser/sync/protocol/password_specifics.pb.h"
 #include "chrome/browser/sync/syncable/autofill_migration.h"
 #include "chrome/browser/sync/syncable/model_type.h"
 #include "chrome/browser/sync/util/cryptographer.h"
 #include "chrome/common/net/gaia/google_service_auth_error.h"
 #include "googleurl/src/gurl.h"
 
@@ skipping 765 matching lines @@
     virtual void OnClearServerDataFailed() = 0;
 
     // Called after we finish encrypting all appropriate datatypes.
     virtual void OnEncryptionComplete(
         const syncable::ModelTypeSet& encrypted_types) = 0;
 
    protected:
     virtual ~Observer();
   };
 
+  typedef Callback0::Type ModeChangeCallback;
+
   // Create an uninitialized SyncManager.  Callers must Init() before using.
   SyncManager();
   virtual ~SyncManager();
 
   // 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;
@@ skipping 77 matching lines @@
   // TODO(tim): Deprecated.
   bool RequestPause();
 
   // Requests the syncer thread to resume.  The observer's OnResume
   // method will be called when the syncer thread is resumed.  Returns
   // false if the syncer thread can not be resumed (e.g. if it is not
   // paused).
   // TODO(tim): Deprecated.
   bool RequestResume();
 
+  // Puts the SyncerThread into a mode where no normal nudge or poll traffic
+  // will occur, but calls to RequestConfig will be supported.  If |callback|
+  // is provided, it will be invoked (from the internal SyncerThread) when
+  // the thread has changed to configuration mode.
+  void StartConfigurationMode(ModeChangeCallback* callback);
+
   // For the new SyncerThread impl, this switches the mode of operation to
   // CONFIGURATION_MODE and schedules a config task to fetch updates for
   // |types|. It is an error to call this with legacy SyncerThread in use.
   void RequestConfig(const syncable::ModelTypeBitSet& types);
 
   // Request a nudge of the syncer, which will cause the syncer thread
   // to run at the next available opportunity.
   void RequestNudge();
 
   // Request a clearing of all data on the server
@@ skipping 151 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_