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

content/browser/browser_context.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 "content/public/browser/browser_context.h"
 
 #if !defined(OS_IOS)
 #include "content/browser/download/download_manager_impl.h"
 #include "content/browser/fileapi/chrome_blob_storage_context.h"
 #include "content/browser/indexed_db/indexed_db_context_impl.h"
@@ skipping 107 matching lines @@
         kDownloadManagerKeyName,
         download_manager);
     download_manager->SetDelegate(context->GetDownloadManagerDelegate());
   }
 
   return static_cast<DownloadManager*>(
       context->GetUserData(kDownloadManagerKeyName));
 }
 
 // static
-fileapi::ExternalMountPoints* BrowserContext::GetMountPoints(
+storage::ExternalMountPoints* BrowserContext::GetMountPoints(
     BrowserContext* context) {
   // Ensure that these methods are called on the UI thread, except for
   // unittests where a UI thread might not have been created.
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI) ||
          !BrowserThread::IsMessageLoopValid(BrowserThread::UI));
 
 #if defined(OS_CHROMEOS)
   if (!context->GetUserData(kMountPointsKey)) {
-    scoped_refptr<fileapi::ExternalMountPoints> mount_points =
-        fileapi::ExternalMountPoints::CreateRefCounted();
+    scoped_refptr<storage::ExternalMountPoints> mount_points =
+        storage::ExternalMountPoints::CreateRefCounted();
     context->SetUserData(
         kMountPointsKey,
-        new UserDataAdapter<fileapi::ExternalMountPoints>(mount_points.get()));
+        new UserDataAdapter<storage::ExternalMountPoints>(mount_points.get()));
   }
 
-  return UserDataAdapter<fileapi::ExternalMountPoints>::Get(
-      context, kMountPointsKey);
+  return UserDataAdapter<storage::ExternalMountPoints>::Get(context,
+                                                            kMountPointsKey);
 #else
   return NULL;
 #endif
 }
 
 StoragePartition* BrowserContext::GetStoragePartition(
     BrowserContext* browser_context,
     SiteInstance* site_instance) {
   std::string partition_domain;
   std::string partition_name;
@@ skipping 117 matching lines @@
 #endif  // !OS_IOS
 
 BrowserContext::~BrowserContext() {
 #if !defined(OS_IOS)
   if (GetUserData(kDownloadManagerKeyName))
     GetDownloadManager(this)->Shutdown();
 #endif
 }
 
 }  // namespace content