Deprecate DriveMetadataStore.batch_sync_origins

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 <utility>
 #include <vector>
 
 #include "base/callback_forward.h"
 #include "base/files/file_path.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/threading/non_thread_safe.h"
 #include "webkit/fileapi/file_system_url.h"
 #include "webkit/fileapi/syncable/sync_callbacks.h"
 #include "webkit/fileapi/syncable/sync_status_code.h"
 
 namespace base {
 class SequencedTaskRunner;
 }
 
+namespace leveldb {
+class DB;
+}
+
 class GURL;
 
 namespace sync_file_system {
 
 class DriveMetadata;
 class DriveMetadataDB;
 struct DriveMetadataDBContents;
 
 // This class holds a snapshot of the server side metadata.
 class DriveMetadataStore
@@ skipping 35 matching lines @@
   // Lookups and reads the database entry for |url|.
   SyncStatusCode ReadEntry(const fileapi::FileSystemURL& url,
                            DriveMetadata* metadata) const;
 
   // Marks |origin| as incremental sync and associates it with the directory
   // identified by |resource_id|.
   // |origin| must not already be an incremental sync origin.
   void AddIncrementalSyncOrigin(const GURL& origin,
                                 const std::string& resource_id);
 
-  // Returns true if |origin| is a batch sync origin, a incremental sync origin
-  // or a disabled origin.
+  // Returns true if |origin| is an incremental sync or disabled origin.
   bool IsKnownOrigin(const GURL& origin) const;
 
-  // 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 origin.
   bool IsOriginDisabled(const GURL& origin) const;
 
   void EnableOrigin(const GURL& origin,
                     const SyncStatusCallback& callback);
@@ skipping 11 matching lines @@
                               const std::string& resource_id);
 
   // Returns a set of URLs for files in conflict.
   SyncStatusCode GetConflictURLs(
       fileapi::FileSystemURLSet* urls) const;
 
   // Returns a set of URLs and Resource IDs for files to be fetched.
   SyncStatusCode GetToBeFetchedFiles(URLAndDriveMetadataList* list) const;
 
   // Returns resource id for |origin|.
-  // This may return an empty string if |origin| is not a batch, incremental
-  // or disabled origin.
+  // This may return an empty string if |origin| is not a incremental or
+  // disabled origin.
   std::string GetResourceIdForOrigin(const GURL& origin) const;
 
   const std::string& sync_root_directory() const {
     DCHECK(CalledOnValidThread());
     return sync_root_directory_resource_id_;
   }
 
-  const ResourceIdByOrigin& batch_sync_origins() const {
-    DCHECK(CalledOnValidThread());
-    return batch_sync_origins_;
-  }
-
   const ResourceIdByOrigin& incremental_sync_origins() const {
     DCHECK(CalledOnValidThread());
     return incremental_sync_origins_;
   }
 
   const ResourceIdByOrigin& disabled_origins() const {
     DCHECK(CalledOnValidThread());
     return disabled_origins_;
   }
 
-  // Returns all tracked origins. i.e. Union of batch_sync_origins_,
-  // incremental_sync_origins_ and disabled_origins_.
+  // Returns all tracked origins. i.e. incremental_sync_origins_ and
+  // disabled_origins_.
   void GetAllOrigins(std::vector<GURL>* origins);
 
   // Maps |resource_id| to corresponding |origin|.
   // Returns true if the directory indicated by |resource_id| is not an origin
   // root directory.
   bool GetOriginByOriginRootDirectoryId(const std::string& resource_id,
                                         GURL* origin);
 
  private:
   friend class DriveMetadataStoreTest;
 
-  // 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 UpdateDBStatus(SyncStatusCode status);
   void UpdateDBStatusAndInvokeCallback(const SyncStatusCallback& callback,
                                        SyncStatusCode status);
   void DidInitialize(const InitializationCallback& callback,
                      DriveMetadataDBContents* contents,
                      SyncStatusCode error);
   void DidUpdateOrigin(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 RestoreOrigins(const SyncStatusCallback& callback);
   void DidRestoreOrigins(const SyncStatusCallback& callback,
-                         ResourceIdByOrigin* batch_sync_origins,
                          ResourceIdByOrigin* incremental_sync_origins,
                          ResourceIdByOrigin* disabled_origins,
                          SyncStatusCode status);
+  leveldb::DB* level_db();

[tzik, 2013/05/27 09:23:54]

Can you rename this with ForTesting like GetDBInstanceForTesting?

[calvinlo, 2013/05/27 09:47:47]

Done.

 
   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_;
-  ResourceIdByOrigin batch_sync_origins_;
   ResourceIdByOrigin incremental_sync_origins_;
   ResourceIdByOrigin disabled_origins_;
 
   OriginByResourceId origin_by_resource_id_;
 
   DISALLOW_COPY_AND_ASSIGN(DriveMetadataStore);
 };
 
 }  // namespace sync_file_system
 
 #endif  // CHROME_BROWSER_SYNC_FILE_SYSTEM_DRIVE_METADATA_STORE_H_