Refactor sync notifier out of sync api.

chrome/browser/sync/glue/sync_backend_host.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.
 
 #ifndef CHROME_BROWSER_SYNC_GLUE_SYNC_BACKEND_HOST_H_
 #define CHROME_BROWSER_SYNC_GLUE_SYNC_BACKEND_HOST_H_
 #pragma once
 
 #include <map>
 #include <string>
@@ skipping 10 matching lines @@
 #include "chrome/browser/sync/engine/model_safe_worker.h"
 #include "chrome/browser/sync/js_backend.h"
 #include "chrome/browser/sync/js_sync_manager_observer.h"
 #include "chrome/browser/sync/glue/data_type_controller.h"
 #include "chrome/browser/sync/glue/ui_model_worker.h"
 #include "chrome/browser/sync/js_event_router.h"
 #include "chrome/browser/sync/syncable/model_type.h"
 #include "chrome/common/net/gaia/google_service_auth_error.h"
 #include "chrome/common/net/url_request_context_getter.h"
 #include "googleurl/src/gurl.h"
-#include "jingle/notifier/base/notifier_options.h"
 
 class CancelableTask;
 class Profile;
 
-namespace notifier {
-struct NotifierOptions;
-}
-
 namespace browser_sync {
 
 namespace sessions {
 struct SyncSessionSnapshot;
 }
 
 class ChangeProcessor;
 class DataTypeController;
 class JsArgList;
 
@@ skipping 71 matching lines @@
 
   // Called on |frontend_loop_| to kick off asynchronous initialization.
   // As a fallback when no cached auth information is available, try to
   // bootstrap authentication using |lsid|, if it isn't empty.
   // Optionally delete the Sync Data folder (if it's corrupt).
   void Initialize(SyncFrontend* frontend,
                   const GURL& service_url,
                   const syncable::ModelTypeSet& types,
                   URLRequestContextGetter* baseline_context_getter,
                   const sync_api::SyncCredentials& credentials,
-                  bool delete_sync_data_folder,
-                  const notifier::NotifierOptions& notifier_options);
+                  bool delete_sync_data_folder);
 
   // Called from |frontend_loop| to update SyncCredentials.
   void UpdateCredentials(const sync_api::SyncCredentials& credentials);
 
   virtual void UpdateEnabledTypes(const syncable::ModelTypeSet& types);
 
   // This starts the SyncerThread running a Syncer object to communicate with
   // sync servers.  Until this is called, no changes will leave or enter this
   // browser from the cloud / sync servers.
   // Called on |frontend_loop_|.
@@ skipping 158 matching lines @@
     virtual void RouteJsEvent(const std::string& event_name,
                               const JsArgList& args,
                               const JsEventHandler* dst);
 
     struct DoInitializeOptions {
       DoInitializeOptions(
           const GURL& service_url,
           sync_api::HttpPostProviderFactory* http_bridge_factory,
           const sync_api::SyncCredentials& credentials,
           bool delete_sync_data_folder,
-          const notifier::NotifierOptions& notifier_options,
           std::string restored_key_for_bootstrapping,
           bool setup_for_test_mode);
       ~DoInitializeOptions();
 
       GURL service_url;
       sync_api::HttpPostProviderFactory* http_bridge_factory;
       sync_api::SyncCredentials credentials;
       std::string lsid;
       bool delete_sync_data_folder;
-      notifier::NotifierOptions notifier_options;
       std::string restored_key_for_bootstrapping;
       bool setup_for_test_mode;
     };
 
     // Note:
     //
     // The Do* methods are the various entry points from our SyncBackendHost.
     // It calls us on a dedicated thread to actually perform synchronous
     // (and potentially blocking) syncapi operations.
     //
@@ skipping 70 matching lines @@
     // setup to nudge the syncapi into a usable state.
     void DoInitializeForTest(const std::wstring& test_user,
                              sync_api::HttpPostProviderFactory* factory,
                              bool delete_sync_data_folder) {
       // Construct dummy credentials for test.
       sync_api::SyncCredentials credentials;
       credentials.email = WideToUTF8(test_user);
       credentials.sync_token = "token";
       DoInitialize(DoInitializeOptions(GURL(), factory, credentials,
                                        delete_sync_data_folder,
-                                       notifier::NotifierOptions(), "", true));
+                                       "", true));
     }
 #endif
 
    private:
     friend class base::RefCountedThreadSafe<SyncBackendHost::Core>;
     friend class SyncBackendHostForProfileSyncTest;
 
     virtual ~Core();
 
     // Return change processor for a particular model (return NULL on failure).
@@ skipping 200 matching lines @@
 
   // Whether we've processed the initialization complete callback.
   bool syncapi_initialized_;
 
   DISALLOW_COPY_AND_ASSIGN(SyncBackendHost);
 };
 
 }  // namespace browser_sync
 
 #endif  // CHROME_BROWSER_SYNC_GLUE_SYNC_BACKEND_HOST_H_