Cleanup: Deprecate DriveFileSyncService::kServiceName

chrome/browser/sync_file_system/drive_metadata_store.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_metadata_store.h"
 
 #include <utility>
 #include <vector>
 
 #include "base/bind.h"
@@ skipping 23 matching lines @@
 namespace sync_file_system {
 
 typedef DriveMetadataStore::ResourceIdByOrigin ResourceIdByOrigin;
 typedef DriveMetadataStore::OriginByResourceId OriginByResourceId;
 
 const base::FilePath::CharType DriveMetadataStore::kDatabaseName[] =
     FILE_PATH_LITERAL("DriveMetadata");
 
 namespace {
 
-const char* const kServiceName = DriveFileSyncService::kServiceName;
 const char kDatabaseVersionKey[] = "VERSION";
 const int64 kCurrentDatabaseVersion = 2;
 const char kChangeStampKey[] = "CHANGE_STAMP";
 const char kSyncRootDirectoryKey[] = "SYNC_ROOT_DIR";
 const char kDriveMetadataKeyPrefix[] = "METADATA: ";
 const char kMetadataKeySeparator = ' ';
 const char kDriveIncrementalSyncOriginKeyPrefix[] = "ISYNC_ORIGIN: ";
 const char kDriveDisabledOriginKeyPrefix[] = "DISABLED_ORIGIN: ";
 const size_t kDriveMetadataKeyPrefixLength = arraysize(kDriveMetadataKeyPrefix);
 
@@ skipping 608 matching lines @@
 
   urls->clear();
   for (MetadataMap::const_iterator origin_itr = metadata_map_.begin();
        origin_itr != metadata_map_.end();
        ++origin_itr) {
     for (PathToMetadata::const_iterator itr = origin_itr->second.begin();
          itr != origin_itr->second.end();
          ++itr) {
       if (itr->second.conflicted()) {
         urls->insert(CreateSyncableFileSystemURL(
-            origin_itr->first, kServiceName, itr->first));
+            origin_itr->first, itr->first));
       }
     }
   }
   return SYNC_STATUS_OK;
 }
 
 SyncStatusCode DriveMetadataStore::GetToBeFetchedFiles(
     URLAndDriveMetadataList* list) const {
   DCHECK(CalledOnValidThread());
   DCHECK_EQ(SYNC_STATUS_OK, db_status_);
 
   list->clear();
   for (MetadataMap::const_iterator origin_itr = metadata_map_.begin();
        origin_itr != metadata_map_.end();
        ++origin_itr) {
     for (PathToMetadata::const_iterator itr = origin_itr->second.begin();
          itr != origin_itr->second.end();
          ++itr) {
       if (itr->second.to_be_fetched()) {
         FileSystemURL url = CreateSyncableFileSystemURL(
-            origin_itr->first, kServiceName, itr->first);
+            origin_itr->first, itr->first);
         list->push_back(std::make_pair(url, itr->second));
       }
     }
   }
   return SYNC_STATUS_OK;
 }
 
 std::string DriveMetadataStore::GetResourceIdForOrigin(
     const GURL& origin) const {
   DCHECK(CalledOnValidThread());
@@ skipping 363 matching lines @@
 
     bool result = disabled_origins->insert(
         std::make_pair(origin, origin_resource_id)).second;
     DCHECK(result);
   }
 
   return SYNC_STATUS_OK;
 }
 
 }  // namespace sync_file_system