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

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

Issue 265563002: Revert of Use new people.get api instead of oauth2/v1/userinfo. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
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 497 matching lines...) Expand 10 before | Expand all | Expand 10 after
508 GaiaUrls::GetInstance()->oauth2_token_url(), 508 GaiaUrls::GetInstance()->oauth2_token_url(),
509 "{" 509 "{"
510 " \"refresh_token\": \"rt1\"," 510 " \"refresh_token\": \"rt1\","
511 " \"access_token\": \"at1\"," 511 " \"access_token\": \"at1\","
512 " \"expires_in\": 3600," 512 " \"expires_in\": 3600,"
513 " \"token_type\": \"Bearer\"" 513 " \"token_type\": \"Bearer\""
514 "}", 514 "}",
515 net::HTTP_OK, 515 net::HTTP_OK,
516 net::URLRequestStatus::SUCCESS); 516 net::URLRequestStatus::SUCCESS);
517 fake_factory_->SetFakeResponse( 517 fake_factory_->SetFakeResponse(
518 GaiaUrls::GetInstance()->people_get_url(), 518 GaiaUrls::GetInstance()->oauth_user_info_url(),
519 "{" 519 "{"
520 " \"id\": \"12345\"" 520 " \"id\": \"12345\""
521 "}", 521 "}",
522 net::HTTP_OK, 522 net::HTTP_OK,
523 net::URLRequestStatus::SUCCESS); 523 net::URLRequestStatus::SUCCESS);
524 fake_factory_->SetFakeResponse( 524 fake_factory_->SetFakeResponse(
525 GaiaUrls::GetInstance()->oauth1_login_url(), 525 GaiaUrls::GetInstance()->oauth1_login_url(),
526 "SID=sid\nLSID=lsid\nAuth=auth_token", 526 "SID=sid\nLSID=lsid\nAuth=auth_token",
527 net::HTTP_OK, 527 net::HTTP_OK,
528 net::URLRequestStatus::SUCCESS); 528 net::URLRequestStatus::SUCCESS);
(...skipping 465 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