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

Side by Side Diff: chrome/test/live_sync/profile_sync_service_test_harness.cc

Issue 337034: Remove the browser_sync flag. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 11 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 #if defined(BROWSER_SYNC)
5 4
6 #include "base/message_loop.h" 5 #include "base/message_loop.h"
7 #include "chrome/browser/browser.h" 6 #include "chrome/browser/browser.h"
8 #include "chrome/browser/tab_contents/tab_contents.h" 7 #include "chrome/browser/tab_contents/tab_contents.h"
9 #include "chrome/common/pref_names.h" 8 #include "chrome/common/pref_names.h"
10 #include "chrome/common/pref_service.h" 9 #include "chrome/common/pref_service.h"
11 #include "chrome/browser/sync/auth_error_state.h" 10 #include "chrome/browser/sync/auth_error_state.h"
12 #include "chrome/test/live_sync/profile_sync_service_test_harness.h" 11 #include "chrome/test/live_sync/profile_sync_service_test_harness.h"
13 #include "chrome/test/ui_test_utils.h" 12 #include "chrome/test/ui_test_utils.h"
14 #include "testing/gtest/include/gtest/gtest.h" 13 #include "testing/gtest/include/gtest/gtest.h"
(...skipping 227 matching lines...) Expand 10 before | Expand all | Expand 10 after
242 } 241 }
243 242
244 // Wait for the OnBackendInitialized callback. 243 // Wait for the OnBackendInitialized callback.
245 service_->backend()->Authenticate(username_, password_); 244 service_->backend()->Authenticate(username_, password_);
246 EXPECT_EQ(wait_state_, WAITING_FOR_READY_TO_PROCESS_CHANGES); 245 EXPECT_EQ(wait_state_, WAITING_FOR_READY_TO_PROCESS_CHANGES);
247 if (!AwaitStatusChangeWithTimeout(30, "Waiting on backend initialization.")) { 246 if (!AwaitStatusChangeWithTimeout(30, "Waiting on backend initialization.")) {
248 return false; 247 return false;
249 } 248 }
250 return service_->sync_initialized(); 249 return service_->sync_initialized();
251 } 250 }
252
253 #endif // defined(BROWSER_SYNC)
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698