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

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

Issue 8760019: Make the change in ProfileSyncService such that it declares success (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 years 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
« no previous file with comments | « chrome/browser/sync/profile_sync_service_unittest.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 363 matching lines...) Expand 10 before | Expand all | Expand 10 after
374 username_ = "user@gmail.com"; 374 username_ = "user@gmail.com";
375 password_ = "password"; 375 password_ = "password";
376 factory_.reset(new URLFetcherImplFactory()); 376 factory_.reset(new URLFetcherImplFactory());
377 fake_factory_.reset(new FakeURLFetcherFactory(factory_.get())); 377 fake_factory_.reset(new FakeURLFetcherFactory(factory_.get()));
378 fake_factory_->SetFakeResponse(kClientLoginUrl, "SID=sid\nLSID=lsid", true); 378 fake_factory_->SetFakeResponse(kClientLoginUrl, "SID=sid\nLSID=lsid", true);
379 fake_factory_->SetFakeResponse(kGetUserInfoUrl, "email=user@gmail.com", true); 379 fake_factory_->SetFakeResponse(kGetUserInfoUrl, "email=user@gmail.com", true);
380 fake_factory_->SetFakeResponse(kIssueAuthTokenUrl, "auth", true); 380 fake_factory_->SetFakeResponse(kIssueAuthTokenUrl, "auth", true);
381 fake_factory_->SetFakeResponse(kSearchDomainCheckUrl, ".google.com", true); 381 fake_factory_->SetFakeResponse(kSearchDomainCheckUrl, ".google.com", true);
382 fake_factory_->SetFakeResponse( 382 fake_factory_->SetFakeResponse(
383 GaiaUrls::GetInstance()->client_login_to_oauth2_url(), 383 GaiaUrls::GetInstance()->client_login_to_oauth2_url(),
384 "some_response",
385 true);
386 fake_factory_->SetFakeResponse(
387 GaiaUrls::GetInstance()->oauth2_token_url(),
384 kOAuth2LoginTokenValidResponse, 388 kOAuth2LoginTokenValidResponse,
385 true); 389 true);
386 } 390 }
387 391
388 // Start up a local sync server based on the value of server_type_, which 392 // Start up a local sync server based on the value of server_type_, which
389 // was determined from the command line parameters. 393 // was determined from the command line parameters.
390 void SyncTest::SetUpTestServerIfRequired() { 394 void SyncTest::SetUpTestServerIfRequired() {
391 if (server_type_ == LOCAL_PYTHON_SERVER) { 395 if (server_type_ == LOCAL_PYTHON_SERVER) {
392 if (!SetUpLocalPythonTestServer()) 396 if (!SetUpLocalPythonTestServer())
393 LOG(FATAL) << "Failed to set up local python sync and XMPP servers"; 397 LOG(FATAL) << "Failed to set up local python sync and XMPP servers";
(...skipping 312 matching lines...) Expand 10 before | Expand all | Expand 10 after
706 710
707 void SyncTest::SetProxyConfig(net::URLRequestContextGetter* context_getter, 711 void SyncTest::SetProxyConfig(net::URLRequestContextGetter* context_getter,
708 const net::ProxyConfig& proxy_config) { 712 const net::ProxyConfig& proxy_config) {
709 base::WaitableEvent done(false, false); 713 base::WaitableEvent done(false, false);
710 BrowserThread::PostTask( 714 BrowserThread::PostTask(
711 BrowserThread::IO, FROM_HERE, 715 BrowserThread::IO, FROM_HERE,
712 base::Bind(&SetProxyConfigCallback, &done, 716 base::Bind(&SetProxyConfigCallback, &done,
713 make_scoped_refptr(context_getter), proxy_config)); 717 make_scoped_refptr(context_getter), proxy_config));
714 done.Wait(); 718 done.Wait();
715 } 719 }
OLDNEW
« no previous file with comments | « chrome/browser/sync/profile_sync_service_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698