Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1880)

Unified Diff: chrome/browser/chromeos/extensions/external_filesystem_apitest.cc

Issue 10873026: Rename GDataSystemService to DriveSystemService (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix merge issue, remove one include header which is no longer necessary Created 8 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/browser/chromeos/extensions/file_browser_event_router.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/extensions/external_filesystem_apitest.cc
diff --git a/chrome/browser/chromeos/extensions/external_filesystem_apitest.cc b/chrome/browser/chromeos/extensions/external_filesystem_apitest.cc
index 1131090ea25d97cb7312907e8dc1e81c97850ad4..166cc4ca822f2467bea93df5c7fc97ebef195521 100644
--- a/chrome/browser/chromeos/extensions/external_filesystem_apitest.cc
+++ b/chrome/browser/chromeos/extensions/external_filesystem_apitest.cc
@@ -13,7 +13,7 @@
#include "base/threading/worker_pool.h"
#include "base/values.h"
#include "chrome/browser/chromeos/gdata/drive_file_system.h"
-#include "chrome/browser/chromeos/gdata/gdata_system_service.h"
+#include "chrome/browser/chromeos/gdata/drive_system_service.h"
#include "chrome/browser/chromeos/gdata/gdata_util.h"
#include "chrome/browser/chromeos/gdata/gdata_wapi_parser.h"
#include "chrome/browser/chromeos/gdata/mock_drive_service.h"
@@ -200,7 +200,7 @@ class RemoteFileSystemExtensionApiTest : public ExtensionApiTest {
FilePath tmp_dir_path;
PathService::Get(base::DIR_TEMP, &tmp_dir_path);
ASSERT_TRUE(test_cache_root_.CreateUniqueTempDirUnderPath(tmp_dir_path));
- gdata::GDataSystemServiceFactory::set_cache_root_for_test(
+ gdata::DriveSystemServiceFactory::set_cache_root_for_test(
test_cache_root_.path().value());
mock_drive_service_ = new gdata::MockDriveService();
@@ -212,7 +212,7 @@ class RemoteFileSystemExtensionApiTest : public ExtensionApiTest {
WillRepeatedly(Return(operation_registry_.get()));
// |mock_drive_service_| will eventually get owned by a system service.
- gdata::GDataSystemServiceFactory::set_drive_service_for_test(
+ gdata::DriveSystemServiceFactory::set_drive_service_for_test(
mock_drive_service_);
ExtensionApiTest::SetUp();
@@ -220,8 +220,8 @@ class RemoteFileSystemExtensionApiTest : public ExtensionApiTest {
virtual void TearDown() OVERRIDE {
// Let's make sure we don't leak documents service.
- gdata::GDataSystemServiceFactory::set_drive_service_for_test(NULL);
- gdata::GDataSystemServiceFactory::set_cache_root_for_test(std::string());
+ gdata::DriveSystemServiceFactory::set_drive_service_for_test(NULL);
+ gdata::DriveSystemServiceFactory::set_cache_root_for_test(std::string());
ExtensionApiTest::TearDown();
}
« no previous file with comments | « no previous file | chrome/browser/chromeos/extensions/file_browser_event_router.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698