[Sync] Put everything in sync/api into csync namespace

chrome/browser/extensions/extension_service.h

 // Copyright (c) 2012 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_EXTENSIONS_EXTENSION_SERVICE_H_
 #define CHROME_BROWSER_EXTENSIONS_EXTENSION_SERVICE_H_
 #pragma once
 
 #include <list>
 #include <map>
@@ skipping 47 matching lines @@
 class ExtensionManagedModeEventRouter;
 class ExtensionManagementEventRouter;
 class ExtensionPreferenceEventRouter;
 class ExtensionSyncData;
 class ExtensionSystem;
 class ExtensionToolbarModel;
 class HistoryExtensionEventRouter;
 class GURL;
 class PendingExtensionManager;
 class Profile;
-class SyncData;
-class SyncErrorFactory;
 class Version;
 
 namespace chromeos {
 class ExtensionBluetoothEventRouter;
 class ExtensionInputMethodEventRouter;
 }
 
+namespace csync {
+class SyncData;
+class SyncErrorFactory;
+}
+
 namespace extensions {
 class AppSyncData;
 class ComponentLoader;
 class ContentSettingsStore;
 class Extension;
 class ExtensionCookiesEventRouter;
 class ExtensionSyncData;
 class ExtensionUpdater;
 class SettingsFrontend;
 class WebNavigationEventRouter;
 }
 
 // This is an interface class to encapsulate the dependencies that
 // various classes have on ExtensionService. This allows easy mocking.
-class ExtensionServiceInterface : public SyncableService {
+class ExtensionServiceInterface : public csync::SyncableService {
  public:
   // A function that returns true if the given extension should be
   // included and false if it should be filtered out.  Identical to
   // PendingExtensionInfo::ShouldAllowInstallPredicate.
   typedef bool (*ExtensionFilter)(const extensions::Extension&);
 
   virtual ~ExtensionServiceInterface() {}
   virtual const ExtensionSet* extensions() const = 0;
   virtual const ExtensionSet* disabled_extensions() const = 0;
   virtual PendingExtensionManager* pending_extension_manager() = 0;
@@ skipping 308 matching lines @@
   virtual void UpdateExtensionBlacklist(
       const std::vector<std::string>& blacklist) OVERRIDE;
 
   // Go through each extension and unload those that the network admin has
   // put on the blacklist (not to be confused with the Google-managed blacklist)
   // set of extensions.
   virtual void CheckAdminBlacklist() OVERRIDE;
 
   virtual void CheckForUpdatesSoon() OVERRIDE;
 
-  // SyncableService implementation.
-  virtual SyncError MergeDataAndStartSyncing(
+  // csync::SyncableService implementation.
+  virtual csync::SyncError MergeDataAndStartSyncing(
       syncable::ModelType type,
-      const SyncDataList& initial_sync_data,
-      scoped_ptr<SyncChangeProcessor> sync_processor,
-      scoped_ptr<SyncErrorFactory> sync_error_factory) OVERRIDE;
+      const csync::SyncDataList& initial_sync_data,
+      scoped_ptr<csync::SyncChangeProcessor> sync_processor,
+      scoped_ptr<csync::SyncErrorFactory> sync_error_factory) OVERRIDE;
   virtual void StopSyncing(syncable::ModelType type) OVERRIDE;
-  virtual SyncDataList GetAllSyncData(syncable::ModelType type) const OVERRIDE;
-  virtual SyncError ProcessSyncChanges(
+  virtual csync::SyncDataList GetAllSyncData(
+      syncable::ModelType type) const OVERRIDE;
+  virtual csync::SyncError ProcessSyncChanges(
       const tracked_objects::Location& from_here,
-      const SyncChangeList& change_list) OVERRIDE;
+      const csync::SyncChangeList& change_list) OVERRIDE;
 
   // Gets the sync data for the given extension, assuming that the extension is
   // syncable.
-  extensions::ExtensionSyncData GetExtensionSyncData(
+  extensions::ExtensionSyncData  GetExtensionSyncData(

[asargent_no_longer_on_chrome, 2012/06/26 18:08:17]

nit: double space before GetExtensionSyncData

[akalin, 2012/06/26 20:28:28]

Done.

       const extensions::Extension& extension) const;
 
   // Gets the sync data for the given app, assuming that the app is
   // syncable.
   extensions::AppSyncData GetAppSyncData(
       const extensions::Extension& extension) const;
 
-  // Gets the ExtensionSyncData for all extensions.
+  // Gets the ExtensionSyncData  for all extensions.

[asargent_no_longer_on_chrome, 2012/06/26 18:08:17]

nit: double space

[akalin, 2012/06/26 20:28:28]

Done.

   std::vector<extensions::ExtensionSyncData> GetExtensionSyncDataList() const;
 
   // Gets the AppSyncData for all extensions.
   std::vector<extensions::AppSyncData> GetAppSyncDataList() const;
 
-  // Applies the change specified passed in by either ExtensionSyncData or
+  // Applies the change specified passed in by either ExtensionSyncData  or

[asargent_no_longer_on_chrome, 2012/06/26 18:08:17]

nit: double space before "or" at end of line

[akalin, 2012/06/26 20:28:28]

Done.

   // AppSyncData to the current system.
   // Returns false if the changes were not completely applied and were added
   // to the pending list to be tried again.
   bool ProcessExtensionSyncData(
       const extensions::ExtensionSyncData& extension_sync_data);
   bool ProcessAppSyncData(const extensions::AppSyncData& app_sync_data);
 
 
   void set_extensions_enabled(bool enabled) { extensions_enabled_ = enabled; }
   bool extensions_enabled() { return extensions_enabled_; }
@@ skipping 148 matching lines @@
 
   ExtensionWarningSet* extension_warnings() {
     return &extension_warnings_;
   }
 
   // Call only from IO thread.
   extensions::APIResourceController* api_resource_controller();
 
   AppShortcutManager* app_shortcut_manager() { return &app_shortcut_manager_; }
 
-  // Specialization of SyncableService::AsWeakPtr.
+  // Specialization of csync::SyncableService::AsWeakPtr.
   base::WeakPtr<ExtensionService> AsWeakPtr() { return base::AsWeakPtr(this); }
 
  private:
   // Contains Extension data that can change during the life of the process,
   // but does not persist across restarts.
   struct ExtensionRuntimeData {
     // True if the background page is ready.
     bool background_page_ready;
 
     // True while the extension is being upgraded.
@@ skipping 220 matching lines @@
   scoped_ptr<ExtensionGlobalError> extension_global_error_;
 
   FRIEND_TEST_ALL_PREFIXES(ExtensionServiceTest,
                            InstallAppsWithUnlimtedStorage);
   FRIEND_TEST_ALL_PREFIXES(ExtensionServiceTest,
                            InstallAppsAndCheckStorageProtection);
   DISALLOW_COPY_AND_ASSIGN(ExtensionService);
 };
 
 #endif  // CHROME_BROWSER_EXTENSIONS_EXTENSION_SERVICE_H_