Added common function to check for supported syncable file system service names.

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 "base/bind.h"
 #include "base/logging.h"
@@ skipping 54 matching lines @@
   sync_file_system::SyncFileSystemService* service =
       SyncFileSystemServiceFactory::GetForProfile(profile);
   DCHECK(service);
   ExtensionSyncEventObserver* observer =
       ExtensionSyncEventObserverFactory::GetForProfile(profile);
   DCHECK(observer);
   observer->InitializeForService(service, kDriveCloudService);
   return service;
 }
 
+bool IsValidServiceName(const std::string& service_name, std::string* error) {
+  DCHECK(error);
+  // TODO(calvinlo): For now only Google Drive cloud service is supported.

[kinuko, 2013/01/08 04:07:48]

nit: Probably this doesn't need to be a TODO comment as it doesn't have a clear
action item.

[calvinlo, 2013/01/08 04:30:18]

Removed TODO

+  if (service_name != std::string(kDriveCloudService)) {
+    *error = base::StringPrintf(kNotSupportedService, service_name.c_str());
+    return false;
+  }
+  return true;
+}
+
 }  // namespace
 
 bool SyncFileSystemDeleteFileSystemFunction::RunImpl() {
-  // TODO(calvinlo): Move error code to util function. (http://crbug.com/160496)
   std::string url;
   EXTENSION_FUNCTION_VALIDATE(args_->GetString(0, &url));
   fileapi::FileSystemURL file_system_url((GURL(url)));
+  if (!IsValidServiceName(file_system_url.filesystem_id(), &error_)) {
+    return false;
+  }
 
   scoped_refptr<fileapi::FileSystemContext> file_system_context =
       BrowserContext::GetStoragePartition(
           profile(),
           render_view_host()->GetSiteInstance())->GetFileSystemContext();
   BrowserThread::PostTask(
       BrowserThread::IO,
       FROM_HERE,
       Bind(&fileapi::FileSystemContext::DeleteFileSystem,
            file_system_context,
@@ skipping 25 matching lines @@
     return;
   }
 
   SetResult(base::Value::CreateBooleanValue(true));
   SendResponse(true);
 }
 
 bool SyncFileSystemRequestFileSystemFunction::RunImpl() {
   std::string service_name;
   EXTENSION_FUNCTION_VALIDATE(args_->GetString(0, &service_name));
-
-  // TODO(calvinlo): Move error code to util function. (http://crbug.com/160496)
-  if (service_name != std::string(kDriveCloudService)) {
-    error_ = base::StringPrintf(kNotSupportedService, service_name.c_str());
+  if (!IsValidServiceName(service_name, &error_)) {
     return false;
   }
 
   // Initializes sync context for this extension and continue to open
   // a new file system.
   GetSyncFileSystemService(profile())->
       InitializeForApp(
           GetFileSystemContext(),
           service_name,
           source_url().GetOrigin(),
@@ skipping 54 matching lines @@
   SetResult(dict);
   dict->SetString("name", file_system_name);
   dict->SetString("root", root_url.spec());
   SendResponse(true);
 }
 
 bool SyncFileSystemGetUsageAndQuotaFunction::RunImpl() {
   std::string url;
   EXTENSION_FUNCTION_VALIDATE(args_->GetString(0, &url));
   fileapi::FileSystemURL file_system_url((GURL(url)));
-
-  // TODO(calvinlo): For now only gDrive cloud service is supported.
-  // TODO(calvinlo): Move error code to util function. (http://crbug.com/160496)
-  const std::string service_name = file_system_url.filesystem_id();
-  if (service_name != std::string(kDriveCloudService)) {
-    error_ = base::StringPrintf(kNotSupportedService, service_name.c_str());
+  if (!IsValidServiceName(file_system_url.filesystem_id(), &error_)) {
     return false;
   }
 
   scoped_refptr<quota::QuotaManager> quota_manager =
       BrowserContext::GetStoragePartition(
           profile(),
           render_view_host()->GetSiteInstance())->GetQuotaManager();
 
   BrowserThread::PostTask(
       BrowserThread::IO,
@@ skipping 68 matching lines @@
   }
 
   api::sync_file_system::StorageInfo info;
   info.usage_bytes = usage;
   info.quota_bytes = quota;
   results_ = api::sync_file_system::GetUsageAndQuota::Results::Create(info);
   SendResponse(true);
 }
 
 }  // namespace extensions