Move webkit/fileapi/syncable/* code to webkit/browser/fileapi (final!)

This moves all webkit/fileapi/syncable/* code under
webkit/browser/fileapi/syncable.

BUG=239710
TBR=avi, thestig
NOTRY=true

Review URL: https://chromiumcodereview.appspot.com/15806012

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@202507 0039d316-1c4b-4281-b951-d872f2087c98

44 files changed, 184 insertions, 189 deletions

diff --git a/webkit/browser/fileapi/file_system_context.cc b/webkit/browser/fileapi/file_system_context.cc
index 54912d5..a25f050 100644
--- a/webkit/browser/fileapi/file_system_context.cc
+++ b/webkit/browser/fileapi/file_system_context.cc
@@ -22,11 +22,11 @@
 #include "webkit/browser/fileapi/isolated_mount_point_provider.h"
 #include "webkit/browser/fileapi/mount_points.h"
 #include "webkit/browser/fileapi/sandbox_mount_point_provider.h"
+#include "webkit/browser/fileapi/syncable/local_file_change_tracker.h"
+#include "webkit/browser/fileapi/syncable/local_file_sync_context.h"
+#include "webkit/browser/fileapi/syncable/syncable_file_system_util.h"
 #include "webkit/browser/fileapi/test_mount_point_provider.h"
 #include "webkit/common/fileapi/file_system_util.h"
-#include "webkit/fileapi/syncable/local_file_change_tracker.h"
-#include "webkit/fileapi/syncable/local_file_sync_context.h"
-#include "webkit/fileapi/syncable/syncable_file_system_util.h"
 #include "webkit/quota/quota_manager.h"
 #include "webkit/quota/special_storage_policy.h"
 
diff --git a/webkit/browser/fileapi/file_system_url_unittest.cc b/webkit/browser/fileapi/file_system_url_unittest.cc
index 2044d19..5c68590 100644
--- a/webkit/browser/fileapi/file_system_url_unittest.cc
+++ b/webkit/browser/fileapi/file_system_url_unittest.cc
@@ -7,9 +7,9 @@
 #include "base/files/file_path.h"
 #include "googleurl/src/gurl.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "webkit/browser/fileapi/syncable/syncable_file_system_util.h"
 #include "webkit/common/fileapi/file_system_types.h"
 #include "webkit/common/fileapi/file_system_util.h"
-#include "webkit/fileapi/syncable/syncable_file_system_util.h"
 
 #define FPL FILE_PATH_LITERAL
 
diff --git a/webkit/browser/fileapi/obfuscated_file_util.cc b/webkit/browser/fileapi/obfuscated_file_util.cc
index fd581b6..2971fe2 100644
--- a/webkit/browser/fileapi/obfuscated_file_util.cc
+++ b/webkit/browser/fileapi/obfuscated_file_util.cc
@@ -25,8 +25,8 @@
 #include "webkit/browser/fileapi/file_system_url.h"
 #include "webkit/browser/fileapi/native_file_util.h"
 #include "webkit/browser/fileapi/sandbox_mount_point_provider.h"
+#include "webkit/browser/fileapi/syncable/syncable_file_system_util.h"
 #include "webkit/common/fileapi/file_system_util.h"
-#include "webkit/fileapi/syncable/syncable_file_system_util.h"
 #include "webkit/quota/quota_manager.h"
 
 // Example of various paths:
diff --git a/webkit/browser/fileapi/sandbox_mount_point_provider.cc b/webkit/browser/fileapi/sandbox_mount_point_provider.cc
index e666b77..b7c2a4f 100644
--- a/webkit/browser/fileapi/sandbox_mount_point_provider.cc
+++ b/webkit/browser/fileapi/sandbox_mount_point_provider.cc
@@ -26,9 +26,9 @@
 #include "webkit/browser/fileapi/obfuscated_file_util.h"
 #include "webkit/browser/fileapi/sandbox_file_stream_writer.h"
 #include "webkit/browser/fileapi/sandbox_quota_observer.h"
+#include "webkit/browser/fileapi/syncable/syncable_file_system_operation.h"
 #include "webkit/common/fileapi/file_system_types.h"
 #include "webkit/common/fileapi/file_system_util.h"
-#include "webkit/fileapi/syncable/syncable_file_system_operation.h"
 #include "webkit/quota/quota_manager.h"
 
 using quota::QuotaManagerProxy;
diff --git a/webkit/fileapi/syncable/OWNERS b/webkit/browser/fileapi/syncable/OWNERS
index 66ba5d2..66ba5d2 100644
--- a/webkit/fileapi/syncable/OWNERS
+++ b/webkit/browser/fileapi/syncable/OWNERS
diff --git a/webkit/fileapi/syncable/canned_syncable_file_system.cc b/webkit/browser/fileapi/syncable/canned_syncable_file_system.cc
index 9e62c11..c03d354 100644
--- a/webkit/fileapi/syncable/canned_syncable_file_system.cc
+++ b/webkit/browser/fileapi/syncable/canned_syncable_file_system.cc
@@ -1,8 +1,8 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "webkit/fileapi/syncable/canned_syncable_file_system.h"
+#include "webkit/browser/fileapi/syncable/canned_syncable_file_system.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ -21,9 +21,9 @@
 #include "webkit/browser/fileapi/local_file_system_operation.h"
 #include "webkit/browser/fileapi/mock_file_system_options.h"
 #include "webkit/browser/fileapi/sandbox_mount_point_provider.h"
-#include "webkit/fileapi/syncable/local_file_change_tracker.h"
-#include "webkit/fileapi/syncable/local_file_sync_context.h"
-#include "webkit/fileapi/syncable/syncable_file_system_util.h"
+#include "webkit/browser/fileapi/syncable/local_file_change_tracker.h"
+#include "webkit/browser/fileapi/syncable/local_file_sync_context.h"
+#include "webkit/browser/fileapi/syncable/syncable_file_system_util.h"
 #include "webkit/quota/mock_special_storage_policy.h"
 #include "webkit/quota/quota_manager.h"
 
diff --git a/webkit/fileapi/syncable/canned_syncable_file_system.h b/webkit/browser/fileapi/syncable/canned_syncable_file_system.h
index 0f6ab2c..0725b1e 100644
--- a/webkit/fileapi/syncable/canned_syncable_file_system.h
+++ b/webkit/browser/fileapi/syncable/canned_syncable_file_system.h
@@ -1,9 +1,9 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef WEBKIT_FILEAPI_SYNCABLE_CANNED_SYNCABLE_FILE_SYSTEM_H_
-#define WEBKIT_FILEAPI_SYNCABLE_CANNED_SYNCABLE_FILE_SYSTEM_H_
+#ifndef WEBKIT_BROWSER_FILEAPI_SYNCABLE_CANNED_SYNCABLE_FILE_SYSTEM_H_
+#define WEBKIT_BROWSER_FILEAPI_SYNCABLE_CANNED_SYNCABLE_FILE_SYSTEM_H_
 
 #include <string>
 #include <vector>
@@ -14,10 +14,10 @@
 #include "base/observer_list_threadsafe.h"
 #include "base/platform_file.h"
 #include "webkit/browser/fileapi/file_system_url.h"
+#include "webkit/browser/fileapi/syncable/local_file_sync_status.h"
+#include "webkit/browser/fileapi/syncable/sync_status_code.h"
 #include "webkit/common/fileapi/file_system_types.h"
 #include "webkit/common/fileapi/file_system_util.h"
-#include "webkit/fileapi/syncable/local_file_sync_status.h"
-#include "webkit/fileapi/syncable/sync_status_code.h"
 #include "webkit/quota/quota_types.h"
 
 namespace base {
@@ -220,4 +220,4 @@ class CannedSyncableFileSystem
 
 }  // namespace sync_file_system
 
-#endif  // WEBKIT_FILEAPI_SYNCABLE_CANNED_SYNCABLE_FILE_SYSTEM_H_
+#endif  // WEBKIT_BROWSER_FILEAPI_SYNCABLE_CANNED_SYNCABLE_FILE_SYSTEM_H_
diff --git a/webkit/fileapi/syncable/file_change.cc b/webkit/browser/fileapi/syncable/file_change.cc
index df1bf4d..4795438 100644
--- a/webkit/fileapi/syncable/file_change.cc
+++ b/webkit/browser/fileapi/syncable/file_change.cc
@@ -1,13 +1,12 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <sstream>
 
-#include "base/stringprintf.h"
-#include "webkit/fileapi/syncable/file_change.h"
-
 #include "base/logging.h"
+#include "base/stringprintf.h"
+#include "webkit/browser/fileapi/syncable/file_change.h"
 
 namespace sync_file_system {
 
diff --git a/webkit/fileapi/syncable/file_change.h b/webkit/browser/fileapi/syncable/file_change.h
index 763911b..9afc623 100644
--- a/webkit/fileapi/syncable/file_change.h
+++ b/webkit/browser/fileapi/syncable/file_change.h
@@ -1,9 +1,9 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef WEBKIT_FILEAPI_SYNCABLE_FILE_CHANGE_H_
-#define WEBKIT_FILEAPI_SYNCABLE_FILE_CHANGE_H_
+#ifndef WEBKIT_BROWSER_FILEAPI_SYNCABLE_FILE_CHANGE_H_
+#define WEBKIT_BROWSER_FILEAPI_SYNCABLE_FILE_CHANGE_H_
 
 #include <deque>
 #include <string>
@@ -11,7 +11,7 @@
 #include "base/basictypes.h"
 #include "base/files/file_path.h"
 #include "webkit/browser/fileapi/file_system_url.h"
-#include "webkit/fileapi/syncable/sync_file_type.h"
+#include "webkit/browser/fileapi/syncable/sync_file_type.h"
 #include "webkit/storage/webkit_storage_export.h"
 
 namespace sync_file_system {
@@ -74,4 +74,4 @@ class WEBKIT_STORAGE_EXPORT FileChangeList {
 
 }  // namespace sync_file_system
 
-#endif  // WEBKIT_FILEAPI_SYNCABLE_FILE_CHANGE_H_
+#endif  // WEBKIT_BROWSER_FILEAPI_SYNCABLE_FILE_CHANGE_H_
diff --git a/webkit/fileapi/syncable/file_change_unittest.cc b/webkit/browser/fileapi/syncable/file_change_unittest.cc
index a148ece..23f4e5a 100644
--- a/webkit/fileapi/syncable/file_change_unittest.cc
+++ b/webkit/browser/fileapi/syncable/file_change_unittest.cc
@@ -1,8 +1,8 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "webkit/fileapi/syncable/file_change.h"
+#include "webkit/browser/fileapi/syncable/file_change.h"
 
 #include "base/basictypes.h"
 #include "base/logging.h"
diff --git a/webkit/fileapi/syncable/local_file_change_tracker.cc b/webkit/browser/fileapi/syncable/local_file_change_tracker.cc
index 46ba7b9..7e189a1 100644
--- a/webkit/fileapi/syncable/local_file_change_tracker.cc
+++ b/webkit/browser/fileapi/syncable/local_file_change_tracker.cc
@@ -1,8 +1,8 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "webkit/fileapi/syncable/local_file_change_tracker.h"
+#include "webkit/browser/fileapi/syncable/local_file_change_tracker.h"
 
 #include <queue>
 
@@ -14,9 +14,9 @@
 #include "webkit/browser/fileapi/file_system_context.h"
 #include "webkit/browser/fileapi/file_system_file_util.h"
 #include "webkit/browser/fileapi/file_system_operation_context.h"
+#include "webkit/browser/fileapi/syncable/local_file_sync_status.h"
+#include "webkit/browser/fileapi/syncable/syncable_file_system_util.h"
 #include "webkit/common/fileapi/file_system_util.h"
-#include "webkit/fileapi/syncable/local_file_sync_status.h"
-#include "webkit/fileapi/syncable/syncable_file_system_util.h"
 
 using fileapi::FileSystemContext;
 using fileapi::FileSystemFileUtil;
diff --git a/webkit/fileapi/syncable/local_file_change_tracker.h b/webkit/browser/fileapi/syncable/local_file_change_tracker.h
index df28df3..6d58cf2 100644
--- a/webkit/fileapi/syncable/local_file_change_tracker.h
+++ b/webkit/browser/fileapi/syncable/local_file_change_tracker.h
@@ -1,9 +1,9 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef WEBKIT_FILEAPI_SYNCABLE_LOCAL_FILE_CHANGE_TRACKER_H_
-#define WEBKIT_FILEAPI_SYNCABLE_LOCAL_FILE_CHANGE_TRACKER_H_
+#ifndef WEBKIT_BROWSER_FILEAPI_SYNCABLE_LOCAL_FILE_CHANGE_TRACKER_H_
+#define WEBKIT_BROWSER_FILEAPI_SYNCABLE_LOCAL_FILE_CHANGE_TRACKER_H_
 
 #include <deque>
 #include <map>
@@ -17,8 +17,8 @@
 #include "base/synchronization/lock.h"
 #include "webkit/browser/fileapi/file_observers.h"
 #include "webkit/browser/fileapi/file_system_url.h"
-#include "webkit/fileapi/syncable/file_change.h"
-#include "webkit/fileapi/syncable/sync_status_code.h"
+#include "webkit/browser/fileapi/syncable/file_change.h"
+#include "webkit/browser/fileapi/syncable/sync_status_code.h"
 #include "webkit/storage/webkit_storage_export.h"
 
 namespace base {
@@ -147,4 +147,4 @@ class WEBKIT_STORAGE_EXPORT LocalFileChangeTracker
 
 }  // namespace sync_file_system
 
-#endif  // WEBKIT_FILEAPI_SYNCABLE_LOCAL_FILE_CHANGE_TRACKER_H_
+#endif  // WEBKIT_BROWSER_FILEAPI_SYNCABLE_LOCAL_FILE_CHANGE_TRACKER_H_
diff --git a/webkit/fileapi/syncable/local_file_change_tracker_unittest.cc b/webkit/browser/fileapi/syncable/local_file_change_tracker_unittest.cc
index de6ef83..817438c 100644
--- a/webkit/fileapi/syncable/local_file_change_tracker_unittest.cc
+++ b/webkit/browser/fileapi/syncable/local_file_change_tracker_unittest.cc
@@ -1,8 +1,8 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "webkit/fileapi/syncable/local_file_change_tracker.h"
+#include "webkit/browser/fileapi/syncable/local_file_change_tracker.h"
 
 #include <deque>
 #include <set>
@@ -17,10 +17,10 @@
 #include "webkit/blob/mock_blob_url_request_context.h"
 #include "webkit/browser/fileapi/file_system_context.h"
 #include "webkit/browser/fileapi/file_system_task_runners.h"
-#include "webkit/fileapi/syncable/canned_syncable_file_system.h"
-#include "webkit/fileapi/syncable/local_file_sync_context.h"
-#include "webkit/fileapi/syncable/sync_status_code.h"
-#include "webkit/fileapi/syncable/syncable_file_system_util.h"
+#include "webkit/browser/fileapi/syncable/canned_syncable_file_system.h"
+#include "webkit/browser/fileapi/syncable/local_file_sync_context.h"
+#include "webkit/browser/fileapi/syncable/sync_status_code.h"
+#include "webkit/browser/fileapi/syncable/syncable_file_system_util.h"
 #include "webkit/quota/quota_manager.h"
 
 using fileapi::FileSystemContext;
diff --git a/webkit/fileapi/syncable/local_file_sync_context.cc b/webkit/browser/fileapi/syncable/local_file_sync_context.cc
index db8d6c1..9aa434e 100644
--- a/webkit/fileapi/syncable/local_file_sync_context.cc
+++ b/webkit/browser/fileapi/syncable/local_file_sync_context.cc
@@ -1,8 +1,8 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "webkit/fileapi/syncable/local_file_sync_context.h"
+#include "webkit/browser/fileapi/syncable/local_file_sync_context.h"
 
 #include "base/bind.h"
 #include "base/location.h"
@@ -15,13 +15,13 @@
 #include "webkit/browser/fileapi/file_system_operation_context.h"
 #include "webkit/browser/fileapi/file_system_task_runners.h"
 #include "webkit/browser/fileapi/local_file_system_operation.h"
+#include "webkit/browser/fileapi/syncable/file_change.h"
+#include "webkit/browser/fileapi/syncable/local_file_change_tracker.h"
+#include "webkit/browser/fileapi/syncable/local_origin_change_observer.h"
+#include "webkit/browser/fileapi/syncable/sync_file_metadata.h"
+#include "webkit/browser/fileapi/syncable/syncable_file_operation_runner.h"
+#include "webkit/browser/fileapi/syncable/syncable_file_system_util.h"
 #include "webkit/common/fileapi/file_system_util.h"
-#include "webkit/fileapi/syncable/file_change.h"
-#include "webkit/fileapi/syncable/local_file_change_tracker.h"
-#include "webkit/fileapi/syncable/local_origin_change_observer.h"
-#include "webkit/fileapi/syncable/sync_file_metadata.h"
-#include "webkit/fileapi/syncable/syncable_file_operation_runner.h"
-#include "webkit/fileapi/syncable/syncable_file_system_util.h"
 
 using fileapi::FileSystemContext;
 using fileapi::FileSystemFileUtil;
diff --git a/webkit/fileapi/syncable/local_file_sync_context.h b/webkit/browser/fileapi/syncable/local_file_sync_context.h
index 57c5b9b..3ad650e 100644
--- a/webkit/fileapi/syncable/local_file_sync_context.h
+++ b/webkit/browser/fileapi/syncable/local_file_sync_context.h
@@ -1,9 +1,9 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef WEBKIT_FILEAPI_SYNCABLE_LOCAL_FILE_SYNC_CONTEXT_H_
-#define WEBKIT_FILEAPI_SYNCABLE_LOCAL_FILE_SYNC_CONTEXT_H_
+#ifndef WEBKIT_BROWSER_FILEAPI_SYNCABLE_LOCAL_FILE_SYNC_CONTEXT_H_
+#define WEBKIT_BROWSER_FILEAPI_SYNCABLE_LOCAL_FILE_SYNC_CONTEXT_H_
 
 #include <deque>
 #include <map>
@@ -20,9 +20,9 @@
 #include "base/observer_list.h"
 #include "base/timer.h"
 #include "googleurl/src/gurl.h"
-#include "webkit/fileapi/syncable/local_file_sync_status.h"
-#include "webkit/fileapi/syncable/sync_callbacks.h"
-#include "webkit/fileapi/syncable/sync_status_code.h"
+#include "webkit/browser/fileapi/syncable/local_file_sync_status.h"
+#include "webkit/browser/fileapi/syncable/sync_callbacks.h"
+#include "webkit/browser/fileapi/syncable/sync_status_code.h"
 #include "webkit/storage/webkit_storage_export.h"
 
 namespace base {
@@ -303,4 +303,4 @@ class WEBKIT_STORAGE_EXPORT LocalFileSyncContext
 
 }  // namespace sync_file_system
 
-#endif  // WEBKIT_FILEAPI_SYNCABLE_LOCAL_FILE_SYNC_CONTEXT_H_
+#endif  // WEBKIT_BROWSER_FILEAPI_SYNCABLE_LOCAL_FILE_SYNC_CONTEXT_H_
diff --git a/webkit/fileapi/syncable/local_file_sync_context_unittest.cc b/webkit/browser/fileapi/syncable/local_file_sync_context_unittest.cc
index e9f3a12..e02afc4 100644
--- a/webkit/fileapi/syncable/local_file_sync_context_unittest.cc
+++ b/webkit/browser/fileapi/syncable/local_file_sync_context_unittest.cc
@@ -1,8 +1,8 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "webkit/fileapi/syncable/local_file_sync_context.h"
+#include "webkit/browser/fileapi/syncable/local_file_sync_context.h"
 
 #include <vector>
 
@@ -19,12 +19,12 @@
 #include "webkit/browser/fileapi/file_system_context.h"
 #include "webkit/browser/fileapi/file_system_operation.h"
 #include "webkit/browser/fileapi/isolated_context.h"
-#include "webkit/fileapi/syncable/canned_syncable_file_system.h"
-#include "webkit/fileapi/syncable/file_change.h"
-#include "webkit/fileapi/syncable/local_file_change_tracker.h"
-#include "webkit/fileapi/syncable/sync_file_metadata.h"
-#include "webkit/fileapi/syncable/sync_status_code.h"
-#include "webkit/fileapi/syncable/syncable_file_system_util.h"
+#include "webkit/browser/fileapi/syncable/canned_syncable_file_system.h"
+#include "webkit/browser/fileapi/syncable/file_change.h"
+#include "webkit/browser/fileapi/syncable/local_file_change_tracker.h"
+#include "webkit/browser/fileapi/syncable/sync_file_metadata.h"
+#include "webkit/browser/fileapi/syncable/sync_status_code.h"
+#include "webkit/browser/fileapi/syncable/syncable_file_system_util.h"
 
 #define FPL FILE_PATH_LITERAL
 
diff --git a/webkit/fileapi/syncable/local_file_sync_status.cc b/webkit/browser/fileapi/syncable/local_file_sync_status.cc
index b043650..9ed4348 100644
--- a/webkit/fileapi/syncable/local_file_sync_status.cc
+++ b/webkit/browser/fileapi/syncable/local_file_sync_status.cc
@@ -1,8 +1,8 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "webkit/fileapi/syncable/local_file_sync_status.h"
+#include "webkit/browser/fileapi/syncable/local_file_sync_status.h"
 
 #include "base/logging.h"
 
diff --git a/webkit/fileapi/syncable/local_file_sync_status.h b/webkit/browser/fileapi/syncable/local_file_sync_status.h
index 45ab44d..99558cc 100644
--- a/webkit/fileapi/syncable/local_file_sync_status.h
+++ b/webkit/browser/fileapi/syncable/local_file_sync_status.h
@@ -1,9 +1,9 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef WEBKIT_FILEAPI_SYNCABLE_LOCAL_FILE_SYNC_STATUS_H_
-#define WEBKIT_FILEAPI_SYNCABLE_LOCAL_FILE_SYNC_STATUS_H_
+#ifndef WEBKIT_BROWSER_FILEAPI_SYNCABLE_LOCAL_FILE_SYNC_STATUS_H_
+#define WEBKIT_BROWSER_FILEAPI_SYNCABLE_LOCAL_FILE_SYNC_STATUS_H_
 
 #include <map>
 #include <set>
@@ -91,4 +91,4 @@ class WEBKIT_STORAGE_EXPORT LocalFileSyncStatus : public base::NonThreadSafe {
 
 }  // namespace sync_file_system
 
-#endif  // WEBKIT_FILEAPI_SYNCABLE_LOCAL_FILE_SYNC_STATUS_H_
+#endif  // WEBKIT_BROWSER_FILEAPI_SYNCABLE_LOCAL_FILE_SYNC_STATUS_H_
diff --git a/webkit/fileapi/syncable/local_file_sync_status_unittest.cc b/webkit/browser/fileapi/syncable/local_file_sync_status_unittest.cc
index 8a5d401..ff46322 100644
--- a/webkit/fileapi/syncable/local_file_sync_status_unittest.cc
+++ b/webkit/browser/fileapi/syncable/local_file_sync_status_unittest.cc
@@ -1,8 +1,8 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "webkit/fileapi/syncable/local_file_sync_status.h"
+#include "webkit/browser/fileapi/syncable/local_file_sync_status.h"
 
 #include "base/basictypes.h"
 #include "googleurl/src/gurl.h"
diff --git a/webkit/fileapi/syncable/local_origin_change_observer.h b/webkit/browser/fileapi/syncable/local_origin_change_observer.h
index 84ed65d..111f0a4 100644
--- a/webkit/fileapi/syncable/local_origin_change_observer.h
+++ b/webkit/browser/fileapi/syncable/local_origin_change_observer.h
@@ -1,9 +1,9 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef WEBKIT_FILEAPI_SYNCABLE_LOCAL_ORIGIN_CHANGE_OBSERVER_H_
-#define WEBKIT_FILEAPI_SYNCABLE_LOCAL_ORIGIN_CHANGE_OBSERVER_H_
+#ifndef WEBKIT_BROWSER_FILEAPI_SYNCABLE_LOCAL_ORIGIN_CHANGE_OBSERVER_H_
+#define WEBKIT_BROWSER_FILEAPI_SYNCABLE_LOCAL_ORIGIN_CHANGE_OBSERVER_H_
 
 #include <set>
 
@@ -25,4 +25,4 @@ class LocalOriginChangeObserver {
 
 }  // namespace sync_file_system
 
-#endif  // WEBKIT_FILEAPI_SYNCABLE_LOCAL_ORIGIN_CHANGE_OBSERVER_H_
+#endif  // WEBKIT_BROWSER_FILEAPI_SYNCABLE_LOCAL_ORIGIN_CHANGE_OBSERVER_H_
diff --git a/webkit/fileapi/syncable/mock_sync_status_observer.cc b/webkit/browser/fileapi/syncable/mock_sync_status_observer.cc
index 4a1a4c0a..5fe7355 100644
--- a/webkit/fileapi/syncable/mock_sync_status_observer.cc
+++ b/webkit/browser/fileapi/syncable/mock_sync_status_observer.cc
@@ -1,8 +1,8 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "webkit/fileapi/syncable/mock_sync_status_observer.h"
+#include "webkit/browser/fileapi/syncable/mock_sync_status_observer.h"
 
 namespace sync_file_system {
 
diff --git a/webkit/fileapi/syncable/mock_sync_status_observer.h b/webkit/browser/fileapi/syncable/mock_sync_status_observer.h
index 6483f1d..6061697 100644
--- a/webkit/fileapi/syncable/mock_sync_status_observer.h
+++ b/webkit/browser/fileapi/syncable/mock_sync_status_observer.h
@@ -1,12 +1,12 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef WEBKIT_FILEAPI_SYNCABLE_MOCK_SYNC_STATUS_OBSERVER_H_
-#define WEBKIT_FILEAPI_SYNCABLE_MOCK_SYNC_STATUS_OBSERVER_H_
+#ifndef WEBKIT_BROWSER_FILEAPI_SYNCABLE_MOCK_SYNC_STATUS_OBSERVER_H_
+#define WEBKIT_BROWSER_FILEAPI_SYNCABLE_MOCK_SYNC_STATUS_OBSERVER_H_
 
 #include "testing/gmock/include/gmock/gmock.h"
-#include "webkit/fileapi/syncable/local_file_sync_status.h"
+#include "webkit/browser/fileapi/syncable/local_file_sync_status.h"
 
 namespace sync_file_system {
 
@@ -25,4 +25,4 @@ class MockSyncStatusObserver : public LocalFileSyncStatus::Observer {
 
 }  // namespace sync_file_system
 
-#endif  // WEBKIT_FILEAPI_SYNCABLE_MOCK_SYNC_STATUS_OBSERVER_H_
+#endif  // WEBKIT_BROWSER_FILEAPI_SYNCABLE_MOCK_SYNC_STATUS_OBSERVER_H_
diff --git a/webkit/fileapi/syncable/sync_action.h b/webkit/browser/fileapi/syncable/sync_action.h
index b6328ce..b0d66fc 100644
--- a/webkit/fileapi/syncable/sync_action.h
+++ b/webkit/browser/fileapi/syncable/sync_action.h
@@ -1,9 +1,9 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef WEBKIT_FILEAPI_SYNCABLE_SYNC_ACTION_H_
-#define WEBKIT_FILEAPI_SYNCABLE_SYNC_ACTION_H_
+#ifndef WEBKIT_BROWSER_FILEAPI_SYNCABLE_SYNC_ACTION_H_
+#define WEBKIT_BROWSER_FILEAPI_SYNCABLE_SYNC_ACTION_H_
 
 namespace sync_file_system {
 
@@ -23,4 +23,4 @@ enum SyncAction {
 
 }  // namespace fileapi
 
-#endif  // WEBKIT_FILEAPI_SYNCABLE_SYNC_ACTION_H_
+#endif  // WEBKIT_BROWSER_FILEAPI_SYNCABLE_SYNC_ACTION_H_
diff --git a/webkit/fileapi/syncable/sync_callbacks.h b/webkit/browser/fileapi/syncable/sync_callbacks.h
index 57f9c62..f02f512 100644
--- a/webkit/fileapi/syncable/sync_callbacks.h
+++ b/webkit/browser/fileapi/syncable/sync_callbacks.h
@@ -1,14 +1,14 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef WEBKIT_FILEAPI_SYNCABLE_SYNC_CALLBACKS_H_
-#define WEBKIT_FILEAPI_SYNCABLE_SYNC_CALLBACKS_H_
+#ifndef WEBKIT_BROWSER_FILEAPI_SYNCABLE_SYNC_CALLBACKS_H_
+#define WEBKIT_BROWSER_FILEAPI_SYNCABLE_SYNC_CALLBACKS_H_
 
 #include "base/callback_forward.h"
 #include "webkit/browser/fileapi/file_system_url.h"
-#include "webkit/fileapi/syncable/sync_file_status.h"
-#include "webkit/fileapi/syncable/sync_status_code.h"
+#include "webkit/browser/fileapi/syncable/sync_file_status.h"
+#include "webkit/browser/fileapi/syncable/sync_status_code.h"
 
 namespace fileapi {
 class FileSystemURL;
@@ -39,4 +39,4 @@ typedef base::Callback<void(SyncStatusCode status,
 
 }  // namespace sync_file_system
 
-#endif  // WEBKIT_FILEAPI_SYNCABLE_SYNC_CALLBACKS_H_
+#endif  // WEBKIT_BROWSER_FILEAPI_SYNCABLE_SYNC_CALLBACKS_H_
diff --git a/webkit/fileapi/syncable/sync_direction.h b/webkit/browser/fileapi/syncable/sync_direction.h
index ad31b04..e3ebc4c 100644
--- a/webkit/fileapi/syncable/sync_direction.h
+++ b/webkit/browser/fileapi/syncable/sync_direction.h
@@ -1,9 +1,9 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef WEBKIT_FILEAPI_SYNCABLE_SYNC_DIRECTION_H_
-#define WEBKIT_FILEAPI_SYNCABLE_SYNC_DIRECTION_H_
+#ifndef WEBKIT_BROWSER_FILEAPI_SYNCABLE_SYNC_DIRECTION_H_
+#define WEBKIT_BROWSER_FILEAPI_SYNCABLE_SYNC_DIRECTION_H_
 
 namespace sync_file_system {
 
@@ -15,4 +15,4 @@ enum SyncDirection {
 
 }  // namespace fileapi
 
-#endif  // WEBKIT_FILEAPI_SYNCABLE_SYNC_DIRECTION_H_
+#endif  // WEBKIT_BROWSER_FILEAPI_SYNCABLE_SYNC_DIRECTION_H_
diff --git a/webkit/fileapi/syncable/sync_file_metadata.cc b/webkit/browser/fileapi/syncable/sync_file_metadata.cc
index c613c8e..308940e 100644
--- a/webkit/fileapi/syncable/sync_file_metadata.cc
+++ b/webkit/browser/fileapi/syncable/sync_file_metadata.cc
@@ -1,8 +1,8 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "webkit/fileapi/syncable/sync_file_metadata.h"
+#include "webkit/browser/fileapi/syncable/sync_file_metadata.h"
 
 using sync_file_system::SyncFileType;
 
diff --git a/webkit/fileapi/syncable/sync_file_metadata.h b/webkit/browser/fileapi/syncable/sync_file_metadata.h
index 8c7d48b..9e6dedc 100644
--- a/webkit/fileapi/syncable/sync_file_metadata.h
+++ b/webkit/browser/fileapi/syncable/sync_file_metadata.h
@@ -1,14 +1,14 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef WEBKIT_FILEAPI_SYNCABLE_SYNC_FILE_METADATA_H_
-#define WEBKIT_FILEAPI_SYNCABLE_SYNC_FILE_METADATA_H_
+#ifndef WEBKIT_BROWSER_FILEAPI_SYNCABLE_SYNC_FILE_METADATA_H_
+#define WEBKIT_BROWSER_FILEAPI_SYNCABLE_SYNC_FILE_METADATA_H_
 
 #include "base/basictypes.h"
 #include "base/time.h"
 #include "webkit/browser/fileapi/file_system_url.h"
-#include "webkit/fileapi/syncable/file_change.h"
+#include "webkit/browser/fileapi/syncable/file_change.h"
 #include "webkit/storage/webkit_storage_export.h"
 
 namespace sync_file_system {
@@ -40,4 +40,4 @@ struct WEBKIT_STORAGE_EXPORT LocalFileSyncInfo {
 
 }  // namespace sync_file_system
 
-#endif  // WEBKIT_FILEAPI_SYNCABLE_SYNC_FILE_METADATA_H_
+#endif  // WEBKIT_BROWSER_FILEAPI_SYNCABLE_SYNC_FILE_METADATA_H_
diff --git a/webkit/fileapi/syncable/sync_file_status.h b/webkit/browser/fileapi/syncable/sync_file_status.h
index ba41358..50b4e65 100644
--- a/webkit/fileapi/syncable/sync_file_status.h
+++ b/webkit/browser/fileapi/syncable/sync_file_status.h
@@ -1,9 +1,9 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef WEBKIT_FILEAPI_SYNCABLE_SYNC_FILE_STATUS_H_
-#define WEBKIT_FILEAPI_SYNCABLE_SYNC_FILE_STATUS_H_
+#ifndef WEBKIT_BROWSER_FILEAPI_SYNCABLE_SYNC_FILE_STATUS_H_
+#define WEBKIT_BROWSER_FILEAPI_SYNCABLE_SYNC_FILE_STATUS_H_
 
 namespace sync_file_system {
 
@@ -26,4 +26,4 @@ enum SyncFileStatus {
 
 }  // namespace fileapi
 
-#endif  // WEBKIT_FILEAPI_SYNCABLE_SYNC_FILE_STATUS_H_
+#endif  // WEBKIT_BROWSER_FILEAPI_SYNCABLE_SYNC_FILE_STATUS_H_
diff --git a/webkit/fileapi/syncable/sync_file_type.h b/webkit/browser/fileapi/syncable/sync_file_type.h
index 77428a1..8c47655 100644
--- a/webkit/fileapi/syncable/sync_file_type.h
+++ b/webkit/browser/fileapi/syncable/sync_file_type.h
@@ -1,9 +1,9 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef WEBKIT_FILEAPI_SYNCABLE_SYNC_FILE_TYPE_H_
-#define WEBKIT_FILEAPI_SYNCABLE_SYNC_FILE_TYPE_H_
+#ifndef WEBKIT_BROWSER_FILEAPI_SYNCABLE_SYNC_FILE_TYPE_H_
+#define WEBKIT_BROWSER_FILEAPI_SYNCABLE_SYNC_FILE_TYPE_H_
 
 namespace sync_file_system {
 
@@ -20,4 +20,4 @@ enum SyncFileType {
 
 }  // namespace sync_file_system
 
-#endif  // WEBKIT_FILEAPI_SYNCABLE_SYNC_FILE_TYPE_H_
+#endif  // WEBKIT_BROWSER_FILEAPI_SYNCABLE_SYNC_FILE_TYPE_H_
diff --git a/webkit/fileapi/syncable/sync_status_code.cc b/webkit/browser/fileapi/syncable/sync_status_code.cc
index 46e07f0..3809f6d 100644
--- a/webkit/fileapi/syncable/sync_status_code.cc
+++ b/webkit/browser/fileapi/syncable/sync_status_code.cc
@@ -1,8 +1,8 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "webkit/fileapi/syncable/sync_status_code.h"
+#include "webkit/browser/fileapi/syncable/sync_status_code.h"
 
 #include "base/logging.h"
 #include "third_party/leveldatabase/src/include/leveldb/db.h"
diff --git a/webkit/fileapi/syncable/sync_status_code.h b/webkit/browser/fileapi/syncable/sync_status_code.h
index cc15a19..a93027f 100644
--- a/webkit/fileapi/syncable/sync_status_code.h
+++ b/webkit/browser/fileapi/syncable/sync_status_code.h
@@ -1,9 +1,9 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef WEBKIT_FILEAPI_SYNCABLE_SYNC_STATUS_CODE_H_
-#define WEBKIT_FILEAPI_SYNCABLE_SYNC_STATUS_CODE_H_
+#ifndef WEBKIT_BROWSER_FILEAPI_SYNCABLE_SYNC_STATUS_CODE_H_
+#define WEBKIT_BROWSER_FILEAPI_SYNCABLE_SYNC_STATUS_CODE_H_
 
 #include <string>
 
@@ -71,4 +71,4 @@ WEBKIT_STORAGE_EXPORT SyncStatusCode PlatformFileErrorToSyncStatusCode(
 
 }  // namespace sync_file_system
 
-#endif  // WEBKIT_FILEAPI_SYNCABLE_SYNC_STATUS_CODE_H_
+#endif  // WEBKIT_BROWSER_FILEAPI_SYNCABLE_SYNC_STATUS_CODE_H_
diff --git a/webkit/fileapi/syncable/syncable_file_operation_runner.cc b/webkit/browser/fileapi/syncable/syncable_file_operation_runner.cc
index 91fca3e..ecad964 100644
--- a/webkit/fileapi/syncable/syncable_file_operation_runner.cc
+++ b/webkit/browser/fileapi/syncable/syncable_file_operation_runner.cc
@@ -1,15 +1,15 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "webkit/fileapi/syncable/syncable_file_operation_runner.h"
+#include "webkit/browser/fileapi/syncable/syncable_file_operation_runner.h"
 
 #include <algorithm>
 #include <functional>
 
 #include "base/callback.h"
 #include "base/stl_util.h"
-#include "webkit/fileapi/syncable/local_file_sync_status.h"
+#include "webkit/browser/fileapi/syncable/local_file_sync_status.h"
 
 using fileapi::FileSystemURL;
 
diff --git a/webkit/fileapi/syncable/syncable_file_operation_runner.h b/webkit/browser/fileapi/syncable/syncable_file_operation_runner.h
index bcc55fd..2b2f9d0 100644
--- a/webkit/fileapi/syncable/syncable_file_operation_runner.h
+++ b/webkit/browser/fileapi/syncable/syncable_file_operation_runner.h
@@ -1,9 +1,9 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef WEBKIT_FILEAPI_SYNCABLE_SYNCABLE_FILE_OPERATION_RUNNER_H_
-#define WEBKIT_FILEAPI_SYNCABLE_SYNCABLE_FILE_OPERATION_RUNNER_H_
+#ifndef WEBKIT_BROWSER_FILEAPI_SYNCABLE_SYNCABLE_FILE_OPERATION_RUNNER_H_
+#define WEBKIT_BROWSER_FILEAPI_SYNCABLE_SYNCABLE_FILE_OPERATION_RUNNER_H_
 
 #include <list>
 #include <vector>
@@ -14,7 +14,7 @@
 #include "base/memory/weak_ptr.h"
 #include "base/threading/non_thread_safe.h"
 #include "webkit/browser/fileapi/file_system_url.h"
-#include "webkit/fileapi/syncable/local_file_sync_status.h"
+#include "webkit/browser/fileapi/syncable/local_file_sync_status.h"
 #include "webkit/storage/webkit_storage_export.h"
 
 namespace fileapi {
@@ -102,4 +102,4 @@ class WEBKIT_STORAGE_EXPORT SyncableFileOperationRunner
 
 }  // namespace sync_file_system
 
-#endif  // WEBKIT_FILEAPI_SYNCABLE_SYNCABLE_FILE_OPERATION_RUNNER_H_
+#endif  // WEBKIT_BROWSER_FILEAPI_SYNCABLE_SYNCABLE_FILE_OPERATION_RUNNER_H_
diff --git a/webkit/fileapi/syncable/syncable_file_operation_runner_unittest.cc b/webkit/browser/fileapi/syncable/syncable_file_operation_runner_unittest.cc
index d5878eb..2313a92 100644
--- a/webkit/fileapi/syncable/syncable_file_operation_runner_unittest.cc
+++ b/webkit/browser/fileapi/syncable/syncable_file_operation_runner_unittest.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -12,13 +12,13 @@
 #include "testing/gtest/include/gtest/gtest.h"
 #include "webkit/blob/mock_blob_url_request_context.h"
 #include "webkit/browser/fileapi/file_system_context.h"
-#include "webkit/fileapi/syncable/canned_syncable_file_system.h"
-#include "webkit/fileapi/syncable/local_file_change_tracker.h"
-#include "webkit/fileapi/syncable/local_file_sync_context.h"
-#include "webkit/fileapi/syncable/local_file_sync_status.h"
-#include "webkit/fileapi/syncable/syncable_file_operation_runner.h"
-#include "webkit/fileapi/syncable/syncable_file_system_operation.h"
-#include "webkit/fileapi/syncable/syncable_file_system_util.h"
+#include "webkit/browser/fileapi/syncable/canned_syncable_file_system.h"
+#include "webkit/browser/fileapi/syncable/local_file_change_tracker.h"
+#include "webkit/browser/fileapi/syncable/local_file_sync_context.h"
+#include "webkit/browser/fileapi/syncable/local_file_sync_status.h"
+#include "webkit/browser/fileapi/syncable/syncable_file_operation_runner.h"
+#include "webkit/browser/fileapi/syncable/syncable_file_system_operation.h"
+#include "webkit/browser/fileapi/syncable/syncable_file_system_util.h"
 
 using fileapi::FileSystemOperation;
 using fileapi::FileSystemURL;
diff --git a/webkit/fileapi/syncable/syncable_file_system_operation.cc b/webkit/browser/fileapi/syncable/syncable_file_system_operation.cc
index 5caffbe..7a7dc33 100644
--- a/webkit/fileapi/syncable/syncable_file_system_operation.cc
+++ b/webkit/browser/fileapi/syncable/syncable_file_system_operation.cc
@@ -1,8 +1,8 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "webkit/fileapi/syncable/syncable_file_system_operation.h"
+#include "webkit/browser/fileapi/syncable/syncable_file_system_operation.h"
 
 #include "base/logging.h"
 #include "webkit/blob/shareable_file_reference.h"
@@ -10,9 +10,9 @@
 #include "webkit/browser/fileapi/file_system_operation_context.h"
 #include "webkit/browser/fileapi/file_system_url.h"
 #include "webkit/browser/fileapi/sandbox_mount_point_provider.h"
-#include "webkit/fileapi/syncable/local_file_sync_context.h"
-#include "webkit/fileapi/syncable/syncable_file_operation_runner.h"
-#include "webkit/fileapi/syncable/syncable_file_system_util.h"
+#include "webkit/browser/fileapi/syncable/local_file_sync_context.h"
+#include "webkit/browser/fileapi/syncable/syncable_file_operation_runner.h"
+#include "webkit/browser/fileapi/syncable/syncable_file_system_util.h"
 
 using fileapi::FileSystemURL;
 using fileapi::FileSystemOperationContext;
diff --git a/webkit/fileapi/syncable/syncable_file_system_operation.h b/webkit/browser/fileapi/syncable/syncable_file_system_operation.h
index f1d5574..4dbc4ae 100644
--- a/webkit/fileapi/syncable/syncable_file_system_operation.h
+++ b/webkit/browser/fileapi/syncable/syncable_file_system_operation.h
@@ -1,9 +1,9 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef WEBKIT_FILEAPI_SYNCABLE_SYNCABLE_FILE_SYSTEM_OPERATION_H_
-#define WEBKIT_FILEAPI_SYNCABLE_SYNCABLE_FILE_SYSTEM_OPERATION_H_
+#ifndef WEBKIT_BROWSER_FILEAPI_SYNCABLE_SYNCABLE_FILE_SYSTEM_OPERATION_H_
+#define WEBKIT_BROWSER_FILEAPI_SYNCABLE_SYNCABLE_FILE_SYSTEM_OPERATION_H_
 
 #include <vector>
 
@@ -116,4 +116,4 @@ class WEBKIT_STORAGE_EXPORT SyncableFileSystemOperation
 
 }  // namespace sync_file_system
 
-#endif  // WEBKIT_FILEAPI_SYNCABLE_SYNCABLE_FILE_SYSTEM_OPERATION_H_
+#endif  // WEBKIT_BROWSER_FILEAPI_SYNCABLE_SYNCABLE_FILE_SYSTEM_OPERATION_H_
diff --git a/webkit/fileapi/syncable/syncable_file_system_unittest.cc b/webkit/browser/fileapi/syncable/syncable_file_system_unittest.cc
index 35cb29f..a1d25e1 100644
--- a/webkit/fileapi/syncable/syncable_file_system_unittest.cc
+++ b/webkit/browser/fileapi/syncable/syncable_file_system_unittest.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -11,11 +11,11 @@
 #include "webkit/browser/fileapi/isolated_context.h"
 #include "webkit/browser/fileapi/local_file_system_operation.h"
 #include "webkit/browser/fileapi/sandbox_file_system_test_helper.h"
+#include "webkit/browser/fileapi/syncable/canned_syncable_file_system.h"
+#include "webkit/browser/fileapi/syncable/local_file_change_tracker.h"
+#include "webkit/browser/fileapi/syncable/local_file_sync_context.h"
+#include "webkit/browser/fileapi/syncable/syncable_file_system_util.h"
 #include "webkit/common/fileapi/file_system_types.h"
-#include "webkit/fileapi/syncable/canned_syncable_file_system.h"
-#include "webkit/fileapi/syncable/local_file_change_tracker.h"
-#include "webkit/fileapi/syncable/local_file_sync_context.h"
-#include "webkit/fileapi/syncable/syncable_file_system_util.h"
 #include "webkit/quota/quota_manager.h"
 #include "webkit/quota/quota_types.h"
 
diff --git a/webkit/fileapi/syncable/syncable_file_system_util.cc b/webkit/browser/fileapi/syncable/syncable_file_system_util.cc
index 6df9b36..84ae92f 100644
--- a/webkit/fileapi/syncable/syncable_file_system_util.cc
+++ b/webkit/browser/fileapi/syncable/syncable_file_system_util.cc
@@ -1,8 +1,8 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "webkit/fileapi/syncable/syncable_file_system_util.h"
+#include "webkit/browser/fileapi/syncable/syncable_file_system_util.h"
 
 #include "base/command_line.h"
 #include "webkit/browser/fileapi/external_mount_points.h"
diff --git a/webkit/fileapi/syncable/syncable_file_system_util.h b/webkit/browser/fileapi/syncable/syncable_file_system_util.h
index 02f7547..3c296c0 100644
--- a/webkit/fileapi/syncable/syncable_file_system_util.h
+++ b/webkit/browser/fileapi/syncable/syncable_file_system_util.h
@@ -1,9 +1,9 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef WEBKIT_FILEAPI_SYNCABLE_SYNCABLE_FILE_SYSTEM_UTIL_H_
-#define WEBKIT_FILEAPI_SYNCABLE_SYNCABLE_FILE_SYSTEM_UTIL_H_
+#ifndef WEBKIT_BROWSER_FILEAPI_SYNCABLE_SYNCABLE_FILE_SYSTEM_UTIL_H_
+#define WEBKIT_BROWSER_FILEAPI_SYNCABLE_SYNCABLE_FILE_SYSTEM_UTIL_H_
 
 #include <string>
 
@@ -100,4 +100,4 @@ WEBKIT_STORAGE_EXPORT bool IsSyncFSDirectoryOperationEnabled();
 
 }  // namespace sync_file_system
 
-#endif  // WEBKIT_FILEAPI_SYNCABLE_SYNCABLE_FILE_SYSTEM_UTIL_H_
+#endif  // WEBKIT_BROWSER_FILEAPI_SYNCABLE_SYNCABLE_FILE_SYSTEM_UTIL_H_
diff --git a/webkit/fileapi/syncable/syncable_file_system_util_unittest.cc b/webkit/browser/fileapi/syncable/syncable_file_system_util_unittest.cc
index 80749b1..d62deb5 100644
--- a/webkit/fileapi/syncable/syncable_file_system_util_unittest.cc
+++ b/webkit/browser/fileapi/syncable/syncable_file_system_util_unittest.cc
@@ -1,17 +1,17 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "webkit/fileapi/syncable/syncable_file_system_util.h"
+#include "webkit/browser/fileapi/syncable/syncable_file_system_util.h"
 
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/message_loop_proxy.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "webkit/browser/fileapi/external_mount_points.h"
+#include "webkit/browser/fileapi/syncable/canned_syncable_file_system.h"
+#include "webkit/browser/fileapi/syncable/local_file_sync_context.h"
 #include "webkit/common/fileapi/file_system_types.h"
-#include "webkit/fileapi/syncable/canned_syncable_file_system.h"
-#include "webkit/fileapi/syncable/local_file_sync_context.h"
 
 using fileapi::ExternalMountPoints;
 using fileapi::FileSystemURL;
diff --git a/webkit/browser/fileapi/webkit_browser_fileapi.gypi b/webkit/browser/fileapi/webkit_browser_fileapi.gypi
index 333a71d..ecea36e 100644
--- a/webkit/browser/fileapi/webkit_browser_fileapi.gypi
+++ b/webkit/browser/fileapi/webkit_browser_fileapi.gypi
@@ -79,6 +79,30 @@
       '../browser/fileapi/sandbox_origin_database.h',
       '../browser/fileapi/sandbox_quota_observer.cc',
       '../browser/fileapi/sandbox_quota_observer.h',
+      '../browser/fileapi/syncable/file_change.cc',
+      '../browser/fileapi/syncable/file_change.h',
+      '../browser/fileapi/syncable/local_file_change_tracker.cc',
+      '../browser/fileapi/syncable/local_file_change_tracker.h',
+      '../browser/fileapi/syncable/local_file_sync_context.cc',
+      '../browser/fileapi/syncable/local_file_sync_context.h',
+      '../browser/fileapi/syncable/local_file_sync_status.cc',
+      '../browser/fileapi/syncable/local_file_sync_status.h',
+      '../browser/fileapi/syncable/local_origin_change_observer.h',
+      '../browser/fileapi/syncable/sync_action.h',
+      '../browser/fileapi/syncable/sync_callbacks.h',
+      '../browser/fileapi/syncable/sync_direction.h',
+      '../browser/fileapi/syncable/sync_file_metadata.cc',
+      '../browser/fileapi/syncable/sync_file_metadata.h',
+      '../browser/fileapi/syncable/sync_file_status.h',
+      '../browser/fileapi/syncable/sync_file_type.h',
+      '../browser/fileapi/syncable/sync_status_code.cc',
+      '../browser/fileapi/syncable/sync_status_code.h',
+      '../browser/fileapi/syncable/syncable_file_operation_runner.cc',
+      '../browser/fileapi/syncable/syncable_file_operation_runner.h',
+      '../browser/fileapi/syncable/syncable_file_system_operation.cc',
+      '../browser/fileapi/syncable/syncable_file_system_operation.h',
+      '../browser/fileapi/syncable/syncable_file_system_util.cc',
+      '../browser/fileapi/syncable/syncable_file_system_util.h',
       '../browser/fileapi/task_runner_bound_observer_list.h',
       '../browser/fileapi/test_mount_point_provider.cc',
       '../browser/fileapi/test_mount_point_provider.h',
diff --git a/webkit/fileapi/OWNERS b/webkit/fileapi/OWNERS
deleted file mode 100644
index 13c3288..0000000
--- a/webkit/fileapi/OWNERS
+++ /dev/null
@@ -1 +0,0 @@
-ericu@chromium.org
diff --git a/webkit/fileapi/webkit_fileapi.gypi b/webkit/fileapi/webkit_fileapi.gypi
index be347c1..5ca2528 100644
--- a/webkit/fileapi/webkit_fileapi.gypi
+++ b/webkit/fileapi/webkit_fileapi.gypi
@@ -4,32 +4,6 @@
 
 {
   'variables': {
-    'webkit_fileapi_sources': [
-      '../fileapi/syncable/file_change.cc',
-      '../fileapi/syncable/file_change.h',
-      '../fileapi/syncable/local_file_change_tracker.cc',
-      '../fileapi/syncable/local_file_change_tracker.h',
-      '../fileapi/syncable/local_file_sync_context.cc',
-      '../fileapi/syncable/local_file_sync_context.h',
-      '../fileapi/syncable/local_file_sync_status.cc',
-      '../fileapi/syncable/local_file_sync_status.h',
-      '../fileapi/syncable/local_origin_change_observer.h',
-      '../fileapi/syncable/sync_callbacks.h',
-      '../fileapi/syncable/sync_file_metadata.cc',
-      '../fileapi/syncable/sync_file_metadata.h',
-      '../fileapi/syncable/sync_file_status.h',
-      '../fileapi/syncable/sync_file_type.h',
-      '../fileapi/syncable/sync_action.h',
-      '../fileapi/syncable/sync_direction.h',
-      '../fileapi/syncable/sync_status_code.cc',
-      '../fileapi/syncable/sync_status_code.h',
-      '../fileapi/syncable/syncable_file_operation_runner.cc',
-      '../fileapi/syncable/syncable_file_operation_runner.h',
-      '../fileapi/syncable/syncable_file_system_operation.cc',
-      '../fileapi/syncable/syncable_file_system_operation.h',
-      '../fileapi/syncable/syncable_file_system_util.cc',
-      '../fileapi/syncable/syncable_file_system_util.h',
-    ],
     'webkit_fileapi_chromeos_sources': [
       '../chromeos/fileapi/async_file_stream.h',
       '../chromeos/fileapi/cros_mount_point_provider.cc',
diff --git a/webkit/storage/webkit_storage.gypi b/webkit/storage/webkit_storage.gypi
index 92930cc..ab2b604 100644
--- a/webkit/storage/webkit_storage.gypi
+++ b/webkit/storage/webkit_storage.gypi
@@ -38,7 +38,6 @@
         '<@(webkit_appcache_sources)',
         '<@(webkit_blob_sources)',
         '<@(webkit_dom_storage_sources)',
-        '<@(webkit_fileapi_sources)',
         '<@(webkit_quota_sources)',
 
         # TODO(kinuko): Deprecate them when we have new targets for