[SyncFileSystem] Stop referring to DriveFileSyncService from extension/

chrome/browser/extensions/api/sync_file_system/sync_file_system_api.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/extensions/api/sync_file_system/sync_file_system_api.h"
 
 #include <string>
 #include <utility>
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/stringprintf.h"
 #include "chrome/browser/extensions/api/sync_file_system/extension_sync_event_observer.h"
 #include "chrome/browser/extensions/api/sync_file_system/extension_sync_event_observer_factory.h"
 #include "chrome/browser/extensions/api/sync_file_system/sync_file_system_api_helpers.h"
 #include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/sync_file_system/drive_file_sync_service.h"
 #include "chrome/browser/sync_file_system/sync_file_system_service.h"
 #include "chrome/browser/sync_file_system/sync_file_system_service_factory.h"
 #include "chrome/common/extensions/api/sync_file_system.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/storage_partition.h"
 #include "content/public/common/content_client.h"
 #include "webkit/browser/fileapi/file_system_context.h"
 #include "webkit/browser/fileapi/file_system_url.h"
 #include "webkit/browser/fileapi/syncable/sync_file_status.h"
 #include "webkit/common/fileapi/file_system_types.h"
 #include "webkit/common/fileapi/file_system_util.h"
 #include "webkit/quota/quota_manager.h"
 
 using content::BrowserContext;
 using content::BrowserThread;
 using sync_file_system::ConflictResolutionPolicy;
 using sync_file_system::SyncFileStatus;
 using sync_file_system::SyncFileSystemServiceFactory;
 using sync_file_system::SyncStatusCode;
 
 namespace extensions {
 
 namespace {
 
-// This is the only supported cloud backend service for now.
-const char* const kDriveCloudService =
-    sync_file_system::DriveFileSyncService::kServiceName;
-
 // Error messages.
 const char kFileError[] = "File error %d.";
 const char kQuotaError[] = "Quota error %d.";
 const char kUnsupportedConflictResolutionPolicy[] =
     "Policy %s is not supported.";
 
 sync_file_system::SyncFileSystemService* GetSyncFileSystemService(
     Profile* profile) {
   sync_file_system::SyncFileSystemService* service =
       SyncFileSystemServiceFactory::GetForProfile(profile);
   DCHECK(service);
   ExtensionSyncEventObserver* observer =
       ExtensionSyncEventObserverFactory::GetForProfile(profile);
   DCHECK(observer);
-  observer->InitializeForService(service, kDriveCloudService);
+  observer->InitializeForService(
+      service,
+      sync_file_system::SyncFileSystemService::GetDefaultServiceName());

[kinuko, 2013/05/29 14:12:20]

I think this parameter can be dropped. (Not used by the observer either)

   return service;
 }
 
 }  // namespace
 
 bool SyncFileSystemDeleteFileSystemFunction::RunImpl() {
   std::string url;
   EXTENSION_FUNCTION_VALIDATE(args_->GetString(0, &url));
 
   scoped_refptr<fileapi::FileSystemContext> file_system_context =
@@ skipping 34 matching lines @@
     SetResult(base::Value::CreateBooleanValue(false));
     SendResponse(false);
     return;
   }
 
   SetResult(base::Value::CreateBooleanValue(true));
   SendResponse(true);
 }
 
 bool SyncFileSystemRequestFileSystemFunction::RunImpl() {
-  // Please note that Google Drive is the only supported cloud backend at this
-  // time. However other functions which have already been written to
-  // accommodate different service names are being left as is to allow easier
-  // future support for other backend services. (http://crbug.com/172562).
-  const std::string service_name = sync_file_system::DriveFileSyncService::
-      kServiceName;
+  // Please note that the default backing service is the only supported cloud
+  // backend at this time. However other functions which have already been
+  // written to accommodate different service names are being left as is to
+  // allow easier future support for other backend services.
+  // (http://crbug.com/172562).
+  const std::string service_name =
+      sync_file_system::SyncFileSystemService::GetDefaultServiceName();
   // Initializes sync context for this extension and continue to open
   // a new file system.
   GetSyncFileSystemService(profile())->
       InitializeForApp(
           GetFileSystemContext(),
           service_name,

[kinuko, 2013/05/29 14:12:20]

Ditto, I think this parameter can be dropped.

           source_url().GetOrigin(),
           base::Bind(&self::DidInitializeFileSystemContext, this,
                      service_name));
   return true;
 }
 
 fileapi::FileSystemContext*
 SyncFileSystemRequestFileSystemFunction::GetFileSystemContext() {
   DCHECK(render_view_host());
   return BrowserContext::GetStoragePartition(
@@ skipping 255 matching lines @@
   DCHECK(service);
   api::sync_file_system::ConflictResolutionPolicy policy =
       ConflictResolutionPolicyToExtensionEnum(
           service->GetConflictResolutionPolicy());
   SetResult(Value::CreateStringValue(
           api::sync_file_system::ToString(policy)));
   return true;
 }
 
 }  // namespace extensions