SyncFS: store disabled origins in DriveMetadataStore

chrome/browser/sync_file_system/drive_metadata_store.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_SYNC_FILE_SYSTEM_DRIVE_METADATA_STORE_H_
 #define CHROME_BROWSER_SYNC_FILE_SYSTEM_DRIVE_METADATA_STORE_H_
 
 #include <map>
 #include <string>
 #include <vector>
@@ skipping 62 matching lines @@
 
   // Returns true if |origin| is a batch sync origin, i.e. the origin's entire
   // file list hasn't been fully fetched and processed yet.
   bool IsBatchSyncOrigin(const GURL& origin) const;
 
   // Returns true if |origin| is an incremental sync origin, i.e. the origin's
   // entire file list has been cached and is ready to apply changes
   // 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.
   void AddBatchSyncOrigin(const GURL& origin, const std::string& resource_id);
 
   // Marks |origin| as an incremental sync origin.
   // |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);
 
   // Sets the directory identified by |resource_id| as the sync data directory.
   // All data for the Sync FileSystem should be store into the directory.
   // It is invalid to overwrite the directory.
   void SetSyncRootDirectory(const std::string& resource_id);
 
   // Returns a set of URLs for files in conflict.
   SyncStatusCode GetConflictURLs(
@@ skipping 17 matching lines @@
   const ResourceIDMap& batch_sync_origins() const {
     DCHECK(CalledOnValidThread());
     return batch_sync_origins_;
   }
 
   const ResourceIDMap& incremental_sync_origins() const {
     DCHECK(CalledOnValidThread());
     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;
 
   void UpdateDBStatus(SyncStatusCode status);
   void UpdateDBStatusAndInvokeCallback(const SyncStatusCallback& callback,
                                        SyncStatusCode status);
   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.
   void RestoreSyncRootDirectory(const SyncStatusCallback& callback);
   void DidRestoreSyncRootDirectory(const SyncStatusCallback& callback,
                                    std::string* sync_root_directory_resource_id,
                                    SyncStatusCode status);
   void RestoreSyncOrigins(const SyncStatusCallback& callback);
   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_;
   scoped_ptr<DriveMetadataDB> db_;
   SyncStatusCode db_status_;
 
   int64 largest_changestamp_;
   MetadataMap metadata_map_;
 
   std::string sync_root_directory_resource_id_;
   ResourceIDMap batch_sync_origins_;
   ResourceIDMap incremental_sync_origins_;
+  ResourceIDMap disabled_sync_origins_;
 
   DISALLOW_COPY_AND_ASSIGN(DriveMetadataStore);
 };
 
 }  // namespace sync_file_system
 
 #endif  // CHROME_BROWSER_SYNC_FILE_SYSTEM_DRIVE_METADATA_STORE_H_