chrome/browser/chromeos/file_manager/external_filesystem_apitest.cc - Issue 492873002: Collapse fileapi, webkit_blob, webkit_database, quota, and webkit_common namespaces into single sto…

Unified Diff: chrome/browser/chromeos/file_manager/external_filesystem_apitest.cc

Issue 492873002: Collapse fileapi, webkit_blob, webkit_database, quota, and webkit_common namespaces into single sto… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: fix chromeos build Created 6 years, 4 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/chromeos/extensions/file_manager/private_api_util.cc ('k') | chrome/browser/chromeos/file_manager/file_browser_handlers.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/file_manager/external_filesystem_apitest.cc

diff --git a/chrome/browser/chromeos/file_manager/external_filesystem_apitest.cc b/chrome/browser/chromeos/file_manager/external_filesystem_apitest.cc

index ecdfb71629ff4ffd071bd365b1c634fa9c367a80..fc6330ca8cffacf9777431285684d7df42126dca 100644

--- a/chrome/browser/chromeos/file_manager/external_filesystem_apitest.cc

+++ b/chrome/browser/chromeos/file_manager/external_filesystem_apitest.cc

@@ -408,11 +408,11 @@ class LocalFileSystemExtensionApiTest : public FileSystemExtensionApiTestBase {

// FileSystemExtensionApiTestBase OVERRIDE.

virtual void AddTestMountPoint() OVERRIDE {

- EXPECT_TRUE(content::BrowserContext::GetMountPoints(browser()->profile())->

- RegisterFileSystem(kLocalMountPointName,

- fileapi::kFileSystemTypeNativeLocal,

- fileapi::FileSystemMountOption(),

- mount_point_dir_));

+ EXPECT_TRUE(content::BrowserContext::GetMountPoints(browser()->profile())

+ ->RegisterFileSystem(kLocalMountPointName,

+ storage::kFileSystemTypeNativeLocal,

+ storage::FileSystemMountOption(),

+ mount_point_dir_));

VolumeManager::Get(browser()->profile())->AddVolumeInfoForTesting(

mount_point_dir_, VOLUME_TYPE_TESTING, chromeos::DEVICE_TYPE_UNKNOWN);

}

@@ -438,11 +438,12 @@ class RestrictedFileSystemExtensionApiTest

// FileSystemExtensionApiTestBase OVERRIDE.

virtual void AddTestMountPoint() OVERRIDE {

- EXPECT_TRUE(content::BrowserContext::GetMountPoints(browser()->profile())->

- RegisterFileSystem(kRestrictedMountPointName,

- fileapi::kFileSystemTypeRestrictedNativeLocal,

- fileapi::FileSystemMountOption(),

- mount_point_dir_));

+ EXPECT_TRUE(

+ content::BrowserContext::GetMountPoints(browser()->profile())

+ ->RegisterFileSystem(kRestrictedMountPointName,

+ storage::kFileSystemTypeRestrictedNativeLocal,

+ storage::FileSystemMountOption(),

+ mount_point_dir_));

VolumeManager::Get(browser()->profile())->AddVolumeInfoForTesting(

mount_point_dir_, VOLUME_TYPE_TESTING, chromeos::DEVICE_TYPE_UNKNOWN);

}

@@ -627,8 +628,8 @@ class LocalAndDriveFileSystemExtensionApiTest

virtual void AddTestMountPoint() OVERRIDE {

EXPECT_TRUE(content::BrowserContext::GetMountPoints(browser()->profile())

->RegisterFileSystem(kLocalMountPointName,

- fileapi::kFileSystemTypeNativeLocal,

- fileapi::FileSystemMountOption(),

+ storage::kFileSystemTypeNativeLocal,

+ storage::FileSystemMountOption(),

local_mount_point_dir_));

VolumeManager::Get(browser()->profile())

->AddVolumeInfoForTesting(local_mount_point_dir_,