| Index: chrome/browser/sync_file_system/local/syncable_file_system_unittest.cc
|
| diff --git a/chrome/browser/sync_file_system/local/syncable_file_system_unittest.cc b/chrome/browser/sync_file_system/local/syncable_file_system_unittest.cc
|
| index 3c961a6ba66f70c72acec87f5bfbd63d28e1f197..7f92dee19a473d822e27654bfff333fee63d79a2 100644
|
| --- a/chrome/browser/sync_file_system/local/syncable_file_system_unittest.cc
|
| +++ b/chrome/browser/sync_file_system/local/syncable_file_system_unittest.cc
|
| @@ -15,18 +15,18 @@
|
| #include "testing/gtest/include/gtest/gtest.h"
|
| #include "third_party/leveldatabase/src/helpers/memenv/memenv.h"
|
| #include "third_party/leveldatabase/src/include/leveldb/env.h"
|
| -#include "webkit/browser/fileapi/file_system_context.h"
|
| -#include "webkit/browser/fileapi/file_system_operation_context.h"
|
| -#include "webkit/browser/fileapi/isolated_context.h"
|
| -#include "webkit/browser/quota/quota_manager.h"
|
| -#include "webkit/common/fileapi/file_system_types.h"
|
| -#include "webkit/common/quota/quota_types.h"
|
| +#include "storage/browser/fileapi/file_system_context.h"
|
| +#include "storage/browser/fileapi/file_system_operation_context.h"
|
| +#include "storage/browser/fileapi/isolated_context.h"
|
| +#include "storage/browser/quota/quota_manager.h"
|
| +#include "storage/common/fileapi/file_system_types.h"
|
| +#include "storage/common/quota/quota_types.h"
|
|
|
| using content::SandboxFileSystemTestHelper;
|
| -using fileapi::FileSystemContext;
|
| -using fileapi::FileSystemOperationContext;
|
| -using fileapi::FileSystemURL;
|
| -using fileapi::FileSystemURLSet;
|
| +using storage::FileSystemContext;
|
| +using storage::FileSystemOperationContext;
|
| +using storage::FileSystemURL;
|
| +using storage::FileSystemURLSet;
|
| using quota::QuotaManager;
|
| using quota::QuotaStatusCode;
|
|
|
| @@ -261,7 +261,7 @@ TEST_F(SyncableFileSystemTest, DisableDirectoryOperations) {
|
|
|
| // Set up another (non-syncable) local file system.
|
| SandboxFileSystemTestHelper other_file_system_(
|
| - GURL("http://foo.com/"), fileapi::kFileSystemTypeTemporary);
|
| + GURL("http://foo.com/"), storage::kFileSystemTypeTemporary);
|
| other_file_system_.SetUp(file_system_.file_system_context());
|
|
|
| // Create directory '/a' and file '/a/b' in the other file system.
|
|
|