Collapse fileapi, webkit_blob, webkit_database, quota, and webkit_common namespaces into single storage namespace
As discussed here:
https://groups.google.com/a/chromium.org/forum/#!topic/storage-dev/aQall8GOrS4
BUG=338338
TBR=cevans
NOTRY=true
Review URL: https://codereview.chromium.org/492873002
Cr-Commit-Position: refs/heads/master@{#291485}
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@291485 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/content/browser/browser_context.cc b/content/browser/browser_context.cc
index 8acae2d..9bccfeb 100644
--- a/content/browser/browser_context.cc
+++ b/content/browser/browser_context.cc
@@ -125,7 +125,7 @@
}
// 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.
@@ -134,15 +134,15 @@
#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
