drive: Rename chrome/browser/chromeos/gdata to chrome/browser/chromeos/drive

chrome/browser/chromeos/gdata was a misnomer. This directory is the place
for Drive code, hence should be renamed from 'gdata' to 'drive'.

BUG=155215
TEST=compiles

Review URL: https://codereview.chromium.org/11085065

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

110 files changed, 471 insertions, 471 deletions

diff --git a/chrome/browser/chromeos/gdata/OWNERS b/chrome/browser/chromeos/drive/OWNERS
index 0c160d7..0c160d7 100644
--- a/chrome/browser/chromeos/gdata/OWNERS
+++ b/chrome/browser/chromeos/drive/OWNERS
diff --git a/chrome/browser/chromeos/gdata/document_entry_conversion.cc b/chrome/browser/chromeos/drive/document_entry_conversion.cc
index 68cab06..dc8b667 100644
--- a/chrome/browser/chromeos/gdata/document_entry_conversion.cc
+++ b/chrome/browser/chromeos/drive/document_entry_conversion.cc
@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/chromeos/gdata/document_entry_conversion.h"
+#include "chrome/browser/chromeos/drive/document_entry_conversion.h"
 
 #include "base/logging.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
-#include "chrome/browser/chromeos/gdata/drive.pb.h"
-#include "chrome/browser/chromeos/gdata/drive_file_system_util.h"
+#include "chrome/browser/chromeos/drive/drive.pb.h"
+#include "chrome/browser/chromeos/drive/drive_file_system_util.h"
 #include "chrome/browser/google_apis/gdata_wapi_parser.h"
 #include "googleurl/src/gurl.h"
 #include "net/base/escape.h"
diff --git a/chrome/browser/chromeos/gdata/document_entry_conversion.h b/chrome/browser/chromeos/drive/document_entry_conversion.h
index b5672bb..992764b 100644
--- a/chrome/browser/chromeos/gdata/document_entry_conversion.h
+++ b/chrome/browser/chromeos/drive/document_entry_conversion.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_CHROMEOS_GDATA_DOCUMENT_ENTRY_CONVERSION_H_
-#define CHROME_BROWSER_CHROMEOS_GDATA_DOCUMENT_ENTRY_CONVERSION_H_
+#ifndef CHROME_BROWSER_CHROMEOS_DRIVE_DOCUMENT_ENTRY_CONVERSION_H_
+#define CHROME_BROWSER_CHROMEOS_DRIVE_DOCUMENT_ENTRY_CONVERSION_H_
 
 #include <string>
 
@@ -22,4 +22,4 @@ DriveEntryProto ConvertDocumentEntryToDriveEntryProto(
 
 }  // namespace gdata
 
-#endif  // CHROME_BROWSER_CHROMEOS_GDATA_DOCUMENT_ENTRY_CONVERSION_H_
+#endif  // CHROME_BROWSER_CHROMEOS_DRIVE_DOCUMENT_ENTRY_CONVERSION_H_
diff --git a/chrome/browser/chromeos/gdata/document_entry_conversion_unittest.cc b/chrome/browser/chromeos/drive/document_entry_conversion_unittest.cc
index 4454656..df72660 100644
--- a/chrome/browser/chromeos/gdata/document_entry_conversion_unittest.cc
+++ b/chrome/browser/chromeos/drive/document_entry_conversion_unittest.cc
@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/chromeos/gdata/document_entry_conversion.h"
+#include "chrome/browser/chromeos/drive/document_entry_conversion.h"
 
 #include "base/file_path.h"
 #include "base/values.h"
-#include "chrome/browser/chromeos/gdata/drive.pb.h"
-#include "chrome/browser/chromeos/gdata/drive_test_util.h"
+#include "chrome/browser/chromeos/drive/drive.pb.h"
+#include "chrome/browser/chromeos/drive/drive_test_util.h"
 #include "chrome/browser/google_apis/gdata_wapi_parser.h"
 #include "googleurl/src/gurl.h"
 #include "testing/gtest/include/gtest/gtest.h"
diff --git a/chrome/browser/chromeos/gdata/drive.proto b/chrome/browser/chromeos/drive/drive.proto
index fa62c2bb..fa62c2bb 100644
--- a/chrome/browser/chromeos/gdata/drive.proto
+++ b/chrome/browser/chromeos/drive/drive.proto
diff --git a/chrome/browser/chromeos/gdata/drive_api_service.cc b/chrome/browser/chromeos/drive/drive_api_service.cc
index 3986679..268b9b7 100644
--- a/chrome/browser/chromeos/gdata/drive_api_service.cc
+++ b/chrome/browser/chromeos/drive/drive_api_service.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/chromeos/gdata/drive_api_service.h"
+#include "chrome/browser/chromeos/drive/drive_api_service.h"
 
 #include <string>
 #include <vector>
diff --git a/chrome/browser/chromeos/gdata/drive_api_service.h b/chrome/browser/chromeos/drive/drive_api_service.h
index da8977d..f8066b8 100644
--- a/chrome/browser/chromeos/gdata/drive_api_service.h
+++ b/chrome/browser/chromeos/drive/drive_api_service.h
@@ -2,14 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_CHROMEOS_GDATA_DRIVE_API_SERVICE_H_
-#define CHROME_BROWSER_CHROMEOS_GDATA_DRIVE_API_SERVICE_H_
+#ifndef CHROME_BROWSER_CHROMEOS_DRIVE_DRIVE_API_SERVICE_H_
+#define CHROME_BROWSER_CHROMEOS_DRIVE_DRIVE_API_SERVICE_H_
 
 #include <string>
 
 #include "base/observer_list.h"
 #include "base/memory/scoped_ptr.h"
-#include "chrome/browser/chromeos/gdata/drive_service_interface.h"
+#include "chrome/browser/chromeos/drive/drive_service_interface.h"
 #include "chrome/browser/google_apis/auth_service.h"
 #include "chrome/browser/google_apis/auth_service_observer.h"
 #include "chrome/browser/google_apis/gdata_operations.h"
@@ -134,4 +134,4 @@ class DriveAPIService : public DriveServiceInterface,
 
 }  // namespace gdata
 
-#endif  // CHROME_BROWSER_CHROMEOS_GDATA_DRIVE_API_SERVICE_H_
+#endif  // CHROME_BROWSER_CHROMEOS_DRIVE_DRIVE_API_SERVICE_H_
diff --git a/chrome/browser/chromeos/gdata/drive_cache.cc b/chrome/browser/chromeos/drive/drive_cache.cc
index 174cf30..74fc214 100644
--- a/chrome/browser/chromeos/gdata/drive_cache.cc
+++ b/chrome/browser/chromeos/drive/drive_cache.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/chromeos/gdata/drive_cache.h"
+#include "chrome/browser/chromeos/drive/drive_cache.h"
 
 #include <vector>
 
@@ -12,10 +12,10 @@
 #include "base/stringprintf.h"
 #include "base/string_util.h"
 #include "base/sys_info.h"
-#include "chrome/browser/chromeos/gdata/drive.pb.h"
-#include "chrome/browser/chromeos/gdata/drive_cache_metadata.h"
-#include "chrome/browser/chromeos/gdata/drive_cache_observer.h"
-#include "chrome/browser/chromeos/gdata/drive_file_system_util.h"
+#include "chrome/browser/chromeos/drive/drive.pb.h"
+#include "chrome/browser/chromeos/drive/drive_cache_metadata.h"
+#include "chrome/browser/chromeos/drive/drive_cache_observer.h"
+#include "chrome/browser/chromeos/drive/drive_file_system_util.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_paths_internal.h"
diff --git a/chrome/browser/chromeos/gdata/drive_cache.h b/chrome/browser/chromeos/drive/drive_cache.h
index 17bc6fc..9e34947 100644
--- a/chrome/browser/chromeos/gdata/drive_cache.h
+++ b/chrome/browser/chromeos/drive/drive_cache.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_CHROMEOS_GDATA_DRIVE_CACHE_H_
-#define CHROME_BROWSER_CHROMEOS_GDATA_DRIVE_CACHE_H_
+#ifndef CHROME_BROWSER_CHROMEOS_DRIVE_DRIVE_CACHE_H_
+#define CHROME_BROWSER_CHROMEOS_DRIVE_DRIVE_CACHE_H_
 
 #include <string>
 #include <vector>
@@ -466,4 +466,4 @@ void SetFreeDiskSpaceGetterForTesting(
 
 }  // namespace gdata
 
-#endif  // CHROME_BROWSER_CHROMEOS_GDATA_DRIVE_CACHE_H_
+#endif  // CHROME_BROWSER_CHROMEOS_DRIVE_DRIVE_CACHE_H_
diff --git a/chrome/browser/chromeos/gdata/drive_cache_metadata.cc b/chrome/browser/chromeos/drive/drive_cache_metadata.cc
index 0a08fc8..d2df321 100644
--- a/chrome/browser/chromeos/gdata/drive_cache_metadata.cc
+++ b/chrome/browser/chromeos/drive/drive_cache_metadata.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/chromeos/gdata/drive_cache_metadata.h"
+#include "chrome/browser/chromeos/drive/drive_cache_metadata.h"
 
 #include <leveldb/db.h>
 
@@ -10,8 +10,8 @@
 #include "base/file_util.h"
 #include "base/metrics/histogram.h"
 #include "base/sequenced_task_runner.h"
-#include "chrome/browser/chromeos/gdata/drive.pb.h"
-#include "chrome/browser/chromeos/gdata/drive_file_system_util.h"
+#include "chrome/browser/chromeos/drive/drive.pb.h"
+#include "chrome/browser/chromeos/drive/drive_file_system_util.h"
 
 namespace gdata {
 
diff --git a/chrome/browser/chromeos/gdata/drive_cache_metadata.h b/chrome/browser/chromeos/drive/drive_cache_metadata.h
index 813fddf..bfcf33d 100644
--- a/chrome/browser/chromeos/gdata/drive_cache_metadata.h
+++ b/chrome/browser/chromeos/drive/drive_cache_metadata.h
@@ -2,15 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_CHROMEOS_GDATA_DRIVE_CACHE_METADATA_H_
-#define CHROME_BROWSER_CHROMEOS_GDATA_DRIVE_CACHE_METADATA_H_
+#ifndef CHROME_BROWSER_CHROMEOS_DRIVE_DRIVE_CACHE_METADATA_H_
+#define CHROME_BROWSER_CHROMEOS_DRIVE_DRIVE_CACHE_METADATA_H_
 
 #include <map>
 #include <vector>
 #include <string>
 
 #include "base/file_path.h"
-#include "chrome/browser/chromeos/gdata/drive_cache.h"
+#include "chrome/browser/chromeos/drive/drive_cache.h"
 
 namespace gdata {
 
@@ -87,4 +87,4 @@ class DriveCacheMetadata {
 
 }  // namespace gdata
 
-#endif  // CHROME_BROWSER_CHROMEOS_GDATA_DRIVE_CACHE_METADATA_H_
+#endif  // CHROME_BROWSER_CHROMEOS_DRIVE_DRIVE_CACHE_METADATA_H_
diff --git a/chrome/browser/chromeos/gdata/drive_cache_metadata_unittest.cc b/chrome/browser/chromeos/drive/drive_cache_metadata_unittest.cc
index e66ef64..6eb06d4 100644
--- a/chrome/browser/chromeos/gdata/drive_cache_metadata_unittest.cc
+++ b/chrome/browser/chromeos/drive/drive_cache_metadata_unittest.cc
@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/chromeos/gdata/drive_cache_metadata.h"
+#include "chrome/browser/chromeos/drive/drive_cache_metadata.h"
 
 #include "base/file_util.h"
 #include "base/scoped_temp_dir.h"
-#include "chrome/browser/chromeos/gdata/drive.pb.h"
-#include "chrome/browser/chromeos/gdata/drive_file_system_util.h"
-#include "chrome/browser/chromeos/gdata/drive_test_util.h"
+#include "chrome/browser/chromeos/drive/drive.pb.h"
+#include "chrome/browser/chromeos/drive/drive_file_system_util.h"
+#include "chrome/browser/chromeos/drive/drive_test_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace gdata {
diff --git a/chrome/browser/chromeos/gdata/drive_cache_observer.h b/chrome/browser/chromeos/drive/drive_cache_observer.h
index ef95dec..3357363 100644
--- a/chrome/browser/chromeos/gdata/drive_cache_observer.h
+++ b/chrome/browser/chromeos/drive/drive_cache_observer.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_CHROMEOS_GDATA_DRIVE_CACHE_OBSERVER_H_
-#define CHROME_BROWSER_CHROMEOS_GDATA_DRIVE_CACHE_OBSERVER_H_
+#ifndef CHROME_BROWSER_CHROMEOS_DRIVE_DRIVE_CACHE_OBSERVER_H_
+#define CHROME_BROWSER_CHROMEOS_DRIVE_DRIVE_CACHE_OBSERVER_H_
 
 #include <string>
 
@@ -30,4 +30,4 @@ class DriveCacheObserver {
 
 }  // namespace gdata
 
-#endif  // CHROME_BROWSER_CHROMEOS_GDATA_DRIVE_CACHE_OBSERVER_H_
+#endif  // CHROME_BROWSER_CHROMEOS_DRIVE_DRIVE_CACHE_OBSERVER_H_
diff --git a/chrome/browser/chromeos/gdata/drive_cache_unittest.cc b/chrome/browser/chromeos/drive/drive_cache_unittest.cc
index 0c3e259..160f9cc 100644
--- a/chrome/browser/chromeos/gdata/drive_cache_unittest.cc
+++ b/chrome/browser/chromeos/drive/drive_cache_unittest.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/chromeos/gdata/drive_cache.h"
+#include "chrome/browser/chromeos/drive/drive_cache.h"
 
 #include <algorithm>
 #include <vector>
@@ -11,11 +11,11 @@
 #include "base/message_loop.h"
 #include "base/path_service.h"
 #include "base/threading/sequenced_worker_pool.h"
-#include "chrome/browser/chromeos/gdata/drive.pb.h"
-#include "chrome/browser/chromeos/gdata/drive_file_system.h"
-#include "chrome/browser/chromeos/gdata/drive_file_system_util.h"
-#include "chrome/browser/chromeos/gdata/drive_test_util.h"
-#include "chrome/browser/chromeos/gdata/mock_drive_cache_observer.h"
+#include "chrome/browser/chromeos/drive/drive.pb.h"
+#include "chrome/browser/chromeos/drive/drive_file_system.h"
+#include "chrome/browser/chromeos/drive/drive_file_system_util.h"
+#include "chrome/browser/chromeos/drive/drive_test_util.h"
+#include "chrome/browser/chromeos/drive/mock_drive_cache_observer.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/test/base/testing_profile.h"
 #include "content/public/test/test_browser_thread.h"
diff --git a/chrome/browser/chromeos/gdata/drive_download_observer.cc b/chrome/browser/chromeos/drive/drive_download_observer.cc
index 8b3500e..dcc80381 100644
--- a/chrome/browser/chromeos/gdata/drive_download_observer.cc
+++ b/chrome/browser/chromeos/drive/drive_download_observer.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/chromeos/gdata/drive_download_observer.h"
+#include "chrome/browser/chromeos/drive/drive_download_observer.h"
 
 #include <string>
 
@@ -10,11 +10,11 @@
 #include "base/file_util.h"
 #include "base/string_number_conversions.h"
 #include "base/supports_user_data.h"
-#include "chrome/browser/chromeos/gdata/drive.pb.h"
-#include "chrome/browser/chromeos/gdata/drive_file_system_interface.h"
-#include "chrome/browser/chromeos/gdata/drive_file_system_util.h"
-#include "chrome/browser/chromeos/gdata/drive_service_interface.h"
-#include "chrome/browser/chromeos/gdata/drive_system_service.h"
+#include "chrome/browser/chromeos/drive/drive.pb.h"
+#include "chrome/browser/chromeos/drive/drive_file_system_interface.h"
+#include "chrome/browser/chromeos/drive/drive_file_system_util.h"
+#include "chrome/browser/chromeos/drive/drive_service_interface.h"
+#include "chrome/browser/chromeos/drive/drive_system_service.h"
 #include "chrome/browser/download/download_completion_blocker.h"
 #include "chrome/browser/google_apis/gdata_util.h"
 #include "chrome/browser/google_apis/gdata_wapi_parser.h"
diff --git a/chrome/browser/chromeos/gdata/drive_download_observer.h b/chrome/browser/chromeos/drive/drive_download_observer.h
index caea52e..138a172 100644
--- a/chrome/browser/chromeos/gdata/drive_download_observer.h
+++ b/chrome/browser/chromeos/drive/drive_download_observer.h
@@ -2,17 +2,17 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_CHROMEOS_GDATA_DRIVE_DOWNLOAD_OBSERVER_H_
-#define CHROME_BROWSER_CHROMEOS_GDATA_DRIVE_DOWNLOAD_OBSERVER_H_
+#ifndef CHROME_BROWSER_CHROMEOS_DRIVE_DRIVE_DOWNLOAD_OBSERVER_H_
+#define CHROME_BROWSER_CHROMEOS_DRIVE_DRIVE_DOWNLOAD_OBSERVER_H_
 
 #include <map>
 
 #include "base/callback_forward.h"
 #include "base/memory/weak_ptr.h"
+#include "chrome/browser/chromeos/drive/drive_uploader.h"
+#include "chrome/browser/google_apis/gdata_errorcode.h"
 #include "content/public/browser/download_item.h"
 #include "content/public/browser/download_manager.h"
-#include "chrome/browser/chromeos/gdata/drive_uploader.h"
-#include "chrome/browser/google_apis/gdata_errorcode.h"
 #include "googleurl/src/gurl.h"
 
 class Profile;
@@ -221,4 +221,4 @@ class DriveDownloadObserver : public content::DownloadManager::Observer,
 
 }  // namespace gdata
 
-#endif  // CHROME_BROWSER_CHROMEOS_GDATA_DRIVE_DOWNLOAD_OBSERVER_H_
+#endif  // CHROME_BROWSER_CHROMEOS_DRIVE_DRIVE_DOWNLOAD_OBSERVER_H_
diff --git a/chrome/browser/chromeos/gdata/drive_file_system.cc b/chrome/browser/chromeos/drive/drive_file_system.cc
index d41d99e..42b9c19 100644
--- a/chrome/browser/chromeos/gdata/drive_file_system.cc
+++ b/chrome/browser/chromeos/drive/drive_file_system.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/chromeos/gdata/drive_file_system.h"
+#include "chrome/browser/chromeos/drive/drive_file_system.h"
 
 #include "base/bind.h"
 #include "base/file_util.h"
@@ -14,17 +14,17 @@
 #include "base/threading/sequenced_worker_pool.h"
 #include "base/values.h"
 #include "chrome/browser/api/prefs/pref_change_registrar.h"
-#include "chrome/browser/chromeos/gdata/drive.pb.h"
-#include "chrome/browser/chromeos/gdata/drive_files.h"
-#include "chrome/browser/chromeos/gdata/drive_file_system_observer.h"
-#include "chrome/browser/chromeos/gdata/drive_file_system_util.h"
-#include "chrome/browser/chromeos/gdata/drive_scheduler.h"
-#include "chrome/browser/chromeos/gdata/drive_service_interface.h"
-#include "chrome/browser/chromeos/gdata/drive_uploader.h"
-#include "chrome/browser/chromeos/gdata/file_system/move_operation.h"
-#include "chrome/browser/chromeos/gdata/file_system/remove_operation.h"
-#include "chrome/browser/chromeos/gdata/gdata_wapi_feed_loader.h"
-#include "chrome/browser/chromeos/gdata/gdata_wapi_feed_processor.h"
+#include "chrome/browser/chromeos/drive/drive.pb.h"
+#include "chrome/browser/chromeos/drive/drive_files.h"
+#include "chrome/browser/chromeos/drive/drive_file_system_observer.h"
+#include "chrome/browser/chromeos/drive/drive_file_system_util.h"
+#include "chrome/browser/chromeos/drive/drive_scheduler.h"
+#include "chrome/browser/chromeos/drive/drive_service_interface.h"
+#include "chrome/browser/chromeos/drive/drive_uploader.h"
+#include "chrome/browser/chromeos/drive/file_system/move_operation.h"
+#include "chrome/browser/chromeos/drive/file_system/remove_operation.h"
+#include "chrome/browser/chromeos/drive/gdata_wapi_feed_loader.h"
+#include "chrome/browser/chromeos/drive/gdata_wapi_feed_processor.h"
 #include "chrome/browser/google_apis/drive_api_parser.h"
 #include "chrome/browser/google_apis/gdata_util.h"
 #include "chrome/browser/google_apis/task_util.h"
diff --git a/chrome/browser/chromeos/gdata/drive_file_system.h b/chrome/browser/chromeos/drive/drive_file_system.h
index c44761a..ca2a3af 100644
--- a/chrome/browser/chromeos/gdata/drive_file_system.h
+++ b/chrome/browser/chromeos/drive/drive_file_system.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_CHROMEOS_GDATA_DRIVE_FILE_SYSTEM_H_
-#define CHROME_BROWSER_CHROMEOS_GDATA_DRIVE_FILE_SYSTEM_H_
+#ifndef CHROME_BROWSER_CHROMEOS_DRIVE_DRIVE_FILE_SYSTEM_H_
+#define CHROME_BROWSER_CHROMEOS_DRIVE_DRIVE_FILE_SYSTEM_H_
 
 #include <string>
 #include <vector>
@@ -12,9 +12,9 @@
 #include "base/memory/weak_ptr.h"
 #include "base/observer_list.h"
 #include "base/timer.h"
-#include "chrome/browser/chromeos/gdata/drive_cache.h"
-#include "chrome/browser/chromeos/gdata/drive_file_system_interface.h"
-#include "chrome/browser/chromeos/gdata/gdata_wapi_feed_loader_observer.h"
+#include "chrome/browser/chromeos/drive/drive_cache.h"
+#include "chrome/browser/chromeos/drive/drive_file_system_interface.h"
+#include "chrome/browser/chromeos/drive/gdata_wapi_feed_loader_observer.h"
 #include "chrome/browser/google_apis/gdata_errorcode.h"
 #include "content/public/browser/notification_observer.h"
 
@@ -883,4 +883,4 @@ class DriveFileSystem : public DriveFileSystemInterface,
 
 }  // namespace gdata
 
-#endif  // CHROME_BROWSER_CHROMEOS_GDATA_DRIVE_FILE_SYSTEM_H_
+#endif  // CHROME_BROWSER_CHROMEOS_DRIVE_DRIVE_FILE_SYSTEM_H_
diff --git a/chrome/browser/chromeos/gdata/drive_file_system_interface.h b/chrome/browser/chromeos/drive/drive_file_system_interface.h
index 80e86c9..bb6b4ba 100644
--- a/chrome/browser/chromeos/gdata/drive_file_system_interface.h
+++ b/chrome/browser/chromeos/drive/drive_file_system_interface.h
@@ -2,15 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_CHROMEOS_GDATA_DRIVE_FILE_SYSTEM_INTERFACE_H_
-#define CHROME_BROWSER_CHROMEOS_GDATA_DRIVE_FILE_SYSTEM_INTERFACE_H_
+#ifndef CHROME_BROWSER_CHROMEOS_DRIVE_DRIVE_FILE_SYSTEM_INTERFACE_H_
+#define CHROME_BROWSER_CHROMEOS_DRIVE_DRIVE_FILE_SYSTEM_INTERFACE_H_
 
 #include <string>
 #include <vector>
 
 #include "base/memory/scoped_ptr.h"
-#include "chrome/browser/chromeos/gdata/drive_cache.h"
-#include "chrome/browser/chromeos/gdata/drive_resource_metadata.h"
+#include "chrome/browser/chromeos/drive/drive_cache.h"
+#include "chrome/browser/chromeos/drive/drive_resource_metadata.h"
 #include "chrome/browser/google_apis/gdata_operations.h"
 
 namespace gdata {
@@ -347,4 +347,4 @@ class DriveFileSystemInterface {
 
 }  // namespace gdata
 
-#endif  // CHROME_BROWSER_CHROMEOS_GDATA_DRIVE_FILE_SYSTEM_INTERFACE_H_
+#endif  // CHROME_BROWSER_CHROMEOS_DRIVE_DRIVE_FILE_SYSTEM_INTERFACE_H_
diff --git a/chrome/browser/chromeos/gdata/drive_file_system_observer.h b/chrome/browser/chromeos/drive/drive_file_system_observer.h
index a2b116e..4ccb7d2 100644
--- a/chrome/browser/chromeos/gdata/drive_file_system_observer.h
+++ b/chrome/browser/chromeos/drive/drive_file_system_observer.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_CHROMEOS_GDATA_DRIVE_FILE_SYSTEM_OBSERVER_H_
-#define CHROME_BROWSER_CHROMEOS_GDATA_DRIVE_FILE_SYSTEM_OBSERVER_H_
+#ifndef CHROME_BROWSER_CHROMEOS_DRIVE_DRIVE_FILE_SYSTEM_OBSERVER_H_
+#define CHROME_BROWSER_CHROMEOS_DRIVE_DRIVE_FILE_SYSTEM_OBSERVER_H_
 
 #include "chrome/browser/google_apis/gdata_errorcode.h"
 
@@ -49,4 +49,4 @@ class DriveFileSystemObserver {
 
 }  // namespace gdata
 
-#endif  // CHROME_BROWSER_CHROMEOS_GDATA_DRIVE_FILE_SYSTEM_OBSERVER_H_
+#endif  // CHROME_BROWSER_CHROMEOS_DRIVE_DRIVE_FILE_SYSTEM_OBSERVER_H_
diff --git a/chrome/browser/chromeos/gdata/drive_file_system_proxy.cc b/chrome/browser/chromeos/drive/drive_file_system_proxy.cc
index 31070c7..248ab1d 100644
--- a/chrome/browser/chromeos/gdata/drive_file_system_proxy.cc
+++ b/chrome/browser/chromeos/drive/drive_file_system_proxy.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/chromeos/gdata/drive_file_system_proxy.h"
+#include "chrome/browser/chromeos/drive/drive_file_system_proxy.h"
 
 #include <string>
 #include <vector>
@@ -11,10 +11,10 @@
 #include "base/platform_file.h"
 #include "base/string_util.h"
 #include "base/values.h"
-#include "chrome/browser/chromeos/gdata/drive.pb.h"
-#include "chrome/browser/chromeos/gdata/drive_file_system_interface.h"
-#include "chrome/browser/chromeos/gdata/drive_files.h"
-#include "chrome/browser/chromeos/gdata/drive_system_service.h"
+#include "chrome/browser/chromeos/drive/drive.pb.h"
+#include "chrome/browser/chromeos/drive/drive_file_system_interface.h"
+#include "chrome/browser/chromeos/drive/drive_files.h"
+#include "chrome/browser/chromeos/drive/drive_system_service.h"
 #include "chrome/browser/google_apis/gdata_util.h"
 #include "content/public/browser/browser_thread.h"
 #include "webkit/blob/shareable_file_reference.h"
diff --git a/chrome/browser/chromeos/gdata/drive_file_system_proxy.h b/chrome/browser/chromeos/drive/drive_file_system_proxy.h
index 8cc48eb..f04dbcb 100644
--- a/chrome/browser/chromeos/gdata/drive_file_system_proxy.h
+++ b/chrome/browser/chromeos/drive/drive_file_system_proxy.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_CHROMEOS_GDATA_DRIVE_FILE_SYSTEM_PROXY_H_
-#define CHROME_BROWSER_CHROMEOS_GDATA_DRIVE_FILE_SYSTEM_PROXY_H_
+#ifndef CHROME_BROWSER_CHROMEOS_DRIVE_DRIVE_FILE_SYSTEM_PROXY_H_
+#define CHROME_BROWSER_CHROMEOS_DRIVE_DRIVE_FILE_SYSTEM_PROXY_H_
 
 #include "chrome/browser/google_apis/gdata_errorcode.h"
 #include "webkit/chromeos/fileapi/remote_file_system_proxy.h"
@@ -193,4 +193,4 @@ class DriveFileSystemProxy : public fileapi::RemoteFileSystemProxyInterface {
 
 }  // namespace chromeos
 
-#endif  // CHROME_BROWSER_CHROMEOS_GDATA_DRIVE_FILE_SYSTEM_PROXY_H_
+#endif  // CHROME_BROWSER_CHROMEOS_DRIVE_DRIVE_FILE_SYSTEM_PROXY_H_
diff --git a/chrome/browser/chromeos/gdata/drive_file_system_unittest.cc b/chrome/browser/chromeos/drive/drive_file_system_unittest.cc
index 2b51a00..b9a5e01 100644
--- a/chrome/browser/chromeos/gdata/drive_file_system_unittest.cc
+++ b/chrome/browser/chromeos/drive/drive_file_system_unittest.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/chromeos/gdata/drive_file_system.h"
+#include "chrome/browser/chromeos/drive/drive_file_system.h"
 
 #include <string>
 #include <vector>
@@ -18,18 +18,18 @@
 #include "base/stringprintf.h"
 #include "base/threading/sequenced_worker_pool.h"
 #include "base/values.h"
-#include "chrome/browser/chromeos/gdata/drive.pb.h"
-#include "chrome/browser/chromeos/gdata/drive_file_system_util.h"
-#include "chrome/browser/chromeos/gdata/drive_test_util.h"
-#include "chrome/browser/chromeos/gdata/drive_uploader.h"
-#include "chrome/browser/chromeos/gdata/drive_webapps_registry.h"
-#include "chrome/browser/chromeos/gdata/file_system/remove_operation.h"
-#include "chrome/browser/chromeos/gdata/mock_directory_change_observer.h"
-#include "chrome/browser/chromeos/gdata/mock_drive_cache_observer.h"
-#include "chrome/browser/chromeos/gdata/mock_drive_service.h"
-#include "chrome/browser/chromeos/gdata/mock_drive_uploader.h"
-#include "chrome/browser/chromeos/gdata/mock_drive_web_apps_registry.h"
-#include "chrome/browser/chromeos/gdata/mock_free_disk_space_getter.h"
+#include "chrome/browser/chromeos/drive/drive.pb.h"
+#include "chrome/browser/chromeos/drive/drive_file_system_util.h"
+#include "chrome/browser/chromeos/drive/drive_test_util.h"
+#include "chrome/browser/chromeos/drive/drive_uploader.h"
+#include "chrome/browser/chromeos/drive/drive_webapps_registry.h"
+#include "chrome/browser/chromeos/drive/file_system/remove_operation.h"
+#include "chrome/browser/chromeos/drive/mock_directory_change_observer.h"
+#include "chrome/browser/chromeos/drive/mock_drive_cache_observer.h"
+#include "chrome/browser/chromeos/drive/mock_drive_service.h"
+#include "chrome/browser/chromeos/drive/mock_drive_uploader.h"
+#include "chrome/browser/chromeos/drive/mock_drive_web_apps_registry.h"
+#include "chrome/browser/chromeos/drive/mock_free_disk_space_getter.h"
 #include "chrome/browser/google_apis/drive_api_parser.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/test/base/testing_profile.h"
diff --git a/chrome/browser/chromeos/gdata/drive_file_system_util.cc b/chrome/browser/chromeos/drive/drive_file_system_util.cc
index 80c2f99..d763ac0b 100644
--- a/chrome/browser/chromeos/gdata/drive_file_system_util.cc
+++ b/chrome/browser/chromeos/drive/drive_file_system_util.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/chromeos/gdata/drive_file_system_util.h"
+#include "chrome/browser/chromeos/drive/drive_file_system_util.h"
 
 #include <string>
 #include <vector>
@@ -19,10 +19,10 @@
 #include "base/string_number_conversions.h"
 #include "base/string_util.h"
 #include "base/stringprintf.h"
-#include "chrome/browser/chromeos/gdata/drive.pb.h"
-#include "chrome/browser/chromeos/gdata/drive_file_system_interface.h"
-#include "chrome/browser/chromeos/gdata/drive_system_service.h"
-#include "chrome/browser/chromeos/gdata/file_write_helper.h"
+#include "chrome/browser/chromeos/drive/drive.pb.h"
+#include "chrome/browser/chromeos/drive/drive_file_system_interface.h"
+#include "chrome/browser/chromeos/drive/drive_system_service.h"
+#include "chrome/browser/chromeos/drive/file_write_helper.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_finder.h"
diff --git a/chrome/browser/chromeos/gdata/drive_file_system_util.h b/chrome/browser/chromeos/drive/drive_file_system_util.h
index cfa0d77..9c59727 100644
--- a/chrome/browser/chromeos/gdata/drive_file_system_util.h
+++ b/chrome/browser/chromeos/drive/drive_file_system_util.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_CHROMEOS_GDATA_DRIVE_FILE_SYSTEM_UTIL_H_
-#define CHROME_BROWSER_CHROMEOS_GDATA_DRIVE_FILE_SYSTEM_UTIL_H_
+#ifndef CHROME_BROWSER_CHROMEOS_DRIVE_DRIVE_FILE_SYSTEM_UTIL_H_
+#define CHROME_BROWSER_CHROMEOS_DRIVE_DRIVE_FILE_SYSTEM_UTIL_H_
 
 #include <string>
 #include <utility>
@@ -11,7 +11,7 @@
 
 #include "base/callback_forward.h"
 #include "base/memory/scoped_ptr.h"
-#include "chrome/browser/chromeos/gdata/drive_resource_metadata.h"
+#include "chrome/browser/chromeos/drive/drive_resource_metadata.h"
 #include "chrome/browser/google_apis/gdata_errorcode.h"
 #include "googleurl/src/gurl.h"
 
@@ -139,4 +139,4 @@ bool IsConnectionTypeCellular();
 }  // namespace util
 }  // namespace gdata
 
-#endif  // CHROME_BROWSER_CHROMEOS_GDATA_DRIVE_FILE_SYSTEM_UTIL_H_
+#endif  // CHROME_BROWSER_CHROMEOS_DRIVE_DRIVE_FILE_SYSTEM_UTIL_H_
diff --git a/chrome/browser/chromeos/gdata/drive_file_system_util_unittest.cc b/chrome/browser/chromeos/drive/drive_file_system_util_unittest.cc
index 9db08a5..99a396a 100644
--- a/chrome/browser/chromeos/gdata/drive_file_system_util_unittest.cc
+++ b/chrome/browser/chromeos/drive/drive_file_system_util_unittest.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/chromeos/gdata/drive_file_system_util.h"
+#include "chrome/browser/chromeos/drive/drive_file_system_util.h"
 
 #include "base/file_path.h"
 #include "testing/gtest/include/gtest/gtest.h"
diff --git a/chrome/browser/chromeos/gdata/drive_files.cc b/chrome/browser/chromeos/drive/drive_files.cc
index 0e7f6ed..e1e8359 100644
--- a/chrome/browser/chromeos/gdata/drive_files.cc
+++ b/chrome/browser/chromeos/drive/drive_files.cc
@@ -2,15 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/chromeos/gdata/drive_files.h"
+#include "chrome/browser/chromeos/drive/drive_files.h"
 
 #include "base/platform_file.h"
 #include "base/string_util.h"
 #include "base/stringprintf.h"
 #include "base/utf_string_conversions.h"
-#include "chrome/browser/chromeos/gdata/drive.pb.h"
-#include "chrome/browser/chromeos/gdata/drive_file_system_util.h"
-#include "chrome/browser/chromeos/gdata/drive_resource_metadata.h"
+#include "chrome/browser/chromeos/drive/drive.pb.h"
+#include "chrome/browser/chromeos/drive/drive_file_system_util.h"
+#include "chrome/browser/chromeos/drive/drive_resource_metadata.h"
 #include "chrome/browser/google_apis/gdata_wapi_parser.h"
 #include "net/base/escape.h"
 
diff --git a/chrome/browser/chromeos/gdata/drive_files.h b/chrome/browser/chromeos/drive/drive_files.h
index 20a990e..fe3bdb6 100644
--- a/chrome/browser/chromeos/gdata/drive_files.h
+++ b/chrome/browser/chromeos/drive/drive_files.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_CHROMEOS_GDATA_DRIVE_FILES_H_
-#define CHROME_BROWSER_CHROMEOS_GDATA_DRIVE_FILES_H_
+#ifndef CHROME_BROWSER_CHROMEOS_DRIVE_DRIVE_FILES_H_
+#define CHROME_BROWSER_CHROMEOS_DRIVE_DRIVE_FILES_H_
 
 #include <map>
 #include <set>
@@ -14,7 +14,7 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/platform_file.h"
-#include "chrome/browser/chromeos/gdata/drive.pb.h"
+#include "chrome/browser/chromeos/drive/drive.pb.h"
 #include "chrome/browser/google_apis/gdata_wapi_parser.h"
 
 namespace gdata {
@@ -278,4 +278,4 @@ class DriveDirectory : public DriveEntry {
 
 }  // namespace gdata
 
-#endif  // CHROME_BROWSER_CHROMEOS_GDATA_DRIVE_FILES_H_
+#endif  // CHROME_BROWSER_CHROMEOS_DRIVE_DRIVE_FILES_H_
diff --git a/chrome/browser/chromeos/gdata/drive_protocol_handler.cc b/chrome/browser/chromeos/drive/drive_protocol_handler.cc
index 0fdaf5e..5e36459 100644
--- a/chrome/browser/chromeos/gdata/drive_protocol_handler.cc
+++ b/chrome/browser/chromeos/drive/drive_protocol_handler.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/chromeos/gdata/drive_protocol_handler.h"
+#include "chrome/browser/chromeos/drive/drive_protocol_handler.h"
 
 #include <algorithm>
 #include <string>
@@ -17,10 +17,10 @@
 #include "base/string_util.h"
 #include "base/threading/sequenced_worker_pool.h"
 #include "base/utf_string_conversions.h"
-#include "chrome/browser/chromeos/gdata/drive.pb.h"
-#include "chrome/browser/chromeos/gdata/drive_file_system_interface.h"
-#include "chrome/browser/chromeos/gdata/drive_service_interface.h"
-#include "chrome/browser/chromeos/gdata/drive_system_service.h"
+#include "chrome/browser/chromeos/drive/drive.pb.h"
+#include "chrome/browser/chromeos/drive/drive_file_system_interface.h"
+#include "chrome/browser/chromeos/drive/drive_service_interface.h"
+#include "chrome/browser/chromeos/drive/drive_system_service.h"
 #include "chrome/browser/google_apis/gdata_errorcode.h"
 #include "chrome/browser/google_apis/gdata_util.h"
 #include "chrome/browser/profiles/profile.h"
diff --git a/chrome/browser/chromeos/gdata/drive_protocol_handler.h b/chrome/browser/chromeos/drive/drive_protocol_handler.h
index 4b4ee23..31d71d7 100644
--- a/chrome/browser/chromeos/gdata/drive_protocol_handler.h
+++ b/chrome/browser/chromeos/drive/drive_protocol_handler.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_CHROMEOS_GDATA_DRIVE_PROTOCOL_HANDLER_H_
-#define CHROME_BROWSER_CHROMEOS_GDATA_DRIVE_PROTOCOL_HANDLER_H_
+#ifndef CHROME_BROWSER_CHROMEOS_DRIVE_DRIVE_PROTOCOL_HANDLER_H_
+#define CHROME_BROWSER_CHROMEOS_DRIVE_DRIVE_PROTOCOL_HANDLER_H_
 
 #include "net/url_request/url_request_job_factory.h"
 
@@ -21,4 +21,4 @@ class DriveProtocolHandler : public net::URLRequestJobFactory::ProtocolHandler {
 
 }  // namespace gdata
 
-#endif  // CHROME_BROWSER_CHROMEOS_GDATA_DRIVE_PROTOCOL_HANDLER_H_
+#endif  // CHROME_BROWSER_CHROMEOS_DRIVE_DRIVE_PROTOCOL_HANDLER_H_
diff --git a/chrome/browser/chromeos/gdata/drive_resource_metadata.cc b/chrome/browser/chromeos/drive/drive_resource_metadata.cc
index 3f83c9f..fed813c 100644
--- a/chrome/browser/chromeos/gdata/drive_resource_metadata.cc
+++ b/chrome/browser/chromeos/drive/drive_resource_metadata.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/chromeos/gdata/drive_resource_metadata.h"
+#include "chrome/browser/chromeos/drive/drive_resource_metadata.h"
 
 #include <leveldb/db.h>
 #include <utility>
@@ -11,8 +11,8 @@
 #include "base/string_number_conversions.h"
 #include "base/sequenced_task_runner.h"
 #include "base/tracked_objects.h"
-#include "chrome/browser/chromeos/gdata/drive.pb.h"
-#include "chrome/browser/chromeos/gdata/drive_files.h"
+#include "chrome/browser/chromeos/drive/drive.pb.h"
+#include "chrome/browser/chromeos/drive/drive_files.h"
 #include "chrome/browser/google_apis/gdata_util.h"
 #include "chrome/browser/google_apis/gdata_wapi_parser.h"
 #include "content/public/browser/browser_thread.h"
diff --git a/chrome/browser/chromeos/gdata/drive_resource_metadata.h b/chrome/browser/chromeos/drive/drive_resource_metadata.h
index a04e5dd..5f9586f 100644
--- a/chrome/browser/chromeos/gdata/drive_resource_metadata.h
+++ b/chrome/browser/chromeos/drive/drive_resource_metadata.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_CHROMEOS_GDATA_DRIVE_RESOURCE_METADATA_H_
-#define CHROME_BROWSER_CHROMEOS_GDATA_DRIVE_RESOURCE_METADATA_H_
+#ifndef CHROME_BROWSER_CHROMEOS_DRIVE_DRIVE_RESOURCE_METADATA_H_
+#define CHROME_BROWSER_CHROMEOS_DRIVE_DRIVE_RESOURCE_METADATA_H_
 
 #include <map>
 #include <string>
@@ -317,4 +317,4 @@ class DriveResourceMetadata {
 
 }  // namespace gdata
 
-#endif  // CHROME_BROWSER_CHROMEOS_GDATA_DRIVE_RESOURCE_METADATA_H_
+#endif  // CHROME_BROWSER_CHROMEOS_DRIVE_DRIVE_RESOURCE_METADATA_H_
diff --git a/chrome/browser/chromeos/gdata/drive_resource_metadata_unittest.cc b/chrome/browser/chromeos/drive/drive_resource_metadata_unittest.cc
index d4ba593..a5c77f3 100644
--- a/chrome/browser/chromeos/gdata/drive_resource_metadata_unittest.cc
+++ b/chrome/browser/chromeos/drive/drive_resource_metadata_unittest.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/chromeos/gdata/drive_resource_metadata.h"
+#include "chrome/browser/chromeos/drive/drive_resource_metadata.h"
 
 #include <algorithm>
 #include <string>
@@ -13,10 +13,10 @@
 #include "base/string_number_conversions.h"
 #include "base/threading/sequenced_worker_pool.h"
 #include "base/message_loop.h"
-#include "chrome/browser/chromeos/gdata/drive.pb.h"
-#include "chrome/browser/chromeos/gdata/drive_cache.h"
-#include "chrome/browser/chromeos/gdata/drive_files.h"
-#include "chrome/browser/chromeos/gdata/drive_test_util.h"
+#include "chrome/browser/chromeos/drive/drive.pb.h"
+#include "chrome/browser/chromeos/drive/drive_cache.h"
+#include "chrome/browser/chromeos/drive/drive_files.h"
+#include "chrome/browser/chromeos/drive/drive_test_util.h"
 #include "chrome/test/base/testing_profile.h"
 #include "content/public/test/test_browser_thread.h"
 #include "testing/gtest/include/gtest/gtest.h"
diff --git a/chrome/browser/chromeos/gdata/drive_scheduler.cc b/chrome/browser/chromeos/drive/drive_scheduler.cc
index 6f966ef..0d775fa 100644
--- a/chrome/browser/chromeos/gdata/drive_scheduler.cc
+++ b/chrome/browser/chromeos/drive/drive_scheduler.cc
@@ -2,14 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/chromeos/gdata/drive_scheduler.h"
+#include "chrome/browser/chromeos/drive/drive_scheduler.h"
 
 #include <math.h>
 
 #include "base/message_loop.h"
 #include "base/rand_util.h"
-#include "chrome/browser/chromeos/gdata/drive_file_system_util.h"
-#include "chrome/browser/chromeos/gdata/file_system/remove_operation.h"
+#include "chrome/browser/chromeos/drive/drive_file_system_util.h"
+#include "chrome/browser/chromeos/drive/file_system/remove_operation.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/pref_names.h"
diff --git a/chrome/browser/chromeos/gdata/drive_scheduler.h b/chrome/browser/chromeos/drive/drive_scheduler.h
index 2c36425..f97abaf 100644
--- a/chrome/browser/chromeos/gdata/drive_scheduler.h
+++ b/chrome/browser/chromeos/drive/drive_scheduler.h
@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_CHROMEOS_GDATA_DRIVE_SCHEDULER_H_
-#define CHROME_BROWSER_CHROMEOS_GDATA_DRIVE_SCHEDULER_H_
+#ifndef CHROME_BROWSER_CHROMEOS_DRIVE_DRIVE_SCHEDULER_H_
+#define CHROME_BROWSER_CHROMEOS_DRIVE_DRIVE_SCHEDULER_H_
 
 #include "base/memory/linked_ptr.h"
 #include "base/memory/scoped_ptr.h"
-#include "chrome/browser/chromeos/gdata/drive_file_system_interface.h"
+#include "chrome/browser/chromeos/drive/drive_file_system_interface.h"
 #include "net/base/network_change_notifier.h"
 
 #include <deque>
@@ -175,4 +175,4 @@ class DriveScheduler
 
 }  // namespace gdata
 
-#endif  // CHROME_BROWSER_CHROMEOS_GDATA_DRIVE_SCHEDULER_H_
+#endif  // CHROME_BROWSER_CHROMEOS_DRIVE_DRIVE_SCHEDULER_H_
diff --git a/chrome/browser/chromeos/gdata/drive_scheduler_unittest.cc b/chrome/browser/chromeos/drive/drive_scheduler_unittest.cc
index 6eab15b..3bec3e4 100644
--- a/chrome/browser/chromeos/gdata/drive_scheduler_unittest.cc
+++ b/chrome/browser/chromeos/drive/drive_scheduler_unittest.cc
@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/chromeos/gdata/drive_scheduler.h"
+#include "chrome/browser/chromeos/drive/drive_scheduler.h"
 
 #include "base/bind.h"
 #include "base/threading/sequenced_worker_pool.h"
-#include "chrome/browser/chromeos/gdata/drive_test_util.h"
-#include "chrome/browser/chromeos/gdata/file_system/remove_operation.h"
+#include "chrome/browser/chromeos/drive/drive_test_util.h"
+#include "chrome/browser/chromeos/drive/file_system/remove_operation.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/test/base/testing_profile.h"
diff --git a/chrome/browser/chromeos/gdata/drive_service_interface.h b/chrome/browser/chromeos/drive/drive_service_interface.h
index 996781b..c82b273 100644
--- a/chrome/browser/chromeos/gdata/drive_service_interface.h
+++ b/chrome/browser/chromeos/drive/drive_service_interface.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_CHROMEOS_GDATA_DRIVE_SERVICE_INTERFACE_H_
-#define CHROME_BROWSER_CHROMEOS_GDATA_DRIVE_SERVICE_INTERFACE_H_
+#ifndef CHROME_BROWSER_CHROMEOS_DRIVE_DRIVE_SERVICE_INTERFACE_H_
+#define CHROME_BROWSER_CHROMEOS_DRIVE_DRIVE_SERVICE_INTERFACE_H_
 
 #include <string>
 
@@ -229,4 +229,4 @@ class DriveServiceInterface {
 
 }  // namespace gdata
 
-#endif  // CHROME_BROWSER_CHROMEOS_GDATA_DRIVE_SERVICE_INTERFACE_H_
+#endif  // CHROME_BROWSER_CHROMEOS_DRIVE_DRIVE_SERVICE_INTERFACE_H_
diff --git a/chrome/browser/chromeos/gdata/drive_sync_client.cc b/chrome/browser/chromeos/drive/drive_sync_client.cc
index e7b3a86..c7bf191 100644
--- a/chrome/browser/chromeos/gdata/drive_sync_client.cc
+++ b/chrome/browser/chromeos/drive/drive_sync_client.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/chromeos/gdata/drive_sync_client.h"
+#include "chrome/browser/chromeos/drive/drive_sync_client.h"
 
 #include <algorithm>
 #include <vector>
@@ -10,9 +10,9 @@
 #include "base/bind.h"
 #include "base/message_loop_proxy.h"
 #include "chrome/browser/api/prefs/pref_change_registrar.h"
-#include "chrome/browser/chromeos/gdata/drive.pb.h"
-#include "chrome/browser/chromeos/gdata/drive_file_system_interface.h"
-#include "chrome/browser/chromeos/gdata/drive_file_system_util.h"
+#include "chrome/browser/chromeos/drive/drive.pb.h"
+#include "chrome/browser/chromeos/drive/drive_file_system_interface.h"
+#include "chrome/browser/chromeos/drive/drive_file_system_util.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/pref_names.h"
diff --git a/chrome/browser/chromeos/gdata/drive_sync_client.h b/chrome/browser/chromeos/drive/drive_sync_client.h
index 5cdbf26..ff8aa82 100644
--- a/chrome/browser/chromeos/gdata/drive_sync_client.h
+++ b/chrome/browser/chromeos/drive/drive_sync_client.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_CHROMEOS_GDATA_DRIVE_SYNC_CLIENT_H_
-#define CHROME_BROWSER_CHROMEOS_GDATA_DRIVE_SYNC_CLIENT_H_
+#ifndef CHROME_BROWSER_CHROMEOS_DRIVE_DRIVE_SYNC_CLIENT_H_
+#define CHROME_BROWSER_CHROMEOS_DRIVE_DRIVE_SYNC_CLIENT_H_
 
 #include <deque>
 #include <string>
@@ -12,10 +12,10 @@
 #include "base/callback_forward.h"
 #include "base/memory/weak_ptr.h"
 #include "base/time.h"
-#include "chrome/browser/chromeos/gdata/drive_cache.h"
-#include "chrome/browser/chromeos/gdata/drive_cache_observer.h"
-#include "chrome/browser/chromeos/gdata/drive_file_system_observer.h"
-#include "chrome/browser/chromeos/gdata/drive_resource_metadata.h"
+#include "chrome/browser/chromeos/drive/drive_cache.h"
+#include "chrome/browser/chromeos/drive/drive_cache_observer.h"
+#include "chrome/browser/chromeos/drive/drive_file_system_observer.h"
+#include "chrome/browser/chromeos/drive/drive_resource_metadata.h"
 #include "content/public/browser/notification_observer.h"
 #include "net/base/network_change_notifier.h"
 
@@ -210,4 +210,4 @@ class DriveSyncClient
 
 }  // namespace gdata
 
-#endif  // CHROME_BROWSER_CHROMEOS_GDATA_DRIVE_SYNC_CLIENT_H_
+#endif  // CHROME_BROWSER_CHROMEOS_DRIVE_DRIVE_SYNC_CLIENT_H_
diff --git a/chrome/browser/chromeos/gdata/drive_sync_client_unittest.cc b/chrome/browser/chromeos/drive/drive_sync_client_unittest.cc
index 2b81287..13a0d158 100644
--- a/chrome/browser/chromeos/gdata/drive_sync_client_unittest.cc
+++ b/chrome/browser/chromeos/drive/drive_sync_client_unittest.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/chromeos/gdata/drive_sync_client.h"
+#include "chrome/browser/chromeos/drive/drive_sync_client.h"
 
 #include <algorithm>
 #include <vector>
@@ -16,10 +16,10 @@
 #include "base/scoped_temp_dir.h"
 #include "base/test/test_timeouts.h"
 #include "base/threading/sequenced_worker_pool.h"
-#include "chrome/browser/chromeos/gdata/drive.pb.h"
-#include "chrome/browser/chromeos/gdata/drive_file_system_util.h"
-#include "chrome/browser/chromeos/gdata/drive_test_util.h"
-#include "chrome/browser/chromeos/gdata/mock_drive_file_system.h"
+#include "chrome/browser/chromeos/drive/drive.pb.h"
+#include "chrome/browser/chromeos/drive/drive_file_system_util.h"
+#include "chrome/browser/chromeos/drive/drive_test_util.h"
+#include "chrome/browser/chromeos/drive/mock_drive_file_system.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/pref_names.h"
diff --git a/chrome/browser/chromeos/gdata/drive_system_service.cc b/chrome/browser/chromeos/drive/drive_system_service.cc
index 1ac0e45..7fbc656 100644
--- a/chrome/browser/chromeos/gdata/drive_system_service.cc
+++ b/chrome/browser/chromeos/drive/drive_system_service.cc
@@ -2,21 +2,21 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/chromeos/gdata/drive_system_service.h"
+#include "chrome/browser/chromeos/drive/drive_system_service.h"
 
 #include "base/bind.h"
 #include "chrome/browser/browser_process.h"
-#include "chrome/browser/chromeos/gdata/drive_api_service.h"
-#include "chrome/browser/chromeos/gdata/drive_download_observer.h"
-#include "chrome/browser/chromeos/gdata/drive_file_system.h"
-#include "chrome/browser/chromeos/gdata/drive_file_system_proxy.h"
-#include "chrome/browser/chromeos/gdata/drive_file_system_util.h"
-#include "chrome/browser/chromeos/gdata/drive_sync_client.h"
-#include "chrome/browser/chromeos/gdata/drive_uploader.h"
-#include "chrome/browser/chromeos/gdata/drive_webapps_registry.h"
-#include "chrome/browser/chromeos/gdata/file_write_helper.h"
-#include "chrome/browser/chromeos/gdata/gdata_wapi_service.h"
-#include "chrome/browser/chromeos/gdata/stale_cache_files_remover.h"
+#include "chrome/browser/chromeos/drive/drive_api_service.h"
+#include "chrome/browser/chromeos/drive/drive_download_observer.h"
+#include "chrome/browser/chromeos/drive/drive_file_system.h"
+#include "chrome/browser/chromeos/drive/drive_file_system_proxy.h"
+#include "chrome/browser/chromeos/drive/drive_file_system_util.h"
+#include "chrome/browser/chromeos/drive/drive_sync_client.h"
+#include "chrome/browser/chromeos/drive/drive_uploader.h"
+#include "chrome/browser/chromeos/drive/drive_webapps_registry.h"
+#include "chrome/browser/chromeos/drive/file_write_helper.h"
+#include "chrome/browser/chromeos/drive/gdata_wapi_service.h"
+#include "chrome/browser/chromeos/drive/stale_cache_files_remover.h"
 #include "chrome/browser/download/download_service.h"
 #include "chrome/browser/download/download_service_factory.h"
 #include "chrome/browser/download/download_util.h"
diff --git a/chrome/browser/chromeos/gdata/drive_system_service.h b/chrome/browser/chromeos/drive/drive_system_service.h
index 9ffcf33..dc6ae42b 100644
--- a/chrome/browser/chromeos/gdata/drive_system_service.h
+++ b/chrome/browser/chromeos/drive/drive_system_service.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_CHROMEOS_GDATA_DRIVE_SYSTEM_SERVICE_H_
-#define CHROME_BROWSER_CHROMEOS_GDATA_DRIVE_SYSTEM_SERVICE_H_
+#ifndef CHROME_BROWSER_CHROMEOS_DRIVE_DRIVE_SYSTEM_SERVICE_H_
+#define CHROME_BROWSER_CHROMEOS_DRIVE_DRIVE_SYSTEM_SERVICE_H_
 
 #include <string>
 
@@ -137,4 +137,4 @@ class DriveSystemServiceFactory : public ProfileKeyedServiceFactory {
 
 }  // namespace gdata
 
-#endif  // CHROME_BROWSER_CHROMEOS_GDATA_DRIVE_SYSTEM_SERVICE_H_
+#endif  // CHROME_BROWSER_CHROMEOS_DRIVE_DRIVE_SYSTEM_SERVICE_H_
diff --git a/chrome/browser/chromeos/gdata/drive_task_executor.cc b/chrome/browser/chromeos/drive/drive_task_executor.cc
index 7699dcf..42dd856 100644
--- a/chrome/browser/chromeos/gdata/drive_task_executor.cc
+++ b/chrome/browser/chromeos/drive/drive_task_executor.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/chromeos/gdata/drive_task_executor.h"
+#include "chrome/browser/chromeos/drive/drive_task_executor.h"
 
 #include <string>
 #include <vector>
@@ -10,10 +10,10 @@
 #include "base/json/json_writer.h"
 #include "base/string_util.h"
 #include "chrome/browser/chromeos/extensions/file_browser_private_api.h"
-#include "chrome/browser/chromeos/gdata/drive.pb.h"
-#include "chrome/browser/chromeos/gdata/drive_file_system_interface.h"
-#include "chrome/browser/chromeos/gdata/drive_service_interface.h"
-#include "chrome/browser/chromeos/gdata/drive_system_service.h"
+#include "chrome/browser/chromeos/drive/drive.pb.h"
+#include "chrome/browser/chromeos/drive/drive_file_system_interface.h"
+#include "chrome/browser/chromeos/drive/drive_service_interface.h"
+#include "chrome/browser/chromeos/drive/drive_system_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/ui/browser.h"
diff --git a/chrome/browser/chromeos/gdata/drive_task_executor.h b/chrome/browser/chromeos/drive/drive_task_executor.h
index 4a3e3fe..bda3a15 100644
--- a/chrome/browser/chromeos/gdata/drive_task_executor.h
+++ b/chrome/browser/chromeos/drive/drive_task_executor.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_CHROMEOS_GDATA_DRIVE_TASK_EXECUTOR_H_
-#define CHROME_BROWSER_CHROMEOS_GDATA_DRIVE_TASK_EXECUTOR_H_
+#ifndef CHROME_BROWSER_CHROMEOS_DRIVE_DRIVE_TASK_EXECUTOR_H_
+#define CHROME_BROWSER_CHROMEOS_DRIVE_DRIVE_TASK_EXECUTOR_H_
 
 #include <string>
 #include <vector>
@@ -53,4 +53,4 @@ class DriveTaskExecutor : public file_handler_util::FileTaskExecutor {
 
 }  // namespace gdata
 
-#endif  // CHROME_BROWSER_CHROMEOS_GDATA_DRIVE_TASK_EXECUTOR_H_
+#endif  // CHROME_BROWSER_CHROMEOS_DRIVE_DRIVE_TASK_EXECUTOR_H_
diff --git a/chrome/browser/chromeos/gdata/drive_test_util.cc b/chrome/browser/chromeos/drive/drive_test_util.cc
index b9f6e05..27336fc 100644
--- a/chrome/browser/chromeos/gdata/drive_test_util.cc
+++ b/chrome/browser/chromeos/drive/drive_test_util.cc
@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/chromeos/gdata/drive_test_util.h"
+#include "chrome/browser/chromeos/drive/drive_test_util.h"
 
 #include "base/json/json_file_value_serializer.h"
-#include "chrome/browser/chromeos/gdata/drive.pb.h"
-#include "chrome/browser/chromeos/gdata/drive_file_system.h"
+#include "chrome/browser/chromeos/drive/drive.pb.h"
+#include "chrome/browser/chromeos/drive/drive_file_system.h"
 #include "chrome/browser/google_apis/drive_api_parser.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
diff --git a/chrome/browser/chromeos/gdata/drive_test_util.h b/chrome/browser/chromeos/drive/drive_test_util.h
index 057bca7..c1cd18a 100644
--- a/chrome/browser/chromeos/gdata/drive_test_util.h
+++ b/chrome/browser/chromeos/drive/drive_test_util.h
@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_CHROMEOS_GDATA_DRIVE_TEST_UTIL_H_
-#define CHROME_BROWSER_CHROMEOS_GDATA_DRIVE_TEST_UTIL_H_
+#ifndef CHROME_BROWSER_CHROMEOS_DRIVE_DRIVE_TEST_UTIL_H_
+#define CHROME_BROWSER_CHROMEOS_DRIVE_DRIVE_TEST_UTIL_H_
 
 #include "base/memory/scoped_ptr.h"
-#include "chrome/browser/chromeos/gdata/drive_resource_metadata.h"
-#include "chrome/browser/chromeos/gdata/drive_cache.h"
+#include "chrome/browser/chromeos/drive/drive_resource_metadata.h"
+#include "chrome/browser/chromeos/drive/drive_cache.h"
 #include "chrome/browser/google_apis/gdata_errorcode.h"
 #include "chrome/browser/google_apis/gdata_test_util.h"
 
@@ -107,4 +107,4 @@ void LoadChangeFeed(const std::string& relative_path,
 }  // namespace test_util
 }  // namespace gdata
 
-#endif  // CHROME_BROWSER_CHROMEOS_GDATA_DRIVE_TEST_UTIL_H_
+#endif  // CHROME_BROWSER_CHROMEOS_DRIVE_DRIVE_TEST_UTIL_H_
diff --git a/chrome/browser/chromeos/gdata/drive_uploader.cc b/chrome/browser/chromeos/drive/drive_uploader.cc
index c02f0b0..aa0101c 100644
--- a/chrome/browser/chromeos/gdata/drive_uploader.cc
+++ b/chrome/browser/chromeos/drive/drive_uploader.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/chromeos/gdata/drive_uploader.h"
+#include "chrome/browser/chromeos/drive/drive_uploader.h"
 
 #include <algorithm>
 
@@ -10,7 +10,7 @@
 #include "base/callback.h"
 #include "base/stl_util.h"
 #include "base/string_number_conversions.h"
-#include "chrome/browser/chromeos/gdata/drive_service_interface.h"
+#include "chrome/browser/chromeos/drive/drive_service_interface.h"
 #include "chrome/browser/google_apis/gdata_wapi_parser.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/download_item.h"
diff --git a/chrome/browser/chromeos/gdata/drive_uploader.h b/chrome/browser/chromeos/drive/drive_uploader.h
index 2d8cbae..fbafdcf 100644
--- a/chrome/browser/chromeos/gdata/drive_uploader.h
+++ b/chrome/browser/chromeos/drive/drive_uploader.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_CHROMEOS_GDATA_DRIVE_UPLOADER_H_
-#define CHROME_BROWSER_CHROMEOS_GDATA_DRIVE_UPLOADER_H_
+#ifndef CHROME_BROWSER_CHROMEOS_DRIVE_DRIVE_UPLOADER_H_
+#define CHROME_BROWSER_CHROMEOS_DRIVE_DRIVE_UPLOADER_H_
 
 #include <map>
 #include <string>
@@ -269,4 +269,4 @@ class DriveUploader : public DriveUploaderInterface {
 
 }  // namespace gdata
 
-#endif  // CHROME_BROWSER_CHROMEOS_GDATA_DRIVE_UPLOADER_H_
+#endif  // CHROME_BROWSER_CHROMEOS_DRIVE_DRIVE_UPLOADER_H_
diff --git a/chrome/browser/chromeos/gdata/drive_webapps_registry.cc b/chrome/browser/chromeos/drive/drive_webapps_registry.cc
index b7c7940..5436d31 100644
--- a/chrome/browser/chromeos/gdata/drive_webapps_registry.cc
+++ b/chrome/browser/chromeos/drive/drive_webapps_registry.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/chromeos/gdata/drive_webapps_registry.h"
+#include "chrome/browser/chromeos/drive/drive_webapps_registry.h"
 
 #include <algorithm>
 #include <utility>
diff --git a/chrome/browser/chromeos/gdata/drive_webapps_registry.h b/chrome/browser/chromeos/drive/drive_webapps_registry.h
index 085e38a..027236a 100644
--- a/chrome/browser/chromeos/gdata/drive_webapps_registry.h
+++ b/chrome/browser/chromeos/drive/drive_webapps_registry.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_CHROMEOS_GDATA_DRIVE_WEBAPPS_REGISTRY_H_
-#define CHROME_BROWSER_CHROMEOS_GDATA_DRIVE_WEBAPPS_REGISTRY_H_
+#ifndef CHROME_BROWSER_CHROMEOS_DRIVE_DRIVE_WEBAPPS_REGISTRY_H_
+#define CHROME_BROWSER_CHROMEOS_DRIVE_DRIVE_WEBAPPS_REGISTRY_H_
 
 #include <map>
 #include <set>
@@ -156,4 +156,4 @@ class DriveWebAppsRegistry : public DriveWebAppsRegistryInterface {
 
 }  // namespace gdata
 
-#endif  // CHROME_BROWSER_CHROMEOS_GDATA_DRIVE_WEBAPPS_REGISTRY_H_
+#endif  // CHROME_BROWSER_CHROMEOS_DRIVE_DRIVE_WEBAPPS_REGISTRY_H_
diff --git a/chrome/browser/chromeos/gdata/drive_webapps_registry_unittest.cc b/chrome/browser/chromeos/drive/drive_webapps_registry_unittest.cc
index 3c8b291..539db59 100644
--- a/chrome/browser/chromeos/gdata/drive_webapps_registry_unittest.cc
+++ b/chrome/browser/chromeos/drive/drive_webapps_registry_unittest.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/chromeos/gdata/drive_webapps_registry.h"
+#include "chrome/browser/chromeos/drive/drive_webapps_registry.h"
 
 #include "base/file_path.h"
 #include "base/file_util.h"
@@ -12,7 +12,7 @@
 #include "base/string16.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
-#include "chrome/browser/chromeos/gdata/drive_test_util.h"
+#include "chrome/browser/chromeos/drive/drive_test_util.h"
 #include "chrome/browser/google_apis/drive_api_parser.h"
 #include "chrome/browser/google_apis/gdata_wapi_parser.h"
 #include "chrome/common/chrome_paths.h"
diff --git a/chrome/browser/chromeos/gdata/file_system/move_operation.cc b/chrome/browser/chromeos/drive/file_system/move_operation.cc
index cd44bd7..d17f829 100644
--- a/chrome/browser/chromeos/gdata/file_system/move_operation.cc
+++ b/chrome/browser/chromeos/drive/file_system/move_operation.cc
@@ -2,14 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/chromeos/gdata/file_system/move_operation.h"
-
-#include "chrome/browser/chromeos/gdata/drive_cache.h"
-#include "chrome/browser/chromeos/gdata/drive_file_system.h"
-#include "chrome/browser/chromeos/gdata/drive.pb.h"
-#include "chrome/browser/chromeos/gdata/drive_file_system_util.h"
-#include "chrome/browser/chromeos/gdata/drive_files.h"
-#include "chrome/browser/chromeos/gdata/drive_service_interface.h"
+#include "chrome/browser/chromeos/drive/file_system/move_operation.h"
+
+#include "chrome/browser/chromeos/drive/drive.pb.h"
+#include "chrome/browser/chromeos/drive/drive_cache.h"
+#include "chrome/browser/chromeos/drive/drive_file_system.h"
+#include "chrome/browser/chromeos/drive/drive_file_system_util.h"
+#include "chrome/browser/chromeos/drive/drive_files.h"
+#include "chrome/browser/chromeos/drive/drive_service_interface.h"
 #include "content/public/browser/browser_thread.h"
 
 using content::BrowserThread;
diff --git a/chrome/browser/chromeos/gdata/file_system/move_operation.h b/chrome/browser/chromeos/drive/file_system/move_operation.h
index 4d32689..7285ecf 100644
--- a/chrome/browser/chromeos/gdata/file_system/move_operation.h
+++ b/chrome/browser/chromeos/drive/file_system/move_operation.h
@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_CHROMEOS_GDATA_FILE_SYSTEM_MOVE_OPERATION_H_
-#define CHROME_BROWSER_CHROMEOS_GDATA_FILE_SYSTEM_MOVE_OPERATION_H_
+#ifndef CHROME_BROWSER_CHROMEOS_DRIVE_FILE_SYSTEM_MOVE_OPERATION_H_
+#define CHROME_BROWSER_CHROMEOS_DRIVE_FILE_SYSTEM_MOVE_OPERATION_H_
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
-#include "chrome/browser/chromeos/gdata/drive_resource_metadata.h"
+#include "chrome/browser/chromeos/drive/drive_resource_metadata.h"
 #include "chrome/browser/google_apis/gdata_errorcode.h"
 
 class FilePath;
@@ -155,4 +155,4 @@ class MoveOperation {
 }  // namespace file_system
 }  // namespace gdata
 
-#endif  // CHROME_BROWSER_CHROMEOS_GDATA_FILE_SYSTEM_MOVE_OPERATION_H_
+#endif  // CHROME_BROWSER_CHROMEOS_DRIVE_FILE_SYSTEM_MOVE_OPERATION_H_
diff --git a/chrome/browser/chromeos/gdata/file_system/remove_operation.cc b/chrome/browser/chromeos/drive/file_system/remove_operation.cc
index 6ed3262..e9eec58 100644
--- a/chrome/browser/chromeos/gdata/file_system/remove_operation.cc
+++ b/chrome/browser/chromeos/drive/file_system/remove_operation.cc
@@ -2,16 +2,16 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/chromeos/gdata/file_system/remove_operation.h"
+#include "chrome/browser/chromeos/drive/file_system/remove_operation.h"
 
 #include <math.h>
 
 #include "base/rand_util.h"
-#include "chrome/browser/chromeos/gdata/drive_cache.h"
-#include "chrome/browser/chromeos/gdata/drive_file_system.h"
-#include "chrome/browser/chromeos/gdata/drive.pb.h"
-#include "chrome/browser/chromeos/gdata/drive_file_system_util.h"
-#include "chrome/browser/chromeos/gdata/drive_service_interface.h"
+#include "chrome/browser/chromeos/drive/drive.pb.h"
+#include "chrome/browser/chromeos/drive/drive_cache.h"
+#include "chrome/browser/chromeos/drive/drive_file_system.h"
+#include "chrome/browser/chromeos/drive/drive_file_system_util.h"
+#include "chrome/browser/chromeos/drive/drive_service_interface.h"
 #include "content/public/browser/browser_thread.h"
 
 using content::BrowserThread;
diff --git a/chrome/browser/chromeos/gdata/file_system/remove_operation.h b/chrome/browser/chromeos/drive/file_system/remove_operation.h
index d8949f6..95af062 100644
--- a/chrome/browser/chromeos/gdata/file_system/remove_operation.h
+++ b/chrome/browser/chromeos/drive/file_system/remove_operation.h
@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_CHROMEOS_GDATA_FILE_SYSTEM_REMOVE_OPERATION_H_
-#define CHROME_BROWSER_CHROMEOS_GDATA_FILE_SYSTEM_REMOVE_OPERATION_H_
+#ifndef CHROME_BROWSER_CHROMEOS_DRIVE_FILE_SYSTEM_REMOVE_OPERATION_H_
+#define CHROME_BROWSER_CHROMEOS_DRIVE_FILE_SYSTEM_REMOVE_OPERATION_H_
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
-#include "chrome/browser/chromeos/gdata/drive_resource_metadata.h"
+#include "chrome/browser/chromeos/drive/drive_resource_metadata.h"
 #include "chrome/browser/google_apis/gdata_errorcode.h"
 
 class FilePath;
@@ -90,4 +90,4 @@ class RemoveOperation {
 }  // namespace file_system
 }  // namespace gdata
 
-#endif  // CHROME_BROWSER_CHROMEOS_GDATA_FILE_SYSTEM_REMOVE_OPERATION_H_
+#endif  // CHROME_BROWSER_CHROMEOS_DRIVE_FILE_SYSTEM_REMOVE_OPERATION_H_
diff --git a/chrome/browser/chromeos/gdata/file_write_helper.cc b/chrome/browser/chromeos/drive/file_write_helper.cc
index b5485c7..3a21a65 100644
--- a/chrome/browser/chromeos/gdata/file_write_helper.cc
+++ b/chrome/browser/chromeos/drive/file_write_helper.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/chromeos/gdata/file_write_helper.h"
+#include "chrome/browser/chromeos/drive/file_write_helper.h"
 
 #include "base/threading/sequenced_worker_pool.h"
 #include "content/public/browser/browser_thread.h"
diff --git a/chrome/browser/chromeos/gdata/file_write_helper.h b/chrome/browser/chromeos/drive/file_write_helper.h
index f5f6618..114fdc9 100644
--- a/chrome/browser/chromeos/gdata/file_write_helper.h
+++ b/chrome/browser/chromeos/drive/file_write_helper.h
@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_CHROMEOS_GDATA_FILE_WRITE_HELPER_H_
-#define CHROME_BROWSER_CHROMEOS_GDATA_FILE_WRITE_HELPER_H_
+#ifndef CHROME_BROWSER_CHROMEOS_DRIVE_FILE_WRITE_HELPER_H_
+#define CHROME_BROWSER_CHROMEOS_DRIVE_FILE_WRITE_HELPER_H_
 
 #include "base/memory/weak_ptr.h"
-#include "chrome/browser/chromeos/gdata/drive_file_system_interface.h"
+#include "chrome/browser/chromeos/drive/drive_file_system_interface.h"
 #include "chrome/browser/google_apis/gdata_errorcode.h"
 
 class FilePath;
@@ -57,4 +57,4 @@ class FileWriteHelper {
 
 }  // namespace gdata
 
-#endif  // CHROME_BROWSER_CHROMEOS_GDATA_FILE_WRITE_HELPER_H_
+#endif  // CHROME_BROWSER_CHROMEOS_DRIVE_FILE_WRITE_HELPER_H_
diff --git a/chrome/browser/chromeos/gdata/file_write_helper_unittest.cc b/chrome/browser/chromeos/drive/file_write_helper_unittest.cc
index 2c22a92..e676da8 100644
--- a/chrome/browser/chromeos/gdata/file_write_helper_unittest.cc
+++ b/chrome/browser/chromeos/drive/file_write_helper_unittest.cc
@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/chromeos/gdata/file_write_helper.h"
+#include "chrome/browser/chromeos/drive/file_write_helper.h"
 
 #include "base/bind.h"
 #include "base/message_loop.h"
 #include "base/threading/thread_restrictions.h"
-#include "chrome/browser/chromeos/gdata/drive_test_util.h"
-#include "chrome/browser/chromeos/gdata/mock_drive_file_system.h"
+#include "chrome/browser/chromeos/drive/drive_test_util.h"
+#include "chrome/browser/chromeos/drive/mock_drive_file_system.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/test/test_browser_thread.h"
 #include "testing/gmock/include/gmock/gmock.h"
diff --git a/chrome/browser/chromeos/gdata/gdata_wapi_feed_loader.cc b/chrome/browser/chromeos/drive/gdata_wapi_feed_loader.cc
index 6d64042..ad2bc93 100644
--- a/chrome/browser/chromeos/gdata/gdata_wapi_feed_loader.cc
+++ b/chrome/browser/chromeos/drive/gdata_wapi_feed_loader.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/chromeos/gdata/gdata_wapi_feed_loader.h"
+#include "chrome/browser/chromeos/drive/gdata_wapi_feed_loader.h"
 
 #include <set>
 
@@ -15,12 +15,12 @@
 #include "base/stringprintf.h"
 #include "base/threading/sequenced_worker_pool.h"
 #include "base/values.h"
-#include "chrome/browser/chromeos/gdata/drive_cache.h"
-#include "chrome/browser/chromeos/gdata/drive_file_system_util.h"
-#include "chrome/browser/chromeos/gdata/drive_service_interface.h"
-#include "chrome/browser/chromeos/gdata/drive_webapps_registry.h"
-#include "chrome/browser/chromeos/gdata/gdata_wapi_feed_loader_observer.h"
-#include "chrome/browser/chromeos/gdata/gdata_wapi_feed_processor.h"
+#include "chrome/browser/chromeos/drive/drive_cache.h"
+#include "chrome/browser/chromeos/drive/drive_file_system_util.h"
+#include "chrome/browser/chromeos/drive/drive_service_interface.h"
+#include "chrome/browser/chromeos/drive/drive_webapps_registry.h"
+#include "chrome/browser/chromeos/drive/gdata_wapi_feed_loader_observer.h"
+#include "chrome/browser/chromeos/drive/gdata_wapi_feed_processor.h"
 #include "chrome/browser/google_apis/drive_api_parser.h"
 #include "chrome/browser/google_apis/gdata_util.h"
 #include "chrome/common/chrome_switches.h"
diff --git a/chrome/browser/chromeos/gdata/gdata_wapi_feed_loader.h b/chrome/browser/chromeos/drive/gdata_wapi_feed_loader.h
index 5a3a651..8e54f5d 100644
--- a/chrome/browser/chromeos/gdata/gdata_wapi_feed_loader.h
+++ b/chrome/browser/chromeos/drive/gdata_wapi_feed_loader.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_CHROMEOS_GDATA_GDATA_WAPI_FEED_LOADER_H_
-#define CHROME_BROWSER_CHROMEOS_GDATA_GDATA_WAPI_FEED_LOADER_H_
+#ifndef CHROME_BROWSER_CHROMEOS_DRIVE_GDATA_WAPI_FEED_LOADER_H_
+#define CHROME_BROWSER_CHROMEOS_DRIVE_GDATA_WAPI_FEED_LOADER_H_
 
 #include <string>
 #include <vector>
@@ -11,7 +11,7 @@
 #include "base/callback.h"
 #include "base/memory/scoped_vector.h"
 #include "base/observer_list.h"
-#include "chrome/browser/chromeos/gdata/drive_resource_metadata.h"
+#include "chrome/browser/chromeos/drive/drive_resource_metadata.h"
 #include "chrome/browser/google_apis/gdata_errorcode.h"
 #include "googleurl/src/gurl.h"
 
@@ -244,4 +244,4 @@ class GDataWapiFeedLoader {
 
 }  // namespace gdata
 
-#endif  // CHROME_BROWSER_CHROMEOS_GDATA_GDATA_WAPI_FEED_LOADER_H_
+#endif  // CHROME_BROWSER_CHROMEOS_DRIVE_GDATA_WAPI_FEED_LOADER_H_
diff --git a/chrome/browser/chromeos/gdata/gdata_wapi_feed_loader_observer.h b/chrome/browser/chromeos/drive/gdata_wapi_feed_loader_observer.h
index a242e81..da0297d 100644
--- a/chrome/browser/chromeos/gdata/gdata_wapi_feed_loader_observer.h
+++ b/chrome/browser/chromeos/drive/gdata_wapi_feed_loader_observer.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_CHROMEOS_GDATA_GDATA_WAPI_FEED_LOADER_OBSERVER_H_
-#define CHROME_BROWSER_CHROMEOS_GDATA_GDATA_WAPI_FEED_LOADER_OBSERVER_H_
+#ifndef CHROME_BROWSER_CHROMEOS_DRIVE_GDATA_WAPI_FEED_LOADER_OBSERVER_H_
+#define CHROME_BROWSER_CHROMEOS_DRIVE_GDATA_WAPI_FEED_LOADER_OBSERVER_H_
 
 #include <string>
 
@@ -36,4 +36,4 @@ class GDataWapiFeedLoaderObserver {
 
 }  // namespace gdata
 
-#endif  // CHROME_BROWSER_CHROMEOS_GDATA_GDATA_WAPI_FEED_LOADER_OBSERVER_H_
+#endif  // CHROME_BROWSER_CHROMEOS_DRIVE_GDATA_WAPI_FEED_LOADER_OBSERVER_H_
diff --git a/chrome/browser/chromeos/gdata/gdata_wapi_feed_processor.cc b/chrome/browser/chromeos/drive/gdata_wapi_feed_processor.cc
index 38216ac..780ec70 100644
--- a/chrome/browser/chromeos/gdata/gdata_wapi_feed_processor.cc
+++ b/chrome/browser/chromeos/drive/gdata_wapi_feed_processor.cc
@@ -5,9 +5,9 @@
 #include <utility>
 
 #include "base/metrics/histogram.h"
-#include "chrome/browser/chromeos/gdata/drive_resource_metadata.h"
-#include "chrome/browser/chromeos/gdata/drive_files.h"
-#include "chrome/browser/chromeos/gdata/gdata_wapi_feed_processor.h"
+#include "chrome/browser/chromeos/drive/drive_files.h"
+#include "chrome/browser/chromeos/drive/drive_resource_metadata.h"
+#include "chrome/browser/chromeos/drive/gdata_wapi_feed_processor.h"
 #include "content/public/browser/browser_thread.h"
 
 using content::BrowserThread;
diff --git a/chrome/browser/chromeos/gdata/gdata_wapi_feed_processor.h b/chrome/browser/chromeos/drive/gdata_wapi_feed_processor.h
index 6d6609f..2218cbc 100644
--- a/chrome/browser/chromeos/gdata/gdata_wapi_feed_processor.h
+++ b/chrome/browser/chromeos/drive/gdata_wapi_feed_processor.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_CHROMEOS_GDATA_GDATA_WAPI_FEED_PROCESSOR_H_
-#define CHROME_BROWSER_CHROMEOS_GDATA_GDATA_WAPI_FEED_PROCESSOR_H_
+#ifndef CHROME_BROWSER_CHROMEOS_DRIVE_GDATA_WAPI_FEED_PROCESSOR_H_
+#define CHROME_BROWSER_CHROMEOS_DRIVE_GDATA_WAPI_FEED_PROCESSOR_H_
 
 #include <map>
 #include <set>
@@ -106,4 +106,4 @@ class GDataWapiFeedProcessor {
 
 }  // namespace gdata
 
-#endif  // CHROME_BROWSER_CHROMEOS_GDATA_GDATA_WAPI_FEED_PROCESSOR_H_
+#endif  // CHROME_BROWSER_CHROMEOS_DRIVE_GDATA_WAPI_FEED_PROCESSOR_H_
diff --git a/chrome/browser/chromeos/gdata/gdata_wapi_service.cc b/chrome/browser/chromeos/drive/gdata_wapi_service.cc
index fb63bd1..445798f 100644
--- a/chrome/browser/chromeos/gdata/gdata_wapi_service.cc
+++ b/chrome/browser/chromeos/drive/gdata_wapi_service.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/chromeos/gdata/gdata_wapi_service.h"
+#include "chrome/browser/chromeos/drive/gdata_wapi_service.h"
 
 #include <string>
 #include <vector>
diff --git a/chrome/browser/chromeos/gdata/gdata_wapi_service.h b/chrome/browser/chromeos/drive/gdata_wapi_service.h
index a0defe1..7064b78 100644
--- a/chrome/browser/chromeos/gdata/gdata_wapi_service.h
+++ b/chrome/browser/chromeos/drive/gdata_wapi_service.h
@@ -2,15 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_CHROMEOS_GDATA_GDATA_WAPI_SERVICE_H_
-#define CHROME_BROWSER_CHROMEOS_GDATA_GDATA_WAPI_SERVICE_H_
+#ifndef CHROME_BROWSER_CHROMEOS_DRIVE_GDATA_WAPI_SERVICE_H_
+#define CHROME_BROWSER_CHROMEOS_DRIVE_GDATA_WAPI_SERVICE_H_
 
 #include <string>
 
 #include "base/observer_list.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
-#include "chrome/browser/chromeos/gdata/drive_service_interface.h"
+#include "chrome/browser/chromeos/drive/drive_service_interface.h"
 #include "chrome/browser/google_apis/auth_service_observer.h"
 #include "chrome/browser/google_apis/gdata_operations.h"
 
@@ -119,4 +119,4 @@ class GDataWapiService : public DriveServiceInterface,
 
 }  // namespace gdata
 
-#endif  // CHROME_BROWSER_CHROMEOS_GDATA_GDATA_WAPI_SERVICE_H_
+#endif  // CHROME_BROWSER_CHROMEOS_DRIVE_GDATA_WAPI_SERVICE_H_
diff --git a/chrome/browser/chromeos/gdata/gdata_wapi_service_browsertest.cc b/chrome/browser/chromeos/drive/gdata_wapi_service_browsertest.cc
index 3b6b0d9..9b81341 100644
--- a/chrome/browser/chromeos/gdata/gdata_wapi_service_browsertest.cc
+++ b/chrome/browser/chromeos/drive/gdata_wapi_service_browsertest.cc
@@ -7,7 +7,7 @@
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/json/json_reader.h"
-#include "chrome/browser/chromeos/gdata/gdata_wapi_service.h"
+#include "chrome/browser/chromeos/drive/gdata_wapi_service.h"
 #include "chrome/browser/google_apis/auth_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
diff --git a/chrome/browser/chromeos/gdata/mock_directory_change_observer.cc b/chrome/browser/chromeos/drive/mock_directory_change_observer.cc
index d968d40..21d96b6 100644
--- a/chrome/browser/chromeos/gdata/mock_directory_change_observer.cc
+++ b/chrome/browser/chromeos/drive/mock_directory_change_observer.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/chromeos/gdata/mock_directory_change_observer.h"
+#include "chrome/browser/chromeos/drive/mock_directory_change_observer.h"
 
 namespace gdata {
 
diff --git a/chrome/browser/chromeos/gdata/mock_directory_change_observer.h b/chrome/browser/chromeos/drive/mock_directory_change_observer.h
index b3a01e0..38e361c 100644
--- a/chrome/browser/chromeos/gdata/mock_directory_change_observer.h
+++ b/chrome/browser/chromeos/drive/mock_directory_change_observer.h
@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_CHROMEOS_GDATA_MOCK_DIRECTORY_CHANGE_OBSERVER_H_
-#define CHROME_BROWSER_CHROMEOS_GDATA_MOCK_DIRECTORY_CHANGE_OBSERVER_H_
+#ifndef CHROME_BROWSER_CHROMEOS_DRIVE_MOCK_DIRECTORY_CHANGE_OBSERVER_H_
+#define CHROME_BROWSER_CHROMEOS_DRIVE_MOCK_DIRECTORY_CHANGE_OBSERVER_H_
 
 #include "base/file_path.h"
-#include "chrome/browser/chromeos/gdata/drive_file_system_observer.h"
+#include "chrome/browser/chromeos/drive/drive_file_system_observer.h"
 #include "testing/gmock/include/gmock/gmock.h"
 
 namespace gdata {
@@ -23,4 +23,4 @@ class MockDirectoryChangeObserver : public DriveFileSystemObserver {
 
 }  // namespace gdata
 
-#endif  // CHROME_BROWSER_CHROMEOS_GDATA_MOCK_DIRECTORY_CHANGE_OBSERVER_H_
+#endif  // CHROME_BROWSER_CHROMEOS_DRIVE_MOCK_DIRECTORY_CHANGE_OBSERVER_H_
diff --git a/chrome/browser/chromeos/gdata/mock_drive_cache_observer.cc b/chrome/browser/chromeos/drive/mock_drive_cache_observer.cc
index d25cc2f..5c31339 100644
--- a/chrome/browser/chromeos/gdata/mock_drive_cache_observer.cc
+++ b/chrome/browser/chromeos/drive/mock_drive_cache_observer.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/chromeos/gdata/mock_drive_cache_observer.h"
+#include "chrome/browser/chromeos/drive/mock_drive_cache_observer.h"
 
 namespace gdata {
 
diff --git a/chrome/browser/chromeos/gdata/mock_drive_cache_observer.h b/chrome/browser/chromeos/drive/mock_drive_cache_observer.h
index c02ea90..67eca6b 100644
--- a/chrome/browser/chromeos/gdata/mock_drive_cache_observer.h
+++ b/chrome/browser/chromeos/drive/mock_drive_cache_observer.h
@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_CHROMEOS_GDATA_MOCK_DRIVE_CACHE_OBSERVER_H_
-#define CHROME_BROWSER_CHROMEOS_GDATA_MOCK_DRIVE_CACHE_OBSERVER_H_
+#ifndef CHROME_BROWSER_CHROMEOS_DRIVE_MOCK_DRIVE_CACHE_OBSERVER_H_
+#define CHROME_BROWSER_CHROMEOS_DRIVE_MOCK_DRIVE_CACHE_OBSERVER_H_
 
 #include <string>
 
-#include "chrome/browser/chromeos/gdata/drive_cache_observer.h"
+#include "chrome/browser/chromeos/drive/drive_cache_observer.h"
 #include "testing/gmock/include/gmock/gmock.h"
 
 namespace gdata {
@@ -27,4 +27,4 @@ class MockDriveCacheObserver : public DriveCacheObserver {
 
 }  // namespace gdata
 
-#endif  // CHROME_BROWSER_CHROMEOS_GDATA_MOCK_DRIVE_CACHE_OBSERVER_H_
+#endif  // CHROME_BROWSER_CHROMEOS_DRIVE_MOCK_DRIVE_CACHE_OBSERVER_H_
diff --git a/chrome/browser/chromeos/gdata/mock_drive_file_system.cc b/chrome/browser/chromeos/drive/mock_drive_file_system.cc
index cd7da1d..9c0070b 100644
--- a/chrome/browser/chromeos/gdata/mock_drive_file_system.cc
+++ b/chrome/browser/chromeos/drive/mock_drive_file_system.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/chromeos/gdata/mock_drive_file_system.h"
+#include "chrome/browser/chromeos/drive/mock_drive_file_system.h"
 
 namespace gdata {
 
diff --git a/chrome/browser/chromeos/gdata/mock_drive_file_system.h b/chrome/browser/chromeos/drive/mock_drive_file_system.h
index 8a34c74..d89ba60 100644
--- a/chrome/browser/chromeos/gdata/mock_drive_file_system.h
+++ b/chrome/browser/chromeos/drive/mock_drive_file_system.h
@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_CHROMEOS_GDATA_MOCK_DRIVE_FILE_SYSTEM_H_
-#define CHROME_BROWSER_CHROMEOS_GDATA_MOCK_DRIVE_FILE_SYSTEM_H_
+#ifndef CHROME_BROWSER_CHROMEOS_DRIVE_MOCK_DRIVE_FILE_SYSTEM_H_
+#define CHROME_BROWSER_CHROMEOS_DRIVE_MOCK_DRIVE_FILE_SYSTEM_H_
 
 #include <string>
 
-#include "chrome/browser/chromeos/gdata/drive_file_system_interface.h"
+#include "chrome/browser/chromeos/drive/drive_file_system_interface.h"
 #include "testing/gmock/include/gmock/gmock.h"
 
 namespace gdata {
@@ -104,4 +104,4 @@ class MockDriveFileSystem : public DriveFileSystemInterface {
 
 }  // namespace gdata
 
-#endif  // CHROME_BROWSER_CHROMEOS_GDATA_MOCK_DRIVE_FILE_SYSTEM_H_
+#endif  // CHROME_BROWSER_CHROMEOS_DRIVE_MOCK_DRIVE_FILE_SYSTEM_H_
diff --git a/chrome/browser/chromeos/gdata/mock_drive_service.cc b/chrome/browser/chromeos/drive/mock_drive_service.cc
index 822d229..164d11f 100644
--- a/chrome/browser/chromeos/gdata/mock_drive_service.cc
+++ b/chrome/browser/chromeos/drive/mock_drive_service.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/chromeos/gdata/mock_drive_service.h"
+#include "chrome/browser/chromeos/drive/mock_drive_service.h"
 
 #include "base/bind.h"
 #include "base/file_path.h"
@@ -12,7 +12,7 @@
 #include "base/message_loop_proxy.h"
 #include "base/path_service.h"
 #include "base/platform_file.h"
-#include "chrome/browser/chromeos/gdata/drive_test_util.h"
+#include "chrome/browser/chromeos/drive/drive_test_util.h"
 #include "chrome/common/chrome_paths.h"
 #include "testing/gmock/include/gmock/gmock.h"
 
diff --git a/chrome/browser/chromeos/gdata/mock_drive_service.h b/chrome/browser/chromeos/drive/mock_drive_service.h
index cfd7129a..5265c21 100644
--- a/chrome/browser/chromeos/gdata/mock_drive_service.h
+++ b/chrome/browser/chromeos/drive/mock_drive_service.h
@@ -4,13 +4,13 @@
 
 // This file contains mocks for classes in drive_service_interface.h
 
-#ifndef CHROME_BROWSER_CHROMEOS_GDATA_MOCK_DRIVE_SERVICE_H_
-#define CHROME_BROWSER_CHROMEOS_GDATA_MOCK_DRIVE_SERVICE_H_
+#ifndef CHROME_BROWSER_CHROMEOS_DRIVE_MOCK_DRIVE_SERVICE_H_
+#define CHROME_BROWSER_CHROMEOS_DRIVE_MOCK_DRIVE_SERVICE_H_
 
 #include <string>
 
 #include "base/memory/scoped_ptr.h"
-#include "chrome/browser/chromeos/gdata/drive_service_interface.h"
+#include "chrome/browser/chromeos/drive/drive_service_interface.h"
 #include "testing/gmock/include/gmock/gmock.h"
 
 class FilePath;
@@ -195,4 +195,4 @@ class MockDriveService : public DriveServiceInterface {
 
 }  // namespace gdata
 
-#endif  // CHROME_BROWSER_CHROMEOS_GDATA_MOCK_DRIVE_SERVICE_H_
+#endif  // CHROME_BROWSER_CHROMEOS_DRIVE_MOCK_DRIVE_SERVICE_H_
diff --git a/chrome/browser/chromeos/gdata/mock_drive_uploader.cc b/chrome/browser/chromeos/drive/mock_drive_uploader.cc
index f2d0ad0..c4e523b 100644
--- a/chrome/browser/chromeos/gdata/mock_drive_uploader.cc
+++ b/chrome/browser/chromeos/drive/mock_drive_uploader.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/chromeos/gdata/mock_drive_uploader.h"
+#include "chrome/browser/chromeos/drive/mock_drive_uploader.h"
 
 namespace gdata {
 
diff --git a/chrome/browser/chromeos/gdata/mock_drive_uploader.h b/chrome/browser/chromeos/drive/mock_drive_uploader.h
index ba8dd71..4ffe9f4 100644
--- a/chrome/browser/chromeos/gdata/mock_drive_uploader.h
+++ b/chrome/browser/chromeos/drive/mock_drive_uploader.h
@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_CHROMEOS_GDATA_MOCK_DRIVE_UPLOADER_H_
-#define CHROME_BROWSER_CHROMEOS_GDATA_MOCK_DRIVE_UPLOADER_H_
+#ifndef CHROME_BROWSER_CHROMEOS_DRIVE_MOCK_DRIVE_UPLOADER_H_
+#define CHROME_BROWSER_CHROMEOS_DRIVE_MOCK_DRIVE_UPLOADER_H_
 
 #include "base/memory/scoped_ptr.h"
-#include "chrome/browser/chromeos/gdata/drive_uploader.h"
+#include "chrome/browser/chromeos/drive/drive_uploader.h"
 #include "testing/gmock/include/gmock/gmock.h"
 
 namespace gdata {
@@ -50,4 +50,4 @@ class MockDriveUploader : public DriveUploaderInterface {
 
 }  // namespace gdata
 
-#endif  // CHROME_BROWSER_CHROMEOS_GDATA_MOCK_DRIVE_UPLOADER_H_
+#endif  // CHROME_BROWSER_CHROMEOS_DRIVE_MOCK_DRIVE_UPLOADER_H_
diff --git a/chrome/browser/chromeos/gdata/mock_drive_web_apps_registry.cc b/chrome/browser/chromeos/drive/mock_drive_web_apps_registry.cc
index 2710616..a121bb8 100644
--- a/chrome/browser/chromeos/gdata/mock_drive_web_apps_registry.cc
+++ b/chrome/browser/chromeos/drive/mock_drive_web_apps_registry.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/chromeos/gdata/mock_drive_web_apps_registry.h"
+#include "chrome/browser/chromeos/drive/mock_drive_web_apps_registry.h"
 
 namespace gdata {
 
diff --git a/chrome/browser/chromeos/gdata/mock_drive_web_apps_registry.h b/chrome/browser/chromeos/drive/mock_drive_web_apps_registry.h
index ae896dd..6797924 100644
--- a/chrome/browser/chromeos/gdata/mock_drive_web_apps_registry.h
+++ b/chrome/browser/chromeos/drive/mock_drive_web_apps_registry.h
@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_CHROMEOS_GDATA_MOCK_DRIVE_WEB_APPS_REGISTRY_H_
-#define CHROME_BROWSER_CHROMEOS_GDATA_MOCK_DRIVE_WEB_APPS_REGISTRY_H_
+#ifndef CHROME_BROWSER_CHROMEOS_DRIVE_MOCK_DRIVE_WEB_APPS_REGISTRY_H_
+#define CHROME_BROWSER_CHROMEOS_DRIVE_MOCK_DRIVE_WEB_APPS_REGISTRY_H_
 
-#include "chrome/browser/chromeos/gdata/drive_file_system.h"
-#include "chrome/browser/chromeos/gdata/drive_webapps_registry.h"
+#include "chrome/browser/chromeos/drive/drive_file_system.h"
+#include "chrome/browser/chromeos/drive/drive_webapps_registry.h"
 #include "chrome/browser/google_apis/drive_api_parser.h"
 #include "testing/gmock/include/gmock/gmock.h"
 
@@ -28,4 +28,4 @@ class MockDriveWebAppsRegistry : public DriveWebAppsRegistryInterface {
 
 }  // namespace gdata
 
-#endif  // CHROME_BROWSER_CHROMEOS_GDATA_MOCK_DRIVE_WEB_APPS_REGISTRY_H_
+#endif  // CHROME_BROWSER_CHROMEOS_DRIVE_MOCK_DRIVE_WEB_APPS_REGISTRY_H_
diff --git a/chrome/browser/chromeos/gdata/mock_free_disk_space_getter.cc b/chrome/browser/chromeos/drive/mock_free_disk_space_getter.cc
index 74701c5..83f171e 100644
--- a/chrome/browser/chromeos/gdata/mock_free_disk_space_getter.cc
+++ b/chrome/browser/chromeos/drive/mock_free_disk_space_getter.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/chromeos/gdata/mock_free_disk_space_getter.h"
+#include "chrome/browser/chromeos/drive/mock_free_disk_space_getter.h"
 
 namespace gdata {
 
diff --git a/chrome/browser/chromeos/gdata/mock_free_disk_space_getter.h b/chrome/browser/chromeos/drive/mock_free_disk_space_getter.h
index fd1fb92..016c90f 100644
--- a/chrome/browser/chromeos/gdata/mock_free_disk_space_getter.h
+++ b/chrome/browser/chromeos/drive/mock_free_disk_space_getter.h
@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_CHROMEOS_GDATA_MOCK_FREE_DISK_SPACE_GETTER_H_
-#define CHROME_BROWSER_CHROMEOS_GDATA_MOCK_FREE_DISK_SPACE_GETTER_H_
+#ifndef CHROME_BROWSER_CHROMEOS_DRIVE_MOCK_FREE_DISK_SPACE_GETTER_H_
+#define CHROME_BROWSER_CHROMEOS_DRIVE_MOCK_FREE_DISK_SPACE_GETTER_H_
 
-#include "chrome/browser/chromeos/gdata/drive_cache.h"
+#include "chrome/browser/chromeos/drive/drive_cache.h"
 #include "testing/gmock/include/gmock/gmock.h"
 
 namespace gdata {
@@ -19,4 +19,4 @@ class MockFreeDiskSpaceGetter : public FreeDiskSpaceGetterInterface {
 
 }  // namespace gdata
 
-#endif  // CHROME_BROWSER_CHROMEOS_GDATA_MOCK_FREE_DISK_SPACE_GETTER_H_
+#endif  // CHROME_BROWSER_CHROMEOS_DRIVE_MOCK_FREE_DISK_SPACE_GETTER_H_
diff --git a/chrome/browser/chromeos/gdata/stale_cache_files_remover.cc b/chrome/browser/chromeos/drive/stale_cache_files_remover.cc
index 8d61caf..aedf7b6 100644
--- a/chrome/browser/chromeos/gdata/stale_cache_files_remover.cc
+++ b/chrome/browser/chromeos/drive/stale_cache_files_remover.cc
@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/chromeos/gdata/stale_cache_files_remover.h"
+#include "chrome/browser/chromeos/drive/stale_cache_files_remover.h"
 
 #include "base/bind.h"
 #include "base/message_loop.h"
-#include "chrome/browser/chromeos/gdata/drive_cache.h"
-#include "chrome/browser/chromeos/gdata/drive.pb.h"
-#include "chrome/browser/chromeos/gdata/drive_file_system.h"
+#include "chrome/browser/chromeos/drive/drive_cache.h"
+#include "chrome/browser/chromeos/drive/drive.pb.h"
+#include "chrome/browser/chromeos/drive/drive_file_system.h"
 #include "content/public/browser/browser_thread.h"
 
 using content::BrowserThread;
diff --git a/chrome/browser/chromeos/gdata/stale_cache_files_remover.h b/chrome/browser/chromeos/drive/stale_cache_files_remover.h
index 23c69da..a91ef0b 100644
--- a/chrome/browser/chromeos/gdata/stale_cache_files_remover.h
+++ b/chrome/browser/chromeos/drive/stale_cache_files_remover.h
@@ -2,16 +2,16 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_CHROMEOS_GDATA_STALE_CACHE_FILES_REMOVER_H_
-#define CHROME_BROWSER_CHROMEOS_GDATA_STALE_CACHE_FILES_REMOVER_H_
+#ifndef CHROME_BROWSER_CHROMEOS_DRIVE_STALE_CACHE_FILES_REMOVER_H_
+#define CHROME_BROWSER_CHROMEOS_DRIVE_STALE_CACHE_FILES_REMOVER_H_
 
 #include <string>
 #include <vector>
 
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
-#include "chrome/browser/chromeos/gdata/drive.pb.h"
-#include "chrome/browser/chromeos/gdata/drive_file_system_observer.h"
+#include "chrome/browser/chromeos/drive/drive.pb.h"
+#include "chrome/browser/chromeos/drive/drive_file_system_observer.h"
 #include "chrome/browser/google_apis/gdata_errorcode.h"
 
 namespace gdata{
@@ -66,4 +66,4 @@ class StaleCacheFilesRemover : public DriveFileSystemObserver {
 
 }  // namespace gdata
 
-#endif  // CHROME_BROWSER_CHROMEOS_GDATA_STALE_CACHE_FILES_REMOVER_H_
+#endif  // CHROME_BROWSER_CHROMEOS_DRIVE_STALE_CACHE_FILES_REMOVER_H_
diff --git a/chrome/browser/chromeos/gdata/stale_cache_files_remover_unittest.cc b/chrome/browser/chromeos/drive/stale_cache_files_remover_unittest.cc
index e94af7d..2c712da 100644
--- a/chrome/browser/chromeos/gdata/stale_cache_files_remover_unittest.cc
+++ b/chrome/browser/chromeos/drive/stale_cache_files_remover_unittest.cc
@@ -13,18 +13,18 @@
 #include "base/stringprintf.h"
 #include "base/threading/sequenced_worker_pool.h"
 #include "base/values.h"
-#include "chrome/browser/chromeos/gdata/drive.pb.h"
-#include "chrome/browser/chromeos/gdata/drive_file_system.h"
-#include "chrome/browser/chromeos/gdata/drive_test_util.h"
-#include "chrome/browser/chromeos/gdata/drive_uploader.h"
-#include "chrome/browser/chromeos/gdata/drive_webapps_registry.h"
-#include "chrome/browser/chromeos/gdata/mock_directory_change_observer.h"
-#include "chrome/browser/chromeos/gdata/mock_drive_cache_observer.h"
-#include "chrome/browser/chromeos/gdata/mock_drive_service.h"
-#include "chrome/browser/chromeos/gdata/mock_drive_uploader.h"
-#include "chrome/browser/chromeos/gdata/mock_drive_web_apps_registry.h"
-#include "chrome/browser/chromeos/gdata/mock_free_disk_space_getter.h"
-#include "chrome/browser/chromeos/gdata/stale_cache_files_remover.h"
+#include "chrome/browser/chromeos/drive/drive.pb.h"
+#include "chrome/browser/chromeos/drive/drive_file_system.h"
+#include "chrome/browser/chromeos/drive/drive_test_util.h"
+#include "chrome/browser/chromeos/drive/drive_uploader.h"
+#include "chrome/browser/chromeos/drive/drive_webapps_registry.h"
+#include "chrome/browser/chromeos/drive/mock_directory_change_observer.h"
+#include "chrome/browser/chromeos/drive/mock_drive_cache_observer.h"
+#include "chrome/browser/chromeos/drive/mock_drive_service.h"
+#include "chrome/browser/chromeos/drive/mock_drive_uploader.h"
+#include "chrome/browser/chromeos/drive/mock_drive_web_apps_registry.h"
+#include "chrome/browser/chromeos/drive/mock_free_disk_space_getter.h"
+#include "chrome/browser/chromeos/drive/stale_cache_files_remover.h"
 #include "chrome/browser/google_apis/drive_api_parser.h"
 #include "chrome/browser/google_apis/gdata_util.h"
 #include "chrome/test/base/testing_profile.h"
diff --git a/chrome/browser/chromeos/extensions/external_filesystem_apitest.cc b/chrome/browser/chromeos/extensions/external_filesystem_apitest.cc
index b4379a8..640fc1b 100644
--- a/chrome/browser/chromeos/extensions/external_filesystem_apitest.cc
+++ b/chrome/browser/chromeos/extensions/external_filesystem_apitest.cc
@@ -12,9 +12,9 @@
 #include "base/scoped_temp_dir.h"
 #include "base/threading/worker_pool.h"
 #include "base/values.h"
-#include "chrome/browser/chromeos/gdata/drive_file_system.h"
-#include "chrome/browser/chromeos/gdata/drive_system_service.h"
-#include "chrome/browser/chromeos/gdata/mock_drive_service.h"
+#include "chrome/browser/chromeos/drive/drive_file_system.h"
+#include "chrome/browser/chromeos/drive/drive_system_service.h"
+#include "chrome/browser/chromeos/drive/mock_drive_service.h"
 #include "chrome/browser/extensions/event_router.h"
 #include "chrome/browser/extensions/extension_apitest.h"
 #include "chrome/browser/extensions/extension_test_message_listener.h"
diff --git a/chrome/browser/chromeos/extensions/file_browser_event_router.cc b/chrome/browser/chromeos/extensions/file_browser_event_router.cc
index 50c61e8..4e7bd4f 100644
--- a/chrome/browser/chromeos/extensions/file_browser_event_router.cc
+++ b/chrome/browser/chromeos/extensions/file_browser_event_router.cc
@@ -11,12 +11,12 @@
 #include "base/values.h"
 #include "chrome/browser/api/prefs/pref_change_registrar.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"
+#include "chrome/browser/chromeos/drive/drive_file_system_interface.h"
+#include "chrome/browser/chromeos/drive/drive_file_system_util.h"
+#include "chrome/browser/chromeos/drive/drive_service_interface.h"
+#include "chrome/browser/chromeos/drive/drive_system_service.h"
 #include "chrome/browser/chromeos/extensions/file_browser_notifications.h"
 #include "chrome/browser/chromeos/extensions/file_manager_util.h"
-#include "chrome/browser/chromeos/gdata/drive_file_system_interface.h"
-#include "chrome/browser/chromeos/gdata/drive_file_system_util.h"
-#include "chrome/browser/chromeos/gdata/drive_service_interface.h"
-#include "chrome/browser/chromeos/gdata/drive_system_service.h"
 #include "chrome/browser/chromeos/login/base_login_display_host.h"
 #include "chrome/browser/chromeos/login/screen_locker.h"
 #include "chrome/browser/chromeos/login/user_manager.h"
diff --git a/chrome/browser/chromeos/extensions/file_browser_event_router.h b/chrome/browser/chromeos/extensions/file_browser_event_router.h
index fff3808..4273484 100644
--- a/chrome/browser/chromeos/extensions/file_browser_event_router.h
+++ b/chrome/browser/chromeos/extensions/file_browser_event_router.h
@@ -15,9 +15,9 @@
 #include "base/string16.h"
 #include "base/synchronization/lock.h"
 #include "chrome/browser/chromeos/cros/network_library.h"
-#include "chrome/browser/chromeos/gdata/drive_file_system_observer.h"
-#include "chrome/browser/chromeos/gdata/drive_resource_metadata.h"
-#include "chrome/browser/chromeos/gdata/drive_service_interface.h"
+#include "chrome/browser/chromeos/drive/drive_file_system_observer.h"
+#include "chrome/browser/chromeos/drive/drive_resource_metadata.h"
+#include "chrome/browser/chromeos/drive/drive_service_interface.h"
 #include "chrome/browser/google_apis/operation_registry.h"
 #include "chrome/browser/profiles/refcounted_profile_keyed_service.h"
 #include "chrome/browser/profiles/refcounted_profile_keyed_service_factory.h"
diff --git a/chrome/browser/chromeos/extensions/file_browser_handler_api.cc b/chrome/browser/chromeos/extensions/file_browser_handler_api.cc
index 9814bb6..dd301f7 100644
--- a/chrome/browser/chromeos/extensions/file_browser_handler_api.cc
+++ b/chrome/browser/chromeos/extensions/file_browser_handler_api.cc
@@ -40,9 +40,9 @@
 #include "base/message_loop_proxy.h"
 #include "base/platform_file.h"
 #include "base/values.h"
+#include "chrome/browser/chromeos/drive/drive_file_system_util.h"
 #include "chrome/browser/chromeos/extensions/file_handler_util.h"
 #include "chrome/browser/chromeos/extensions/file_manager_util.h"
-#include "chrome/browser/chromeos/gdata/drive_file_system_util.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_tabstrip.h"
@@ -56,9 +56,9 @@
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/storage_partition.h"
 #include "googleurl/src/gurl.h"
+#include "ui/base/dialogs/select_file_dialog.h"
 #include "webkit/fileapi/file_system_context.h"
 #include "webkit/fileapi/file_system_mount_point_provider.h"
-#include "ui/base/dialogs/select_file_dialog.h"
 
 using content::BrowserContext;
 using content::BrowserThread;
diff --git a/chrome/browser/chromeos/extensions/file_browser_private_api.cc b/chrome/browser/chromeos/extensions/file_browser_private_api.cc
index 9a0bfe0..1e5e6c7 100644
--- a/chrome/browser/chromeos/extensions/file_browser_private_api.cc
+++ b/chrome/browser/chromeos/extensions/file_browser_private_api.cc
@@ -23,23 +23,23 @@
 #include "base/values.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"
 #include "chrome/browser/chromeos/cros/network_library.h"
+#include "chrome/browser/chromeos/drive/drive.pb.h"
+#include "chrome/browser/chromeos/drive/drive_file_system_interface.h"
+#include "chrome/browser/chromeos/drive/drive_file_system_util.h"
+#include "chrome/browser/chromeos/drive/drive_service_interface.h"
+#include "chrome/browser/chromeos/drive/drive_system_service.h"
+#include "chrome/browser/chromeos/drive/drive_webapps_registry.h"
 #include "chrome/browser/chromeos/extensions/file_handler_util.h"
 #include "chrome/browser/chromeos/extensions/file_manager_util.h"
-#include "chrome/browser/chromeos/gdata/drive.pb.h"
-#include "chrome/browser/chromeos/gdata/drive_file_system_interface.h"
-#include "chrome/browser/chromeos/gdata/drive_file_system_util.h"
-#include "chrome/browser/chromeos/gdata/drive_service_interface.h"
-#include "chrome/browser/chromeos/gdata/drive_system_service.h"
-#include "chrome/browser/chromeos/gdata/drive_webapps_registry.h"
 #include "chrome/browser/chromeos/system/statistics_provider.h"
 #include "chrome/browser/extensions/extension_function_dispatcher.h"
 #include "chrome/browser/extensions/extension_process_manager.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_tab_util.h"
 #include "chrome/browser/extensions/process_map.h"
-#include "chrome/browser/google_apis/operation_registry.h"
 #include "chrome/browser/google_apis/gdata_util.h"
 #include "chrome/browser/google_apis/gdata_wapi_parser.h"
+#include "chrome/browser/google_apis/operation_registry.h"
 #include "chrome/browser/intents/web_intents_util.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
diff --git a/chrome/browser/chromeos/extensions/file_browser_private_api.h b/chrome/browser/chromeos/extensions/file_browser_private_api.h
index d08326e..e1dd642 100644
--- a/chrome/browser/chromeos/extensions/file_browser_private_api.h
+++ b/chrome/browser/chromeos/extensions/file_browser_private_api.h
@@ -6,15 +6,15 @@
 #define CHROME_BROWSER_CHROMEOS_EXTENSIONS_FILE_BROWSER_PRIVATE_API_H_
 
 #include <map>
-#include <string>
 #include <queue>
+#include <string>
 #include <vector>
 
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/platform_file.h"
+#include "chrome/browser/chromeos/drive/drive_cache.h"
 #include "chrome/browser/chromeos/extensions/file_browser_event_router.h"
-#include "chrome/browser/chromeos/gdata/drive_cache.h"
 #include "chrome/browser/extensions/extension_function.h"
 #include "chrome/browser/google_apis/gdata_errorcode.h"
 #include "chrome/browser/prefs/pref_service.h"
diff --git a/chrome/browser/chromeos/extensions/file_handler_util.cc b/chrome/browser/chromeos/extensions/file_handler_util.cc
index 599e376..48fd8cb 100644
--- a/chrome/browser/chromeos/extensions/file_handler_util.cc
+++ b/chrome/browser/chromeos/extensions/file_handler_util.cc
@@ -11,9 +11,9 @@
 #include "base/string_util.h"
 #include "base/stringprintf.h"
 #include "base/utf_string_conversions.h"
+#include "chrome/browser/chromeos/drive/drive_file_system_util.h"
+#include "chrome/browser/chromeos/drive/drive_task_executor.h"
 #include "chrome/browser/chromeos/extensions/file_manager_util.h"
-#include "chrome/browser/chromeos/gdata/drive_file_system_util.h"
-#include "chrome/browser/chromeos/gdata/drive_task_executor.h"
 #include "chrome/browser/extensions/event_router.h"
 #include "chrome/browser/extensions/extension_host.h"
 #include "chrome/browser/extensions/extension_service.h"
diff --git a/chrome/browser/chromeos/extensions/file_manager_util.cc b/chrome/browser/chromeos/extensions/file_manager_util.cc
index d444856..b0b09f3 100644
--- a/chrome/browser/chromeos/extensions/file_manager_util.cc
+++ b/chrome/browser/chromeos/extensions/file_manager_util.cc
@@ -13,12 +13,12 @@
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
+#include "chrome/browser/chromeos/drive/drive.pb.h"
+#include "chrome/browser/chromeos/drive/drive_file_system.h"
+#include "chrome/browser/chromeos/drive/drive_file_system_util.h"
+#include "chrome/browser/chromeos/drive/drive_files.h"
+#include "chrome/browser/chromeos/drive/drive_system_service.h"
 #include "chrome/browser/chromeos/extensions/file_handler_util.h"
-#include "chrome/browser/chromeos/gdata/drive.pb.h"
-#include "chrome/browser/chromeos/gdata/drive_file_system.h"
-#include "chrome/browser/chromeos/gdata/drive_file_system_util.h"
-#include "chrome/browser/chromeos/gdata/drive_files.h"
-#include "chrome/browser/chromeos/gdata/drive_system_service.h"
 #include "chrome/browser/chromeos/media/media_player.h"
 #include "chrome/browser/extensions/crx_installer.h"
 #include "chrome/browser/extensions/extension_install_prompt.h"
diff --git a/chrome/browser/chromeos/extensions/file_manager_util.h b/chrome/browser/chromeos/extensions/file_manager_util.h
index edec36d..77ed95c 100644
--- a/chrome/browser/chromeos/extensions/file_manager_util.h
+++ b/chrome/browser/chromeos/extensions/file_manager_util.h
@@ -9,7 +9,7 @@
 #include <vector>
 
 #include "base/file_path.h"
-#include "chrome/browser/chromeos/gdata/drive_service_interface.h"
+#include "chrome/browser/chromeos/drive/drive_service_interface.h"
 #include "googleurl/src/gurl.h"
 #include "ui/base/dialogs/select_file_dialog.h"
 
diff --git a/chrome/browser/chromeos/preferences.cc b/chrome/browser/chromeos/preferences.cc
index b10f567..66c5989 100644
--- a/chrome/browser/chromeos/preferences.cc
+++ b/chrome/browser/chromeos/preferences.cc
@@ -14,7 +14,7 @@
 #include "chrome/browser/api/prefs/pref_member.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chromeos/display/display_preferences.h"
-#include "chrome/browser/chromeos/gdata/drive_file_system_util.h"
+#include "chrome/browser/chromeos/drive/drive_file_system_util.h"
 #include "chrome/browser/chromeos/input_method/input_method_manager.h"
 #include "chrome/browser/chromeos/input_method/input_method_util.h"
 #include "chrome/browser/chromeos/input_method/xkeyboard.h"
diff --git a/chrome/browser/chromeos/system/ash_system_tray_delegate.cc b/chrome/browser/chromeos/system/ash_system_tray_delegate.cc
index 7e2560c..a73abff 100644
--- a/chrome/browser/chromeos/system/ash_system_tray_delegate.cc
+++ b/chrome/browser/chromeos/system/ash_system_tray_delegate.cc
@@ -36,8 +36,8 @@
 #include "chrome/browser/chromeos/bluetooth/bluetooth_device.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"
 #include "chrome/browser/chromeos/cros/network_library.h"
-#include "chrome/browser/chromeos/gdata/drive_service_interface.h"
-#include "chrome/browser/chromeos/gdata/drive_system_service.h"
+#include "chrome/browser/chromeos/drive/drive_service_interface.h"
+#include "chrome/browser/chromeos/drive/drive_system_service.h"
 #include "chrome/browser/chromeos/input_method/input_method_manager.h"
 #include "chrome/browser/chromeos/input_method/input_method_util.h"
 #include "chrome/browser/chromeos/input_method/xkeyboard.h"
diff --git a/chrome/browser/download/chrome_download_manager_delegate.cc b/chrome/browser/download/chrome_download_manager_delegate.cc
index 1da347f..03ee2cc 100644
--- a/chrome/browser/download/chrome_download_manager_delegate.cc
+++ b/chrome/browser/download/chrome_download_manager_delegate.cc
@@ -56,8 +56,8 @@
 #endif
 
 #if defined(OS_CHROMEOS)
-#include "chrome/browser/chromeos/gdata/drive_download_observer.h"
-#include "chrome/browser/chromeos/gdata/drive_file_system_util.h"
+#include "chrome/browser/chromeos/drive/drive_download_observer.h"
+#include "chrome/browser/chromeos/drive/drive_file_system_util.h"
 #include "chrome/browser/download/download_file_picker_chromeos.h"
 #include "chrome/browser/download/save_package_file_picker_chromeos.h"
 #endif
diff --git a/chrome/browser/download/download_file_picker_chromeos.cc b/chrome/browser/download/download_file_picker_chromeos.cc
index dc3103e..4a94cf1 100644
--- a/chrome/browser/download/download_file_picker_chromeos.cc
+++ b/chrome/browser/download/download_file_picker_chromeos.cc
@@ -6,8 +6,8 @@
 
 #include "base/bind.h"
 #include "base/i18n/file_util_icu.h"
-#include "chrome/browser/chromeos/gdata/drive_download_observer.h"
-#include "chrome/browser/chromeos/gdata/drive_file_system_util.h"
+#include "chrome/browser/chromeos/drive/drive_download_observer.h"
+#include "chrome/browser/chromeos/drive/drive_file_system_util.h"
 #include "content/public/browser/download_item.h"
 #include "content/public/browser/download_manager.h"
 #include "ui/base/dialogs/selected_file_info.h"
diff --git a/chrome/browser/download/download_item_model.cc b/chrome/browser/download/download_item_model.cc
index b90808d..3269a5c 100644
--- a/chrome/browser/download/download_item_model.cc
+++ b/chrome/browser/download/download_item_model.cc
@@ -22,7 +22,7 @@
 #include "ui/base/text/text_elider.h"
 
 #if defined(OS_CHROMEOS)
-#include "chrome/browser/chromeos/gdata/drive_download_observer.h"
+#include "chrome/browser/chromeos/drive/drive_download_observer.h"
 #endif
 
 using base::TimeDelta;
diff --git a/chrome/browser/download/download_prefs.cc b/chrome/browser/download/download_prefs.cc
index b9e1224..c75e834b 100644
--- a/chrome/browser/download/download_prefs.cc
+++ b/chrome/browser/download/download_prefs.cc
@@ -29,8 +29,8 @@
 #include "content/public/browser/save_page_type.h"
 
 #if defined(OS_CHROMEOS)
-#include "chrome/browser/chromeos/gdata/drive_file_system_util.h"
-#include "chrome/browser/chromeos/gdata/drive_system_service.h"
+#include "chrome/browser/chromeos/drive/drive_file_system_util.h"
+#include "chrome/browser/chromeos/drive/drive_system_service.h"
 #endif
 
 using content::BrowserContext;
diff --git a/chrome/browser/download/save_package_file_picker_chromeos.cc b/chrome/browser/download/save_package_file_picker_chromeos.cc
index a7bae50..663b976b 100644
--- a/chrome/browser/download/save_package_file_picker_chromeos.cc
+++ b/chrome/browser/download/save_package_file_picker_chromeos.cc
@@ -8,8 +8,8 @@
 #include "base/bind_helpers.h"
 #include "base/i18n/file_util_icu.h"
 #include "base/threading/sequenced_worker_pool.h"
-#include "chrome/browser/chromeos/gdata/drive_download_observer.h"
-#include "chrome/browser/chromeos/gdata/drive_file_system_util.h"
+#include "chrome/browser/chromeos/drive/drive_download_observer.h"
+#include "chrome/browser/chromeos/drive/drive_file_system_util.h"
 #include "chrome/browser/platform_util.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/ui/chrome_select_file_policy.h"
diff --git a/chrome/browser/extensions/webstore_installer.cc b/chrome/browser/extensions/webstore_installer.cc
index 82522be..2ac1332 100644
--- a/chrome/browser/extensions/webstore_installer.cc
+++ b/chrome/browser/extensions/webstore_installer.cc
@@ -40,7 +40,7 @@
 #include "net/base/escape.h"
 
 #if defined(OS_CHROMEOS)
-#include "chrome/browser/chromeos/gdata/drive_file_system_util.h"
+#include "chrome/browser/chromeos/drive/drive_file_system_util.h"
 #endif
 
 using content::BrowserContext;
diff --git a/chrome/browser/profiles/profile_io_data.cc b/chrome/browser/profiles/profile_io_data.cc
index 86e8045..afadf49 100644
--- a/chrome/browser/profiles/profile_io_data.cc
+++ b/chrome/browser/profiles/profile_io_data.cc
@@ -72,7 +72,7 @@
 #endif
 
 #if defined(OS_CHROMEOS)
-#include "chrome/browser/chromeos/gdata/drive_protocol_handler.h"
+#include "chrome/browser/chromeos/drive/drive_protocol_handler.h"
 #include "chrome/browser/chromeos/gview_request_interceptor.h"
 #include "chrome/browser/chromeos/proxy_config_service_impl.h"
 #include "chrome/browser/chromeos/settings/cros_settings.h"
diff --git a/chrome/browser/ui/ash/screenshot_taker.cc b/chrome/browser/ui/ash/screenshot_taker.cc
index 7465ebd..2f7c7c1 100644
--- a/chrome/browser/ui/ash/screenshot_taker.cc
+++ b/chrome/browser/ui/ash/screenshot_taker.cc
@@ -28,7 +28,7 @@
 #include "ui/aura/window.h"
 
 #if defined(OS_CHROMEOS)
-#include "chrome/browser/chromeos/gdata/drive_file_system_util.h"
+#include "chrome/browser/chromeos/drive/drive_file_system_util.h"
 #include "chrome/browser/chromeos/login/user_manager.h"
 #endif
 
diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc
index 78fc183..3e52fb2 100644
--- a/chrome/browser/ui/browser.cc
+++ b/chrome/browser/ui/browser.cc
@@ -204,7 +204,7 @@
 #endif  // OS_WIN
 
 #if defined(OS_CHROMEOS)
-#include "chrome/browser/chromeos/gdata/drive_file_system_util.h"
+#include "chrome/browser/chromeos/drive/drive_file_system_util.h"
 #endif
 
 #if defined(USE_ASH)
diff --git a/chrome/browser/ui/webui/chromeos/drive_internals_ui.cc b/chrome/browser/ui/webui/chromeos/drive_internals_ui.cc
index 7f1924c..da7559c 100644
--- a/chrome/browser/ui/webui/chromeos/drive_internals_ui.cc
+++ b/chrome/browser/ui/webui/chromeos/drive_internals_ui.cc
@@ -13,11 +13,11 @@
 #include "base/string_number_conversions.h"
 #include "base/stringprintf.h"
 #include "base/sys_info.h"
-#include "chrome/browser/chromeos/gdata/drive_cache.h"
-#include "chrome/browser/chromeos/gdata/drive_file_system_interface.h"
-#include "chrome/browser/chromeos/gdata/drive_service_interface.h"
-#include "chrome/browser/chromeos/gdata/drive_system_service.h"
-#include "chrome/browser/chromeos/gdata/drive.pb.h"
+#include "chrome/browser/chromeos/drive/drive.pb.h"
+#include "chrome/browser/chromeos/drive/drive_cache.h"
+#include "chrome/browser/chromeos/drive/drive_file_system_interface.h"
+#include "chrome/browser/chromeos/drive/drive_service_interface.h"
+#include "chrome/browser/chromeos/drive/drive_system_service.h"
 #include "chrome/browser/google_apis/auth_service.h"
 #include "chrome/browser/google_apis/drive_api_parser.h"
 #include "chrome/browser/google_apis/gdata_errorcode.h"
@@ -27,8 +27,8 @@
 #include "chrome/browser/ui/webui/chrome_web_ui_data_source.h"
 #include "chrome/common/url_constants.h"
 #include "content/public/browser/browser_thread.h"
-#include "content/public/browser/web_ui_message_handler.h"
 #include "content/public/browser/web_ui.h"
+#include "content/public/browser/web_ui_message_handler.h"
 #include "grit/browser_resources.h"
 
 using content::BrowserThread;
diff --git a/chrome/browser/ui/webui/feedback_ui.cc b/chrome/browser/ui/webui/feedback_ui.cc
index 6636b4d..238d6a2 100644
--- a/chrome/browser/ui/webui/feedback_ui.cc
+++ b/chrome/browser/ui/webui/feedback_ui.cc
@@ -59,10 +59,10 @@
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"
-#include "chrome/browser/chromeos/gdata/drive.pb.h"
-#include "chrome/browser/chromeos/gdata/drive_file_system_interface.h"
-#include "chrome/browser/chromeos/gdata/drive_file_system_util.h"
-#include "chrome/browser/chromeos/gdata/drive_system_service.h"
+#include "chrome/browser/chromeos/drive/drive.pb.h"
+#include "chrome/browser/chromeos/drive/drive_file_system_interface.h"
+#include "chrome/browser/chromeos/drive/drive_file_system_util.h"
+#include "chrome/browser/chromeos/drive/drive_system_service.h"
 #include "chrome/browser/chromeos/login/user_manager.h"
 #include "chrome/browser/chromeos/system/syslogs_provider.h"
 #include "ui/aura/root_window.h"
diff --git a/chrome/browser/ui/webui/print_preview/print_preview_handler.cc b/chrome/browser/ui/webui/print_preview/print_preview_handler.cc
index 2420866..40ce66d 100644
--- a/chrome/browser/ui/webui/print_preview/print_preview_handler.cc
+++ b/chrome/browser/ui/webui/print_preview/print_preview_handler.cc
@@ -58,10 +58,10 @@
 #include "printing/print_settings.h"
 #include "unicode/ulocdata.h"
 
-#ifdef OS_CHROMEOS
+#if defined(OS_CHROMEOS)
 // TODO(kinaba): provide more non-intrusive way for handling local/remote
 // distinction and remove these ugly #ifdef's. http://crbug.com/140425
-#include "chrome/browser/chromeos/gdata/drive_file_system_util.h"
+#include "chrome/browser/chromeos/drive/drive_file_system_util.h"
 #endif
 
 #if !defined(OS_MACOSX)
diff --git a/chrome/browser/ui/webui/screenshot_source.cc b/chrome/browser/ui/webui/screenshot_source.cc
index e9f7ddf..662d060 100644
--- a/chrome/browser/ui/webui/screenshot_source.cc
+++ b/chrome/browser/ui/webui/screenshot_source.cc
@@ -32,9 +32,9 @@
 #endif
 
 #if defined(OS_CHROMEOS)
-#include "chrome/browser/chromeos/gdata/drive_file_system_interface.h"
-#include "chrome/browser/chromeos/gdata/drive_file_system_util.h"
-#include "chrome/browser/chromeos/gdata/drive_system_service.h"
+#include "chrome/browser/chromeos/drive/drive_file_system_interface.h"
+#include "chrome/browser/chromeos/drive/drive_file_system_util.h"
+#include "chrome/browser/chromeos/drive/drive_system_service.h"
 #include "chrome/browser/chromeos/login/user_manager.h"
 #include "content/public/browser/browser_thread.h"
 #endif
diff --git a/chrome/browser/ui/webui/screenshot_source.h b/chrome/browser/ui/webui/screenshot_source.h
index c4323f4..4d33b59 100644
--- a/chrome/browser/ui/webui/screenshot_source.h
+++ b/chrome/browser/ui/webui/screenshot_source.h
@@ -14,7 +14,7 @@
 #include "chrome/browser/ui/webui/chrome_url_data_manager.h"
 
 #if defined(OS_CHROMEOS)
-#include "chrome/browser/chromeos/gdata/drive_resource_metadata.h"
+#include "chrome/browser/chromeos/drive/drive_resource_metadata.h"
 #include "chrome/browser/chromeos/login/user_manager.h"
 #include "chrome/browser/google_apis/gdata_errorcode.h"
 #endif
diff --git a/chrome/chrome_browser_chromeos.gypi b/chrome/chrome_browser_chromeos.gypi
index 7ddeaf3..7643dce 100644
--- a/chrome/chrome_browser_chromeos.gypi
+++ b/chrome/chrome_browser_chromeos.gypi
@@ -213,6 +213,59 @@
         'browser/chromeos/dbus/proxy_resolution_service_provider.cc',
         'browser/chromeos/dbus/proxy_resolution_service_provider.h',
         'browser/chromeos/device_hierarchy_observer.h',
+        'browser/chromeos/drive/document_entry_conversion.cc',
+        'browser/chromeos/drive/document_entry_conversion.h',
+        'browser/chromeos/drive/drive_api_service.cc',
+        'browser/chromeos/drive/drive_api_service.h',
+        'browser/chromeos/drive/drive_cache.cc',
+        'browser/chromeos/drive/drive_cache.h',
+        'browser/chromeos/drive/drive_cache_metadata.cc',
+        'browser/chromeos/drive/drive_cache_metadata.h',
+        'browser/chromeos/drive/drive_cache_observer.h',
+        'browser/chromeos/drive/drive_download_observer.cc',
+        'browser/chromeos/drive/drive_download_observer.h',
+        'browser/chromeos/drive/drive_file_system.cc',
+        'browser/chromeos/drive/drive_file_system.h',
+        'browser/chromeos/drive/drive_file_system_interface.h',
+        'browser/chromeos/drive/drive_file_system_observer.h',
+        'browser/chromeos/drive/drive_file_system_proxy.cc',
+        'browser/chromeos/drive/drive_file_system_proxy.h',
+        'browser/chromeos/drive/drive_file_system_util.cc',
+        'browser/chromeos/drive/drive_file_ststem_util.h',
+        'browser/chromeos/drive/drive_files.cc',
+        'browser/chromeos/drive/drive_files.h',
+        'browser/chromeos/drive/drive_protocol_handler.cc',
+        'browser/chromeos/drive/drive_protocol_handler.h',
+        'browser/chromeos/drive/drive_resource_metadata.cc',
+        'browser/chromeos/drive/drive_resource_metadata.h',
+        'browser/chromeos/drive/drive_service_interface.h',
+        'browser/chromeos/drive/drive_scheduler.cc',
+        'browser/chromeos/drive/drive_scheduler.h',
+        'browser/chromeos/drive/drive_sync_client.cc',
+        'browser/chromeos/drive/drive_sync_client.h',
+        'browser/chromeos/drive/drive_system_service.cc',
+        'browser/chromeos/drive/drive_system_service.h',
+        'browser/chromeos/drive/drive_task_executor.cc',
+        'browser/chromeos/drive/drive_task_executor.h',
+        'browser/chromeos/drive/drive_uploader.cc',
+        'browser/chromeos/drive/drive_uploader.h',
+        'browser/chromeos/drive/drive_webapps_registry.cc',
+        'browser/chromeos/drive/drive_webapps_registry.h',
+        'browser/chromeos/drive/file_system/move_operation.cc',
+        'browser/chromeos/drive/file_system/move_operation.h',
+        'browser/chromeos/drive/file_system/remove_operation.cc',
+        'browser/chromeos/drive/file_system/remove_operation.h',
+        'browser/chromeos/drive/file_write_helper.cc',
+        'browser/chromeos/drive/file_write_helper.h',
+        'browser/chromeos/drive/gdata_wapi_feed_loader.cc',
+        'browser/chromeos/drive/gdata_wapi_feed_loader.h',
+        'browser/chromeos/drive/gdata_wapi_feed_loader_observer.h',
+        'browser/chromeos/drive/gdata_wapi_feed_processor.cc',
+        'browser/chromeos/drive/gdata_wapi_feed_processor.h',
+        'browser/chromeos/drive/gdata_wapi_service.cc',
+        'browser/chromeos/drive/gdata_wapi_service.h',
+        'browser/chromeos/drive/stale_cache_files_remover.cc',
+        'browser/chromeos/drive/stale_cache_files_remover.h',
         'browser/chromeos/enrollment_dialog_view.cc',
         'browser/chromeos/enrollment_dialog_view.h',
         'browser/chromeos/enterprise_extension_observer.cc',
@@ -243,59 +296,6 @@
         'browser/chromeos/external_metrics.h',
         'browser/chromeos/external_protocol_dialog.cc',
         'browser/chromeos/external_protocol_dialog.h',
-        'browser/chromeos/gdata/document_entry_conversion.cc',
-        'browser/chromeos/gdata/document_entry_conversion.h',
-        'browser/chromeos/gdata/drive_api_service.cc',
-        'browser/chromeos/gdata/drive_api_service.h',
-        'browser/chromeos/gdata/drive_cache.cc',
-        'browser/chromeos/gdata/drive_cache.h',
-        'browser/chromeos/gdata/drive_cache_metadata.cc',
-        'browser/chromeos/gdata/drive_cache_metadata.h',
-        'browser/chromeos/gdata/drive_cache_observer.h',
-        'browser/chromeos/gdata/drive_download_observer.cc',
-        'browser/chromeos/gdata/drive_download_observer.h',
-        'browser/chromeos/gdata/drive_file_system.cc',
-        'browser/chromeos/gdata/drive_file_system.h',
-        'browser/chromeos/gdata/drive_file_system_interface.h',
-        'browser/chromeos/gdata/drive_file_system_observer.h',
-        'browser/chromeos/gdata/drive_file_system_proxy.cc',
-        'browser/chromeos/gdata/drive_file_system_proxy.h',
-        'browser/chromeos/gdata/drive_file_system_util.cc',
-        'browser/chromeos/gdata/drive_file_ststem_util.h',
-        'browser/chromeos/gdata/drive_files.cc',
-        'browser/chromeos/gdata/drive_files.h',
-        'browser/chromeos/gdata/drive_protocol_handler.cc',
-        'browser/chromeos/gdata/drive_protocol_handler.h',
-        'browser/chromeos/gdata/drive_resource_metadata.cc',
-        'browser/chromeos/gdata/drive_resource_metadata.h',
-        'browser/chromeos/gdata/drive_service_interface.h',
-        'browser/chromeos/gdata/drive_scheduler.cc',
-        'browser/chromeos/gdata/drive_scheduler.h',
-        'browser/chromeos/gdata/drive_sync_client.cc',
-        'browser/chromeos/gdata/drive_sync_client.h',
-        'browser/chromeos/gdata/drive_system_service.cc',
-        'browser/chromeos/gdata/drive_system_service.h',
-        'browser/chromeos/gdata/drive_task_executor.cc',
-        'browser/chromeos/gdata/drive_task_executor.h',
-        'browser/chromeos/gdata/drive_uploader.cc',
-        'browser/chromeos/gdata/drive_uploader.h',
-        'browser/chromeos/gdata/drive_webapps_registry.cc',
-        'browser/chromeos/gdata/drive_webapps_registry.h',
-        'browser/chromeos/gdata/file_system/move_operation.cc',
-        'browser/chromeos/gdata/file_system/move_operation.h',
-        'browser/chromeos/gdata/file_system/remove_operation.cc',
-        'browser/chromeos/gdata/file_system/remove_operation.h',
-        'browser/chromeos/gdata/file_write_helper.cc',
-        'browser/chromeos/gdata/file_write_helper.h',
-        'browser/chromeos/gdata/gdata_wapi_feed_loader.cc',
-        'browser/chromeos/gdata/gdata_wapi_feed_loader.h',
-        'browser/chromeos/gdata/gdata_wapi_feed_loader_observer.h',
-        'browser/chromeos/gdata/gdata_wapi_feed_processor.cc',
-        'browser/chromeos/gdata/gdata_wapi_feed_processor.h',
-        'browser/chromeos/gdata/gdata_wapi_service.cc',
-        'browser/chromeos/gdata/gdata_wapi_service.h',
-        'browser/chromeos/gdata/stale_cache_files_remover.cc',
-        'browser/chromeos/gdata/stale_cache_files_remover.h',
         'browser/chromeos/gview_request_interceptor.cc',
         'browser/chromeos/gview_request_interceptor.h',
         'browser/chromeos/imageburner/burn_controller.cc',
@@ -749,10 +749,10 @@
       # Protobuf compiler / generator for the Drive protocol buffer.
       'target_name': 'drive_proto',
       'type': 'static_library',
-      'sources': [ 'browser/chromeos/gdata/drive.proto' ],
+      'sources': [ 'browser/chromeos/drive/drive.proto' ],
       'variables': {
-        'proto_in_dir': 'browser/chromeos/gdata',
-        'proto_out_dir': 'chrome/browser/chromeos/gdata',
+        'proto_in_dir': 'browser/chromeos/drive',
+        'proto_out_dir': 'chrome/browser/chromeos/drive',
       },
       'includes': [ '../build/protoc.gypi' ]
     },
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index 9060c53..c853fcae 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -1120,35 +1120,35 @@
         'browser/chromeos/customization_document_unittest.cc',
         'browser/chromeos/dbus/cros_dbus_service_unittest.cc',
         'browser/chromeos/dbus/proxy_resolution_service_provider_unittest.cc',
+        'browser/chromeos/drive/document_entry_conversion_unittest.cc',
+        'browser/chromeos/drive/drive_cache_metadata_unittest.cc',
+        'browser/chromeos/drive/drive_cache_unittest.cc',
+        'browser/chromeos/drive/drive_file_system_unittest.cc',
+        'browser/chromeos/drive/drive_file_system_util_unittest.cc',
+        'browser/chromeos/drive/drive_resource_metadata_unittest.cc',
+        'browser/chromeos/drive/drive_scheduler_unittest.cc',
+        'browser/chromeos/drive/drive_sync_client_unittest.cc',
+        'browser/chromeos/drive/drive_test_util.cc',
+        'browser/chromeos/drive/drive_test_util.h',
+        'browser/chromeos/drive/drive_webapps_registry_unittest.cc',
+        'browser/chromeos/drive/file_write_helper_unittest.cc',
+        'browser/chromeos/drive/mock_directory_change_observer.cc',
+        'browser/chromeos/drive/mock_directory_change_observer.h',
+        'browser/chromeos/drive/mock_drive_cache_observer.cc',
+        'browser/chromeos/drive/mock_drive_cache_observer.h',
+        'browser/chromeos/drive/mock_drive_file_system.cc',
+        'browser/chromeos/drive/mock_drive_file_system.h',
+        'browser/chromeos/drive/mock_drive_service.cc',
+        'browser/chromeos/drive/mock_drive_service.h',
+        'browser/chromeos/drive/mock_drive_uploader.cc',
+        'browser/chromeos/drive/mock_drive_uploader.h',
+        'browser/chromeos/drive/mock_drive_web_apps_registry.cc',
+        'browser/chromeos/drive/mock_drive_web_apps_registry.h',
+        'browser/chromeos/drive/mock_free_disk_space_getter.cc',
+        'browser/chromeos/drive/mock_free_disk_space_getter.h',
+        'browser/chromeos/drive/stale_cache_files_remover_unittest.cc',
         'browser/chromeos/extensions/file_browser_notifications_unittest.cc',
         'browser/chromeos/external_metrics_unittest.cc',
-        'browser/chromeos/gdata/document_entry_conversion_unittest.cc',
-        'browser/chromeos/gdata/drive_cache_metadata_unittest.cc',
-        'browser/chromeos/gdata/drive_cache_unittest.cc',
-        'browser/chromeos/gdata/drive_file_system_unittest.cc',
-        'browser/chromeos/gdata/drive_file_system_util_unittest.cc',
-        'browser/chromeos/gdata/drive_resource_metadata_unittest.cc',
-        'browser/chromeos/gdata/drive_scheduler_unittest.cc',
-        'browser/chromeos/gdata/drive_sync_client_unittest.cc',
-        'browser/chromeos/gdata/drive_test_util.cc',
-        'browser/chromeos/gdata/drive_test_util.h',
-        'browser/chromeos/gdata/drive_webapps_registry_unittest.cc',
-        'browser/chromeos/gdata/file_write_helper_unittest.cc',
-        'browser/chromeos/gdata/mock_directory_change_observer.cc',
-        'browser/chromeos/gdata/mock_directory_change_observer.h',
-        'browser/chromeos/gdata/mock_drive_cache_observer.cc',
-        'browser/chromeos/gdata/mock_drive_cache_observer.h',
-        'browser/chromeos/gdata/mock_drive_file_system.cc',
-        'browser/chromeos/gdata/mock_drive_file_system.h',
-        'browser/chromeos/gdata/mock_drive_service.cc',
-        'browser/chromeos/gdata/mock_drive_service.h',
-        'browser/chromeos/gdata/mock_drive_uploader.cc',
-        'browser/chromeos/gdata/mock_drive_uploader.h',
-        'browser/chromeos/gdata/mock_drive_web_apps_registry.cc',
-        'browser/chromeos/gdata/mock_drive_web_apps_registry.h',
-        'browser/chromeos/gdata/mock_free_disk_space_getter.cc',
-        'browser/chromeos/gdata/mock_free_disk_space_getter.h',
-        'browser/chromeos/gdata/stale_cache_files_remover_unittest.cc',
         'browser/chromeos/gview_request_interceptor_unittest.cc',
         'browser/chromeos/imageburner/burn_manager_unittest.cc',
         'browser/chromeos/input_method/browser_state_monitor_unittest.cc',
@@ -2773,6 +2773,11 @@
         'browser/chromeos/cros/cros_in_process_browser_test.h',
         'browser/chromeos/cros/cros_mock.cc',
         'browser/chromeos/cros/cros_mock.h',
+        'browser/chromeos/drive/drive_test_util.cc',
+        'browser/chromeos/drive/drive_test_util.h',
+        'browser/chromeos/drive/gdata_wapi_service_browsertest.cc',
+        'browser/chromeos/drive/mock_drive_service.cc',
+        'browser/chromeos/drive/mock_drive_service.h',
         'browser/chromeos/extensions/echo_private_apitest.cc',
         'browser/chromeos/extensions/external_filesystem_apitest.cc',
         'browser/chromeos/extensions/file_browser_handler_api_test.cc',
@@ -2780,11 +2785,6 @@
         'browser/chromeos/extensions/file_browser_private_apitest.cc',
         'browser/chromeos/extensions/info_private_apitest.cc',
         'browser/chromeos/extensions/power/power_api_browsertest.cc',
-        'browser/chromeos/gdata/drive_test_util.cc',
-        'browser/chromeos/gdata/drive_test_util.h',
-        'browser/chromeos/gdata/gdata_wapi_service_browsertest.cc',
-        'browser/chromeos/gdata/mock_drive_service.cc',
-        'browser/chromeos/gdata/mock_drive_service.h',
         'browser/chromeos/kiosk_mode/mock_kiosk_mode_settings.cc',
         'browser/chromeos/kiosk_mode/mock_kiosk_mode_settings.h',
         'browser/chromeos/login/enrollment/enterprise_enrollment_screen_browsertest.cc',