Deprecate DriveMetadataStore.batch_sync_origins

chrome/browser/sync_file_system/drive_file_sync_service.cc

 // 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.
 
 #include "chrome/browser/sync_file_system/drive_file_sync_service.h"
 
 #include <algorithm>
 #include <string>
 #include <utility>
 
@@ skipping 363 matching lines @@
 
 void DriveFileSyncService::DidInitializeMetadataStore(
     const SyncStatusCallback& callback,
     SyncStatusCode status,
     bool created) {
   if (status != SYNC_STATUS_OK) {
     callback.Run(status);
     return;
   }
 
-  // TODO(calvinlo): Move the code to delete legacy batch_sync_origin keys from
-  // DB into DriveMetadataStore.InitializeDBOnFileThread.
-  std::vector<GURL> batch_origins_to_delete;
-  typedef std::map<GURL, std::string>::const_iterator origin_itr;
-  for (origin_itr itr = metadata_store_->batch_sync_origins().begin();
-       itr != metadata_store_->batch_sync_origins().end(); ++itr) {
-    batch_origins_to_delete.push_back(itr->first);
-  }
-  for (std::vector<GURL>::const_iterator itr = batch_origins_to_delete.begin();
-       itr != batch_origins_to_delete.end(); ++itr) {
-    metadata_store_->RemoveOrigin(*itr, base::Bind(&EmptyStatusCallback));
-  }
-
   DCHECK(pending_batch_sync_origins_.empty());
 
   UpdateRegisteredOrigins();
 
   largest_fetched_changestamp_ = metadata_store_->GetLargestChangeStamp();
 
   DriveMetadataStore::URLAndDriveMetadataList to_be_fetched_files;
   status = metadata_store_->GetToBeFetchedFiles(&to_be_fetched_files);
   DCHECK_EQ(SYNC_STATUS_OK, status);
   typedef DriveMetadataStore::URLAndDriveMetadataList::const_iterator iterator;
@@ skipping 201 matching lines @@
     const FileChange& local_file_change,
     const base::FilePath& local_file_path,
     const SyncFileMetadata& local_file_metadata,
     const FileSystemURL& url,
     const SyncStatusCallback& callback) {
   if (GetCurrentState() == REMOTE_SERVICE_DISABLED) {
     callback.Run(SYNC_STATUS_SYNC_DISABLED);
     return;
   }
 
-  if (!metadata_store_->IsIncrementalSyncOrigin(url.origin()) &&
-      !metadata_store_->IsBatchSyncOrigin(url.origin())) {
+  if (!metadata_store_->IsIncrementalSyncOrigin(url.origin())) {
     // We may get called by LocalFileSyncService to sync local changes
     // for the origins that are disabled.
     DVLOG(1) << "Got request for stray origin: " << url.origin().spec();
     callback.Run(SYNC_STATUS_UNKNOWN_ORIGIN);
     return;
   }
 
   DCHECK(!running_local_sync_task_);
   running_local_sync_task_.reset(new drive::LocalChangeProcessorDelegate(
       AsWeakPtr(), local_file_change, local_file_path,
       local_file_metadata, url));
   running_local_sync_task_->Run(base::Bind(
       &DriveFileSyncService::DidApplyLocalChange, AsWeakPtr(), callback));
 }
 
 void DriveFileSyncService::UpdateRegisteredOrigins() {
   ExtensionService* extension_service =
       extensions::ExtensionSystem::Get(profile_)->extension_service();
   DCHECK(pending_batch_sync_origins_.empty());
-  DCHECK(metadata_store_->batch_sync_origins().empty());
   if (!extension_service)
     return;
 
   std::vector<GURL> origins;
   metadata_store_->GetAllOrigins(&origins);
 
   // Update the status of every origin using status from ExtensionService.
   for (std::vector<GURL>::const_iterator itr = origins.begin();
        itr != origins.end(); ++itr) {
     std::string extension_id = itr->host();
@@ skipping 996 matching lines @@
     GURL origin;
     if (IsDriveAPIEnabled()) {
       metadata_store_->GetOriginByOriginRootDirectoryId(
           google_apis::drive::util::ExtractResourceIdFromUrl((*itr)->href()),
           &origin);
     } else {
       origin = drive::APIUtil::DirectoryTitleToOrigin((*itr)->title());
     }
     DCHECK(origin.is_valid());
 
-    if (!metadata_store_->IsBatchSyncOrigin(origin) &&
-        !metadata_store_->IsIncrementalSyncOrigin(origin))
+    if (!metadata_store_->IsIncrementalSyncOrigin(origin))
       continue;
     std::string resource_id(metadata_store_->GetResourceIdForOrigin(origin));
     if (resource_id.empty())
       continue;
     GURL resource_link(api_util_->ResourceIdToResourceLink(resource_id));
     if ((*itr)->href().GetOrigin() != resource_link.GetOrigin() ||
         (*itr)->href().path() != resource_link.path())
       continue;
 
     *origin_out = origin;
@@ skipping 82 matching lines @@
     metadata_store_->SetOriginRootDirectory(origin, resource_id);
   }
   callback.Run(status, resource_id);
 }
 
 std::string DriveFileSyncService::sync_root_resource_id() {
   return metadata_store_->sync_root_directory();
 }
 
 }  // namespace sync_file_system