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

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

Issue 348403003: Reverting 267374 on 36 branch. (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1985/src/
Patch Set: Created 6 years, 5 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 524 matching lines...) Expand 10 before | Expand all | Expand 10 after
535 GaiaUrls::GetInstance()->oauth2_token_url(), 535 GaiaUrls::GetInstance()->oauth2_token_url(),
536 "{" 536 "{"
537 " \"refresh_token\": \"rt1\"," 537 " \"refresh_token\": \"rt1\","
538 " \"access_token\": \"at1\"," 538 " \"access_token\": \"at1\","
539 " \"expires_in\": 3600," 539 " \"expires_in\": 3600,"
540 " \"token_type\": \"Bearer\"" 540 " \"token_type\": \"Bearer\""
541 "}", 541 "}",
542 net::HTTP_OK, 542 net::HTTP_OK,
543 net::URLRequestStatus::SUCCESS); 543 net::URLRequestStatus::SUCCESS);
544 fake_factory_->SetFakeResponse( 544 fake_factory_->SetFakeResponse(
545 GaiaUrls::GetInstance()->people_get_url(), 545 GaiaUrls::GetInstance()->oauth_user_info_url(),
546 "{" 546 "{"
547 " \"id\": \"12345\"" 547 " \"id\": \"12345\""
548 "}", 548 "}",
549 net::HTTP_OK, 549 net::HTTP_OK,
550 net::URLRequestStatus::SUCCESS); 550 net::URLRequestStatus::SUCCESS);
551 fake_factory_->SetFakeResponse( 551 fake_factory_->SetFakeResponse(
552 GaiaUrls::GetInstance()->oauth1_login_url(), 552 GaiaUrls::GetInstance()->oauth1_login_url(),
553 "SID=sid\nLSID=lsid\nAuth=auth_token", 553 "SID=sid\nLSID=lsid\nAuth=auth_token",
554 net::HTTP_OK, 554 net::HTTP_OK,
555 net::URLRequestStatus::SUCCESS); 555 net::URLRequestStatus::SUCCESS);
(...skipping 471 matching lines...) Expand 10 before | Expand all | Expand 10 after
1027 BrowserThread::PostTask( 1027 BrowserThread::PostTask(
1028 BrowserThread::IO, FROM_HERE, 1028 BrowserThread::IO, FROM_HERE,
1029 base::Bind(&SetProxyConfigCallback, &done, 1029 base::Bind(&SetProxyConfigCallback, &done,
1030 make_scoped_refptr(context_getter), proxy_config)); 1030 make_scoped_refptr(context_getter), proxy_config));
1031 done.Wait(); 1031 done.Wait();
1032 } 1032 }
1033 1033
1034 fake_server::FakeServer* SyncTest::GetFakeServer() const { 1034 fake_server::FakeServer* SyncTest::GetFakeServer() const {
1035 return fake_server_.get(); 1035 return fake_server_.get();
1036 } 1036 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698