trunk/src/webkit/fileapi/syncable/canned_syncable_file_system.cc - Issue 15292007: Revert 200828 "Move webkit/fileapi/file_system_mount_point_provi..."

Side by Side Diff: trunk/src/webkit/fileapi/syncable/canned_syncable_file_system.cc

Issue 15292007: Revert 200828 "Move webkit/fileapi/file_system_mount_point_provi..." (Closed) Base URL: svn://svn.chromium.org/chrome/

Patch Set: Created 7 years, 7 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 | Annotate | Revision Log

Property Changes:

Added: svn:mergeinfo
Merged /branches/chrome_webkit_merge_branch/src/webkit/fileapi/syncable/canned_syncable_file_system.cc:r3734-4217,4606-5108,5177-5263

OLD	NEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2012 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 "webkit/fileapi/syncable/canned_syncable_file_system.h"	5 #include "webkit/fileapi/syncable/canned_syncable_file_system.h"

6	6

7 #include "base/bind.h"	7 #include "base/bind.h"

8 #include "base/bind_helpers.h"	8 #include "base/bind_helpers.h"

9 #include "base/file_util.h"	9 #include "base/file_util.h"

10 #include "base/message_loop_proxy.h"	10 #include "base/message_loop_proxy.h"

11 #include "base/run_loop.h"	11 #include "base/run_loop.h"

12 #include "base/single_thread_task_runner.h"	12 #include "base/single_thread_task_runner.h"

13 #include "base/task_runner_util.h"	13 #include "base/task_runner_util.h"

14 #include "testing/gtest/include/gtest/gtest.h"	14 #include "testing/gtest/include/gtest/gtest.h"

15 #include "webkit/blob/mock_blob_url_request_context.h"	15 #include "webkit/blob/mock_blob_url_request_context.h"

16 #include "webkit/browser/fileapi/file_system_mount_point_provider.h"

17 #include "webkit/fileapi/external_mount_points.h"	16 #include "webkit/fileapi/external_mount_points.h"

18 #include "webkit/fileapi/file_system_context.h"	17 #include "webkit/fileapi/file_system_context.h"

	18 #include "webkit/fileapi/file_system_mount_point_provider.h"

19 #include "webkit/fileapi/file_system_operation_context.h"	19 #include "webkit/fileapi/file_system_operation_context.h"

20 #include "webkit/fileapi/file_system_task_runners.h"	20 #include "webkit/fileapi/file_system_task_runners.h"

21 #include "webkit/fileapi/local_file_system_operation.h"	21 #include "webkit/fileapi/local_file_system_operation.h"

22 #include "webkit/fileapi/mock_file_system_options.h"	22 #include "webkit/fileapi/mock_file_system_options.h"

23 #include "webkit/fileapi/sandbox_mount_point_provider.h"	23 #include "webkit/fileapi/sandbox_mount_point_provider.h"

24 #include "webkit/fileapi/syncable/local_file_change_tracker.h"	24 #include "webkit/fileapi/syncable/local_file_change_tracker.h"

25 #include "webkit/fileapi/syncable/local_file_sync_context.h"	25 #include "webkit/fileapi/syncable/local_file_sync_context.h"

26 #include "webkit/fileapi/syncable/syncable_file_system_util.h"	26 #include "webkit/fileapi/syncable/syncable_file_system_util.h"

27 #include "webkit/quota/mock_special_storage_policy.h"	27 #include "webkit/quota/mock_special_storage_policy.h"

28 #include "webkit/quota/quota_manager.h"	28 #include "webkit/quota/quota_manager.h"

(...skipping 568 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
597 sync_status_ = status;	597 sync_status_ = status;

598 base::MessageLoop::current()->Quit();	598 base::MessageLoop::current()->Quit();

599 }	599 }

600	600

601 void CannedSyncableFileSystem::InitializeSyncStatusObserver() {	601 void CannedSyncableFileSystem::InitializeSyncStatusObserver() {

602 ASSERT_TRUE(io_task_runner_->RunsTasksOnCurrentThread());	602 ASSERT_TRUE(io_task_runner_->RunsTasksOnCurrentThread());

603 file_system_context_->sync_context()->sync_status()->AddObserver(this);	603 file_system_context_->sync_context()->sync_status()->AddObserver(this);

604 }	604 }

605	605

606 } // namespace sync_file_system	606 } // namespace sync_file_system

OLD	NEW