3 files changed, 6 insertions, 33 deletions
diff --git a/webkit/browser/fileapi/file_system_context.cc b/webkit/browser/fileapi/file_system_context.cc
index db62af7..f8cff22 100644
--- a/webkit/browser/fileapi/file_system_context.cc
+++ b/webkit/browser/fileapi/file_system_context.cc
@@ -228,7 +228,11 @@ void FileSystemContext::OpenFileSystem(
     return;
   }
 
-  GURL root_url = GetFileSystemRootURI(origin_url, type);
+  GURL root_url;
+  if (type == kFileSystemTypeSyncable)
+    root_url = sync_file_system::GetSyncableFileSystemRootURI(origin_url);
+  else
+    root_url = GetFileSystemRootURI(origin_url, type);
   std::string name = GetFileSystemName(origin_url, type);
 
   mount_point_provider->OpenFileSystem(
@@ -236,26 +240,6 @@ void FileSystemContext::OpenFileSystem(
       base::Bind(&DidOpenFileSystem, callback, root_url, name));
 }
 
-void FileSystemContext::OpenSyncableFileSystem(
-    const GURL& origin_url,
-    FileSystemType type,
-    OpenFileSystemMode mode,
-    const OpenFileSystemCallback& callback) {
-  DCHECK(!callback.is_null());
-
-  DCHECK(type == kFileSystemTypeSyncable);
-
-  GURL root_url = sync_file_system::GetSyncableFileSystemRootURI(origin_url);
-  std::string name = GetFileSystemName(origin_url, kFileSystemTypeSyncable);
-
-  FileSystemMountPointProvider* mount_point_provider =
-      GetMountPointProvider(type);
-  DCHECK(mount_point_provider);
-  mount_point_provider->OpenFileSystem(
-      origin_url, type, mode,
-      base::Bind(&DidOpenFileSystem, callback, root_url, name));
-}
-
 void FileSystemContext::DeleteFileSystem(
     const GURL& origin_url,
     FileSystemType type,
diff --git a/webkit/browser/fileapi/file_system_context.h b/webkit/browser/fileapi/file_system_context.h
index 48cea04..d87e38b 100644
--- a/webkit/browser/fileapi/file_system_context.h
+++ b/webkit/browser/fileapi/file_system_context.h
@@ -167,17 +167,6 @@ class WEBKIT_STORAGE_BROWSER_EXPORT FileSystemContext
       OpenFileSystemMode mode,
       const OpenFileSystemCallback& callback);
 
-  // Opens a syncable filesystem for the given |origin_url|.
-  // The file system is internally mounted as an external file system at the
-  // given |mount_name|.
-  // Currently only kFileSystemTypeSyncable type is supported.
-  // TODO(kinuko): Deprecate this method. (http://crbug.com/177137)
-  void OpenSyncableFileSystem(
-      const GURL& origin_url,
-      FileSystemType type,
-      OpenFileSystemMode mode,
-      const OpenFileSystemCallback& callback);
-
   // Deletes the filesystem for the given |origin_url| and |type|. This should
   // be called on the IO Thread.
   void DeleteFileSystem(
diff --git a/webkit/browser/fileapi/syncable/canned_syncable_file_system.cc b/webkit/browser/fileapi/syncable/canned_syncable_file_system.cc
index 77acfae..8bad8f3 100644
--- a/webkit/browser/fileapi/syncable/canned_syncable_file_system.cc
+++ b/webkit/browser/fileapi/syncable/canned_syncable_file_system.cc
@@ -265,7 +265,7 @@ FileSystemURL CannedSyncableFileSystem::URL(const std::string& path) const {
 PlatformFileError CannedSyncableFileSystem::OpenFileSystem() {
   EXPECT_TRUE(is_filesystem_set_up_);
   EXPECT_FALSE(is_filesystem_opened_);
-  file_system_context_->OpenSyncableFileSystem(
+  file_system_context_->OpenFileSystem(
       origin_, type_,
       fileapi::OPEN_FILE_SYSTEM_CREATE_IF_NONEXISTENT,
       base::Bind(&CannedSyncableFileSystem::DidOpenFileSystem,