Revive reverted path.

chrome/browser/sync/test/integration/sync_test.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/sync/test/integration/sync_test.h"
 
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/bind.h"
@@ skipping 14 matching lines @@
 #include "chrome/browser/search_engines/template_url_service.h"
 #include "chrome/browser/search_engines/template_url_service_factory.h"
 #include "chrome/browser/sync/notifier/p2p_notifier.h"
 #include "chrome/browser/sync/profile_sync_service_harness.h"
 #include "chrome/browser/sync/protocol/sync.pb.h"
 #include "chrome/browser/sync/test/integration/sync_datatype_helper.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
+#include "chrome/common/net/gaia/gaia_urls.h"
 #include "chrome/test/base/testing_browser_process.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "content/browser/tab_contents/tab_contents.h"
 #include "content/public/common/url_fetcher.h"
 #include "content/public/common/url_fetcher_delegate.h"
 #include "content/test/test_browser_thread.h"
 #include "content/test/test_url_fetcher_factory.h"
 #include "googleurl/src/gurl.h"
 #include "net/base/escape.h"
 #include "net/base/network_change_notifier.h"
@@ skipping 15 matching lines @@
 }
 
 namespace {
 // The URLs for different calls in the Google Accounts programmatic login API.
 const char kClientLoginUrl[] = "https://www.google.com/accounts/ClientLogin";
 const char kGetUserInfoUrl[] = "https://www.google.com/accounts/GetUserInfo";
 const char kIssueAuthTokenUrl[] =
     "https://www.google.com/accounts/IssueAuthToken";
 const char kSearchDomainCheckUrl[] =
     "https://www.google.com/searchdomaincheck?format=domain&type=chrome";
+static const char kOAuth2LoginTokenValidResponse[] =

[Raghu Simha, 2011/11/29 23:56:59]

nit: Remove static modifier.

[Munjal (Google), 2011/11/30 00:02:00]

Done.

+    "{"
+    "  \"refresh_token\": \"rt1\","
+    "  \"access_token\": \"at1\","
+    "  \"expires_in\": 3600,"
+    "  \"token_type\": \"Bearer\""
+    "}";
 }
 
 // Helper class that checks whether a sync test server is running or not.
 class SyncServerStatusChecker : public content::URLFetcherDelegate {
  public:
   SyncServerStatusChecker() : running_(false) {}
 
   virtual void OnURLFetchComplete(const content::URLFetcher* source) {
     std::string data;
     source->GetResponseAsString(&data);
@@ skipping 284 matching lines @@
 
 void SyncTest::SetupMockGaiaResponses() {
   username_ = "user@gmail.com";
   password_ = "password";
   factory_.reset(new URLFetcherImplFactory());
   fake_factory_.reset(new FakeURLFetcherFactory(factory_.get()));
   fake_factory_->SetFakeResponse(kClientLoginUrl, "SID=sid\nLSID=lsid", true);
   fake_factory_->SetFakeResponse(kGetUserInfoUrl, "email=user@gmail.com", true);
   fake_factory_->SetFakeResponse(kIssueAuthTokenUrl, "auth", true);
   fake_factory_->SetFakeResponse(kSearchDomainCheckUrl, ".google.com", true);
+  fake_factory_->SetFakeResponse(
+      GaiaUrls::GetInstance()->client_login_to_oauth2_url(),
+      kOAuth2LoginTokenValidResponse,
+      true);
 }
 
 // Start up a local sync server based on the value of server_type_, which
 // was determined from the command line parameters.
 void SyncTest::SetUpTestServerIfRequired() {
   if (server_type_ == LOCAL_PYTHON_SERVER) {
     if (!SetUpLocalPythonTestServer())
       LOG(FATAL) << "Failed to set up local python sync and XMPP servers";
   } else if (server_type_ == LOCAL_LIVE_SERVER) {
     // Using mock gaia credentials requires the use of a mock XMPP server.
@@ skipping 310 matching lines @@
 
 void SyncTest::SetProxyConfig(net::URLRequestContextGetter* context_getter,
                               const net::ProxyConfig& proxy_config) {
   base::WaitableEvent done(false, false);
   BrowserThread::PostTask(
       BrowserThread::IO, FROM_HERE,
       base::Bind(&SetProxyConfigCallback, &done,
                  make_scoped_refptr(context_getter), proxy_config));
   done.Wait();
 }