Collapse fileapi, webkit_blob, webkit_database, quota, and webkit_common namespaces into single sto…

chrome/browser/chromeos/drive/file_system_util.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/chromeos/drive/file_system_util.h"
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/bind.h"
@@ skipping 219 matching lines @@
         !chromeos::ProfileHelper::IsSigninProfile(original_profile)) {
       const base::FilePath base = GetDriveMountPointPath(original_profile);
       if (base == path || base.IsParent(path))
         return original_profile;
     }
   }
   return NULL;
 }
 
 base::FilePath ExtractDrivePathFromFileSystemUrl(
-    const fileapi::FileSystemURL& url) {
-  if (!url.is_valid() || url.type() != fileapi::kFileSystemTypeDrive)
+    const storage::FileSystemURL& url) {
+  if (!url.is_valid() || url.type() != storage::kFileSystemTypeDrive)
     return base::FilePath();
   return ExtractDrivePath(url.path());
 }
 
 base::FilePath GetCacheRootPath(Profile* profile) {
   base::FilePath cache_base_path;
   chrome::GetUserCacheDirectory(profile->GetPath(), &cache_base_path);
   base::FilePath cache_root_path =
       cache_base_path.Append(chromeos::kDriveCacheDirname);
   static const base::FilePath::CharType kFileCacheVersionDir[] =
@@ skipping 131 matching lines @@
   const bool disable_sync_over_celluar =
       profile->GetPrefs()->GetBoolean(prefs::kDisableDriveOverCellular);
 
   if (is_connection_cellular && disable_sync_over_celluar)
     return DRIVE_CONNECTED_METERED;
   return DRIVE_CONNECTED;
 }
 
 }  // namespace util
 }  // namespace drive