chrome/browser/sync_file_system/local/syncable_file_system_unittest.cc - Issue 559063002: Remove webkit/browser/, point everything to storage/browser/ instead

Side by Side Diff: chrome/browser/sync_file_system/local/syncable_file_system_unittest.cc

Issue 559063002: Remove webkit/browser/, point everything to storage/browser/ instead (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 6 years, 3 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 unified diff | Download patch

« chrome/browser/DEPS ('K') | « chrome/browser/sync_file_system/local/syncable_file_system_operation.cc ('k') | chrome/browser/sync_file_system/mock_local_change_processor.cc » ('j') | webkit/common/DEPS » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 // Copyright 2013 The Chromium Authors. All rights reserved.	1 // Copyright 2013 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be	2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

5 #include "base/stl_util.h"	5 #include "base/stl_util.h"

6 #include "base/thread_task_runner_handle.h"	6 #include "base/thread_task_runner_handle.h"

7 #include "chrome/browser/sync_file_system/local/canned_syncable_file_system.h"	7 #include "chrome/browser/sync_file_system/local/canned_syncable_file_system.h"

8 #include "chrome/browser/sync_file_system/local/local_file_change_tracker.h"	8 #include "chrome/browser/sync_file_system/local/local_file_change_tracker.h"

9 #include "chrome/browser/sync_file_system/local/local_file_sync_context.h"	9 #include "chrome/browser/sync_file_system/local/local_file_sync_context.h"

10 #include "chrome/browser/sync_file_system/local/sync_file_system_backend.h"	10 #include "chrome/browser/sync_file_system/local/sync_file_system_backend.h"

11 #include "chrome/browser/sync_file_system/syncable_file_system_util.h"	11 #include "chrome/browser/sync_file_system/syncable_file_system_util.h"

12 #include "content/public/test/async_file_test_helper.h"	12 #include "content/public/test/async_file_test_helper.h"

13 #include "content/public/test/sandbox_file_system_test_helper.h"	13 #include "content/public/test/sandbox_file_system_test_helper.h"

14 #include "content/public/test/test_browser_thread_bundle.h"	14 #include "content/public/test/test_browser_thread_bundle.h"

	15 #include "storage/browser/fileapi/file_system_context.h"

	16 #include "storage/browser/fileapi/file_system_operation_context.h"

	17 #include "storage/browser/fileapi/isolated_context.h"

	18 #include "storage/browser/quota/quota_manager.h"

15 #include "storage/common/fileapi/file_system_types.h"	19 #include "storage/common/fileapi/file_system_types.h"

16 #include "storage/common/quota/quota_types.h"	20 #include "storage/common/quota/quota_types.h"

17 #include "testing/gtest/include/gtest/gtest.h"	21 #include "testing/gtest/include/gtest/gtest.h"

18 #include "third_party/leveldatabase/src/helpers/memenv/memenv.h"	22 #include "third_party/leveldatabase/src/helpers/memenv/memenv.h"

19 #include "third_party/leveldatabase/src/include/leveldb/env.h"	23 #include "third_party/leveldatabase/src/include/leveldb/env.h"

20 #include "webkit/browser/fileapi/file_system_context.h"

21 #include "webkit/browser/fileapi/file_system_operation_context.h"

22 #include "webkit/browser/fileapi/isolated_context.h"

23 #include "webkit/browser/quota/quota_manager.h"

24	24

25 using content::SandboxFileSystemTestHelper;	25 using content::SandboxFileSystemTestHelper;

26 using storage::FileSystemContext;	26 using storage::FileSystemContext;

27 using storage::FileSystemOperationContext;	27 using storage::FileSystemOperationContext;

28 using storage::FileSystemURL;	28 using storage::FileSystemURL;

29 using storage::FileSystemURLSet;	29 using storage::FileSystemURLSet;

30 using storage::QuotaManager;	30 using storage::QuotaManager;

31 using storage::QuotaStatusCode;	31 using storage::QuotaStatusCode;

32	32

33 namespace sync_file_system {	33 namespace sync_file_system {

(...skipping 208 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
242 sync_file_system::SYNC_FILE_TYPE_DIRECTORY));	242 sync_file_system::SYNC_FILE_TYPE_DIRECTORY));

243 VerifyAndClearChange(URL(kPath1),	243 VerifyAndClearChange(URL(kPath1),

244 FileChange(FileChange::FILE_CHANGE_DELETE,	244 FileChange(FileChange::FILE_CHANGE_DELETE,

245 sync_file_system::SYNC_FILE_TYPE_DIRECTORY));	245 sync_file_system::SYNC_FILE_TYPE_DIRECTORY));

246 VerifyAndClearChange(URL(kPath2),	246 VerifyAndClearChange(URL(kPath2),

247 FileChange(FileChange::FILE_CHANGE_DELETE,	247 FileChange(FileChange::FILE_CHANGE_DELETE,

248 sync_file_system::SYNC_FILE_TYPE_FILE));	248 sync_file_system::SYNC_FILE_TYPE_FILE));

249 }	249 }

250	250

251 } // namespace sync_file_system	251 } // namespace sync_file_system

OLD	NEW