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

Side by Side Diff: trunk/src/chrome/browser/sync/test/integration/sync_test.cc

Issue 269893004: Revert 268203 "There are many ways to get it wrong." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 years, 7 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 4
5 #include "chrome/browser/sync/test/integration/sync_test.h" 5 #include "chrome/browser/sync/test/integration/sync_test.h"
6 6
7 #include <vector> 7 #include <vector>
8 8
9 #include "base/basictypes.h" 9 #include "base/basictypes.h"
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 364 matching lines...) Expand 10 before | Expand all | Expand 10 after
375 } 375 }
376 376
377 clients_[index] = 377 clients_[index] =
378 ProfileSyncServiceHarness::Create( 378 ProfileSyncServiceHarness::Create(
379 GetProfile(index), 379 GetProfile(index),
380 username_, 380 username_,
381 password_); 381 password_);
382 EXPECT_FALSE(GetClient(index) == NULL) << "Could not create Client " 382 EXPECT_FALSE(GetClient(index) == NULL) << "Could not create Client "
383 << index << "."; 383 << index << ".";
384 384
385 // Start listening for and emitting notifications of commits. 385 // Start listening for and emitting notificaitons of commits.
386 invalidation_forwarders_[index] = 386 invalidation_forwarders_[index] =
387 new P2PInvalidationForwarder(clients_[index]->service(), 387 new P2PInvalidationForwarder(clients_[index]->service(),
388 p2p_invalidation_service); 388 p2p_invalidation_service);
389 389
390 test::WaitForBookmarkModelToLoad( 390 test::WaitForBookmarkModelToLoad(
391 BookmarkModelFactory::GetForProfile(GetProfile(index))); 391 BookmarkModelFactory::GetForProfile(GetProfile(index)));
392 ui_test_utils::WaitForHistoryToLoad(HistoryServiceFactory::GetForProfile( 392 ui_test_utils::WaitForHistoryToLoad(HistoryServiceFactory::GetForProfile(
393 GetProfile(index), Profile::EXPLICIT_ACCESS)); 393 GetProfile(index), Profile::EXPLICIT_ACCESS));
394 ui_test_utils::WaitForTemplateURLServiceToLoad( 394 ui_test_utils::WaitForTemplateURLServiceToLoad(
395 TemplateURLServiceFactory::GetForProfile(GetProfile(index))); 395 TemplateURLServiceFactory::GetForProfile(GetProfile(index)));
(...skipping 598 matching lines...) Expand 10 before | Expand all | Expand 10 after
994 BrowserThread::PostTask( 994 BrowserThread::PostTask(
995 BrowserThread::IO, FROM_HERE, 995 BrowserThread::IO, FROM_HERE,
996 base::Bind(&SetProxyConfigCallback, &done, 996 base::Bind(&SetProxyConfigCallback, &done,
997 make_scoped_refptr(context_getter), proxy_config)); 997 make_scoped_refptr(context_getter), proxy_config));
998 done.Wait(); 998 done.Wait();
999 } 999 }
1000 1000
1001 fake_server::FakeServer* SyncTest::GetFakeServer() const { 1001 fake_server::FakeServer* SyncTest::GetFakeServer() const {
1002 return fake_server_.get(); 1002 return fake_server_.get();
1003 } 1003 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698