Index: chrome/browser/chrome_content_browser_client.cc |
diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc |
index 17b99dbe53b0e34b1b99aac7964eee6742149ae1..b741c938d934eedf408a1eb5cd5369cb6524a3cf 100644 |
--- a/chrome/browser/chrome_content_browser_client.cc |
+++ b/chrome/browser/chrome_content_browser_client.cc |
@@ -136,7 +136,7 @@ |
#include "ppapi/shared_impl/ppapi_switches.h" |
#include "ui/base/l10n/l10n_util.h" |
#include "ui/base/resource/resource_bundle.h" |
-#include "webkit/browser/fileapi/external_mount_points.h" |
+#include "storage/browser/fileapi/external_mount_points.h" |
#if defined(OS_WIN) |
#include "base/win/windows_version.h" |
@@ -2406,7 +2406,7 @@ void ChromeContentBrowserClient::GetAdditionalAllowedSchemesForFileSystem( |
} |
void ChromeContentBrowserClient::GetURLRequestAutoMountHandlers( |
- std::vector<fileapi::URLRequestAutoMountHandler>* handlers) { |
+ std::vector<storage::URLRequestAutoMountHandler>* handlers) { |
for (size_t i = 0; i < extra_parts_.size(); ++i) |
extra_parts_[i]->GetURLRequestAutoMountHandlers(handlers); |
} |
@@ -2414,9 +2414,9 @@ void ChromeContentBrowserClient::GetURLRequestAutoMountHandlers( |
void ChromeContentBrowserClient::GetAdditionalFileSystemBackends( |
content::BrowserContext* browser_context, |
const base::FilePath& storage_partition_path, |
- ScopedVector<fileapi::FileSystemBackend>* additional_backends) { |
+ ScopedVector<storage::FileSystemBackend>* additional_backends) { |
#if defined(OS_CHROMEOS) |
- fileapi::ExternalMountPoints* external_mount_points = |
+ storage::ExternalMountPoints* external_mount_points = |
content::BrowserContext::GetMountPoints(browser_context); |
DCHECK(external_mount_points); |
chromeos::FileSystemBackend* backend = new chromeos::FileSystemBackend( |
@@ -2425,19 +2425,17 @@ void ChromeContentBrowserClient::GetAdditionalFileSystemBackends( |
new chromeos::MTPFileSystemBackendDelegate(storage_partition_path), |
browser_context->GetSpecialStoragePolicy(), |
external_mount_points, |
- fileapi::ExternalMountPoints::GetSystemInstance()); |
+ storage::ExternalMountPoints::GetSystemInstance()); |
backend->AddSystemMountPoints(); |
- DCHECK(backend->CanHandleType(fileapi::kFileSystemTypeExternal)); |
+ DCHECK(backend->CanHandleType(storage::kFileSystemTypeExternal)); |
additional_backends->push_back(backend); |
#endif |
#if defined(ENABLE_SERVICE_DISCOVERY) |
if (CommandLine::ForCurrentProcess()->HasSwitch( |
switches::kEnablePrivetStorage)) { |
- additional_backends->push_back( |
- new local_discovery::PrivetFileSystemBackend( |
- fileapi::ExternalMountPoints::GetSystemInstance(), |
- browser_context)); |
+ additional_backends->push_back(new local_discovery::PrivetFileSystemBackend( |
+ storage::ExternalMountPoints::GetSystemInstance(), browser_context)); |
} |
#endif |