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

Unified Diff: chrome/browser/sync/test/integration/single_client_directory_sync_test.cc

Issue 2354613002: [Sync] Fix namespaces for the browser_sync component. (Closed)
Patch Set: Address comments. Created 4 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/sync/test/integration/single_client_directory_sync_test.cc
diff --git a/chrome/browser/sync/test/integration/single_client_directory_sync_test.cc b/chrome/browser/sync/test/integration/single_client_directory_sync_test.cc
index 6784411e9da83b89c9bf227555fe0e9222e05075..3cc5d21a3f9f018f745e6a2614ebd97ab13d2e7d 100644
--- a/chrome/browser/sync/test/integration/single_client_directory_sync_test.cc
+++ b/chrome/browser/sync/test/integration/single_client_directory_sync_test.cc
@@ -49,7 +49,8 @@ bool WaitForExistingTasksOnLoop(base::MessageLoop* loop) {
// A status change checker that waits for an unrecoverable sync error to occur.
class SyncUnrecoverableErrorChecker : public SingleClientStatusChangeChecker {
public:
- explicit SyncUnrecoverableErrorChecker(ProfileSyncService* service)
+ explicit SyncUnrecoverableErrorChecker(
+ browser_sync::ProfileSyncService* service)
: SingleClientStatusChangeChecker(service) {}
bool IsExitConditionSatisfied() override {
@@ -64,10 +65,10 @@ class SyncUnrecoverableErrorChecker : public SingleClientStatusChangeChecker {
IN_PROC_BROWSER_TEST_F(SingleClientDirectorySyncTest,
StopThenDisableDeletesDirectory) {
ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
- ProfileSyncService* sync_service = GetSyncService(0);
+ browser_sync::ProfileSyncService* sync_service = GetSyncService(0);
base::FilePath directory_path = sync_service->GetDirectoryPathForTest();
ASSERT_TRUE(base::DirectoryExists(directory_path));
- sync_service->RequestStop(ProfileSyncService::CLEAR_DATA);
+ sync_service->RequestStop(browser_sync::ProfileSyncService::CLEAR_DATA);
// Wait for StartupController::StartUp()'s tasks to finish.
base::RunLoop run_loop;
@@ -96,7 +97,7 @@ IN_PROC_BROWSER_TEST_F(SingleClientDirectorySyncTest,
// Flush the directory to the backing store and wait until the flush
// completes.
- ProfileSyncService* sync_service = GetSyncService(0);
+ browser_sync::ProfileSyncService* sync_service = GetSyncService(0);
sync_service->FlushDirectory();
base::MessageLoop* sync_loop = sync_service->GetSyncLoopForTest();
ASSERT_TRUE(WaitForExistingTasksOnLoop(sync_loop));

Powered by Google App Engine
This is Rietveld 408576698