SyncFS: store disabled origins in DriveMetadataStore

chrome/browser/sync_file_system/drive_metadata_store.h

Index: chrome/browser/sync_file_system/drive_metadata_store.h
diff --git a/chrome/browser/sync_file_system/drive_metadata_store.h b/chrome/browser/sync_file_system/drive_metadata_store.h
index 691514bb0f635c97a00cf16002ed2cdda137f88c..1ff7862ecb65c5674aeb2e4ba187bd3da22d2db4 100644
--- a/chrome/browser/sync_file_system/drive_metadata_store.h
+++ b/chrome/browser/sync_file_system/drive_metadata_store.h
@@ -80,6 +80,9 @@ class DriveMetadataStore
   // incrementally.
   bool IsIncrementalSyncOrigin(const GURL& origin) const;
 
+  // Returns true if |origin| is a disabled sync origin.
+  bool IsDisabledSyncOrigin(const GURL& origin) const;

[tzik, 2013/03/14 12:50:54]

s/DisabledSyncOrigin/DisabledOrigin/ ?

[nhiroki, 2013/03/15 12:08:56]

I mean to make it consistent with "IsBatchSyncOrigin" and
"IsIncrementalSyncOrigin" since these are coordinative. WDYT?

[kinuko, 2013/03/16 22:11:03]

I think they are for 'batch sync' and 'incremental sync', and I don't think they
are necessarily matched here.

+
   // Marks |origin| as a batch sync origin and associates it with the directory
   // identified by |resource_id|.
   // |origin| must not be a batch sync origin nor an incremental sync origin.
@@ -89,6 +92,12 @@ class DriveMetadataStore
   // |origin| must be a batch sync origin.
   void MoveBatchSyncOriginToIncremental(const GURL& origin);
 
+  void EnableSyncOrigin(const GURL& origin,

[tzik, 2013/03/14 12:50:54]

s/EnableSyncOrigin/EnableOriginSync/,
s/DisableSyncOrigin/DisableOriginSync/ ?

[nhiroki, 2013/03/15 12:08:56]

Done.

+                        const SyncStatusCallback& callback);
+
+  void DisableSyncOrigin(const GURL& origin,
+                         const SyncStatusCallback& callback);
+
   void RemoveOrigin(const GURL& origin,
                     const SyncStatusCallback& callback);
 
@@ -126,9 +135,12 @@ class DriveMetadataStore
     return incremental_sync_origins_;
   }
 
-  // Returns all origins that are tracked. i.e. Union of batch_sync_origins_ and
+  // Returns tracked and enabled origins. i.e. Union of batch_sync_origins_ and
   // incremental_sync_origins_.
-  void GetAllOrigins(std::vector<GURL>* origins);
+  void GetEnabledOrigins(std::vector<GURL>* origins);
+
+  // Returns tracked but disabled origins. i.e. disabled_origins_.
+  void GetDisabledOrigins(std::vector<GURL>* origins);
 
  private:
   friend class DriveMetadataStoreTest;
@@ -139,7 +151,7 @@ class DriveMetadataStore
   void DidInitialize(const InitializationCallback& callback,
                      DriveMetadataDBContents* contents,
                      SyncStatusCode error);
-  void DidRemoveOrigin(const SyncStatusCallback& callback,
+  void DidChangeOrigin(const SyncStatusCallback& callback,
                        SyncStatusCode status);
 
   // These are only for testing.
@@ -151,6 +163,7 @@ class DriveMetadataStore
   void DidRestoreSyncOrigins(const SyncStatusCallback& callback,
                              ResourceIDMap* batch_sync_origins,
                              ResourceIDMap* incremental_sync_origins,
+                             ResourceIDMap* disabled_sync_origins,
                              SyncStatusCode status);
 
   scoped_refptr<base::SequencedTaskRunner> file_task_runner_;
@@ -163,6 +176,7 @@ class DriveMetadataStore
   std::string sync_root_directory_resource_id_;
   ResourceIDMap batch_sync_origins_;
   ResourceIDMap incremental_sync_origins_;
+  ResourceIDMap disabled_sync_origins_;
 
   DISALLOW_COPY_AND_ASSIGN(DriveMetadataStore);
 };