Cleanup: Deprecate DriveFileSyncService::kServiceName

chrome/browser/sync_file_system/local_file_sync_service_unittest.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 "base/basictypes.h"
 #include "base/bind.h"
 #include "base/file_util.h"
 #include "base/location.h"
 #include "base/message_loop/message_loop_proxy.h"
 #include "base/run_loop.h"
@@ skipping 20 matching lines @@
 using ::testing::_;
 using ::testing::AtLeast;
 using ::testing::InvokeWithoutArgs;
 using ::testing::StrictMock;
 
 namespace sync_file_system {
 
 namespace {
 
 const char kOrigin[] = "http://example.com";
-const char kServiceName[] = "test";
 
 void DidPrepareForProcessRemoteChange(const tracked_objects::Location& where,
                                       const base::Closure& oncompleted,
                                       SyncStatusCode expected_status,
                                       const SyncFileMetadata& expected_metadata,
                                       SyncStatusCode status,
                                       const SyncFileMetadata& metadata,
                                       const FileChangeList& changes) {
   SCOPED_TRACE(testing::Message() << where.ToString());
   ASSERT_EQ(expected_status, status);
@@ skipping 47 matching lines @@
   LocalFileSyncServiceTest() : num_changes_(0) {}
 
   virtual ~LocalFileSyncServiceTest() {}
 
   virtual void SetUp() OVERRIDE {
     ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
 
     thread_helper_.SetUp();
 
     file_system_.reset(new CannedSyncableFileSystem(
-        GURL(kOrigin), kServiceName,
+        GURL(kOrigin),
         thread_helper_.io_task_runner(),
         thread_helper_.file_task_runner()));
 
     local_service_.reset(new LocalFileSyncService(&profile_));
 
     file_system_->SetUp();
 
     base::RunLoop run_loop;
     SyncStatusCode status = SYNC_STATUS_UNKNOWN;
     local_service_->MaybeInitializeFileSystemContext(
-        GURL(kOrigin), kServiceName, file_system_->file_system_context(),
+        GURL(kOrigin), file_system_->file_system_context(),
         AssignAndQuitCallback(&run_loop, &status));
     run_loop.Run();
 
     local_service_->AddChangeObserver(this);
 
     EXPECT_EQ(base::PLATFORM_FILE_OK, file_system_->OpenFileSystem());
 
     file_system_->file_system_context()->sync_context()->
         set_mock_notify_changes_duration_in_sec(0);
   }
 
   virtual void TearDown() OVERRIDE {
     local_service_->Shutdown();
     file_system_->TearDown();
-    RevokeSyncableFileSystem(kServiceName);
+    RevokeSyncableFileSystem();
 
     thread_helper_.TearDown();
   }
 
   // LocalChangeObserver overrides.
   virtual void OnLocalChangeAvailable(int64 num_changes) OVERRIDE {
     num_changes_ = num_changes;
   }
 
   void PrepareForProcessRemoteChange(
       const FileSystemURL& url,
       const tracked_objects::Location& where,
       SyncStatusCode expected_status,
       const SyncFileMetadata& expected_metadata) {
     base::RunLoop run_loop;
     local_service_->PrepareForProcessRemoteChange(
         url,
-        kServiceName,
         base::Bind(&DidPrepareForProcessRemoteChange,
                    where,
                    run_loop.QuitClosure(),
                    expected_status,
                    expected_metadata));
     run_loop.Run();
   }
 
   SyncStatusCode ApplyRemoteChange(const FileChange& change,
                                    const base::FilePath& local_path,
@@ skipping 108 matching lines @@
 #define MAYBE_LocalChangeObserverMultipleContexts\
     DISABLED_LocalChangeObserverMultipleContexts
 #else
 #define MAYBE_LocalChangeObserverMultipleContexts\
     LocalChangeObserverMultipleContexts
 #endif
 
 TEST_F(LocalFileSyncServiceTest, MAYBE_LocalChangeObserverMultipleContexts) {
   const char kOrigin2[] = "http://foo";
   CannedSyncableFileSystem file_system2(GURL(kOrigin2),
-                                        kServiceName,
                                         thread_helper_.io_task_runner(),
                                         thread_helper_.file_task_runner());
   file_system2.SetUp();
 
   base::RunLoop run_loop;
   SyncStatusCode status = SYNC_STATUS_UNKNOWN;
   local_service_->MaybeInitializeFileSystemContext(
-      GURL(kOrigin2), kServiceName, file_system2.file_system_context(),
+      GURL(kOrigin2), file_system2.file_system_context(),
       AssignAndQuitCallback(&run_loop, &status));
   run_loop.Run();
 
   EXPECT_EQ(base::PLATFORM_FILE_OK, file_system2.OpenFileSystem());
   file_system2.file_system_context()->sync_context()->
       set_mock_notify_changes_duration_in_sec(0);
 
   const FileSystemURL kFile1(file_system_->URL("file1"));
   const FileSystemURL kFile2(file_system_->URL("file2"));
   const FileSystemURL kFile3(file_system2.URL("file3"));
@@ skipping 397 matching lines @@
   all_origins.insert(kOrigin2);
   all_origins.insert(kOrigin3);
   while (!all_origins.empty()) {
     ASSERT_TRUE(NextOriginToProcess(&origin));
     ASSERT_TRUE(ContainsKey(all_origins, origin));
     all_origins.erase(origin);
   }
 }
 
 }  // namespace sync_file_system