Consolidate TestURLFetcherFactory::SetFakeResponse

chrome/browser/signin/signin_browsertest.cc

 // Copyright 2013 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.
 
 #ifndef CHROME_BROWSER_SIGNIN_SIGNIN_BROWSERTEST_H_
 #define CHROME_BROWSER_SIGNIN_SIGNIN_BROWSERTEST_H_
 
 #include "base/command_line.h"
 #include "chrome/browser/signin/signin_manager.h"
 #include "chrome/browser/signin/signin_manager_factory.h"
@@ skipping 10 matching lines @@
 #include "content/public/browser/notification_types.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_observer.h"
 #include "content/public/common/content_switches.h"
 #include "google_apis/gaia/gaia_urls.h"
 #include "net/url_request/test_url_fetcher_factory.h"
 
 namespace {
-  const char kNonSigninURL[] = "www.google.com";
+const char kNonSigninURL[] = "www.google.com";

[akalin, 2013/09/19 18:54:00]

const GURL

 }
 
 class SigninBrowserTest : public InProcessBrowserTest {
  public:
   virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
     https_server_.reset(new net::SpawnedTestServer(
         net::SpawnedTestServer::TYPE_HTTPS,
         net::SpawnedTestServer::kLocalhost,
         base::FilePath(FILE_PATH_LITERAL("chrome/test/data"))));
     ASSERT_TRUE(https_server_->Start());
 
     // Add a host resolver rule to map all outgoing requests to the test server.
     // This allows us to use "real" hostnames in URLs, which we can use to
     // create arbitrary SiteInstances.
     command_line->AppendSwitchASCII(
         switches::kHostResolverRules,
         "MAP * " + https_server_->host_port_pair().ToString() +
             ",EXCLUDE localhost");
     command_line->AppendSwitch(switches::kIgnoreCertificateErrors);
   }
 
   virtual void SetUp() OVERRIDE {
     factory_.reset(new net::URLFetcherImplFactory());
     fake_factory_.reset(new net::FakeURLFetcherFactory(factory_.get()));
-    fake_factory_->SetFakeResponseForURL(
+    fake_factory_->SetFakeResponse(
         GaiaUrls::GetInstance()->service_login_url(),
         std::string(),
         true);
-    fake_factory_->SetFakeResponse(kNonSigninURL, std::string(), true);
+    fake_factory_->SetFakeResponse(GURL(kNonSigninURL), std::string(), true);
     // Yield control back to the InProcessBrowserTest framework.
     InProcessBrowserTest::SetUp();
   }
 
   virtual void TearDown() OVERRIDE {
     if (fake_factory_.get()) {
       fake_factory_->ClearFakeResponses();
       fake_factory_.reset();
     }
 
@@ skipping 158 matching lines @@
   EXPECT_EQ(skip_url, web_contents->GetLastCommittedURL());
   EXPECT_EQ(ntp_url, web_contents->GetVisibleURL());
 
   content::WindowedNotificationObserver observer(
       content::NOTIFICATION_LOAD_STOP,
       content::NotificationService::AllSources());
   observer.Wait();
   EXPECT_EQ(start_url, web_contents->GetLastCommittedURL());
 }
 #endif  // CHROME_BROWSER_SIGNIN_SIGNIN_BROWSERTEST_H_