Consolidate TestURLFetcherFactory::SetFakeResponse

chrome/browser/ui/search/instant_extended_interactive_uitest.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.
 
 #include <sstream>
 
 #include "base/command_line.h"
 #include "base/metrics/histogram_base.h"
 #include "base/metrics/histogram_samples.h"
 #include "base/metrics/statistics_recorder.h"
@@ skipping 1165 matching lines @@
   content::WebContents* active_tab =
       browser()->tab_strip_model()->GetActiveWebContents();
   ASSERT_THAT(active_tab->GetURL().spec(), HasSubstr("q=flowers"));
   ASSERT_TRUE(UpdateSearchState(active_tab));
   ASSERT_EQ(0, submit_count_);
 
   // Typed in a search URL "by hand".
   content::WindowedNotificationObserver observer_2(
       chrome::NOTIFICATION_INSTANT_TAB_SUPPORT_DETERMINED,
       content::NotificationService::AllSources());
-  SetOmniboxText(instant_url().spec() + "#q=puppies");
+  SetOmniboxText(instant_url().Resolve("#q=puppies").spec());
   PressEnterAndWaitForNavigation();
   observer_2.Wait();
 
   // Should not have reused the tab.
   active_tab = browser()->tab_strip_model()->GetActiveWebContents();
   ASSERT_THAT(active_tab->GetURL().spec(), HasSubstr("q=puppies"));
 }
 
 IN_PROC_BROWSER_TEST_F(InstantExtendedTest, OmniboxMarginSetForSearchURLs) {
   ASSERT_NO_FATAL_FAILURE(SetupInstant(browser()));
@@ skipping 502 matching lines @@
       CURRENT_TAB,
       ui_test_utils::BROWSER_TEST_NONE);
   new_tab_observer.Wait();
 
   omnibox()->model()->autocomplete_controller()->search_provider()->
       kMinimumTimeBetweenSuggestQueriesMs = 0;
 
   // Set the fake response for suggest request. Response has prefetch details.
   // Ensure that the page received the prefetch query.
   fake_factory()->SetFakeResponse(
-      instant_url().spec() + "#q=pupp",
+      instant_url().Resolve("#q=pupp"),
       "[\"pupp\",[\"puppy\", \"puppies\"],[],[],"
       "{\"google:clientdata\":{\"phi\": 0},"
           "\"google:suggesttype\":[\"QUERY\", \"QUERY\"],"
           "\"google:suggestrelevance\":[1400, 9]}]",
       true);
 
   SetOmniboxText("pupp");
   while (!omnibox()->model()->autocomplete_controller()->done()) {
     content::WindowedNotificationObserver ready_observer(
         chrome::NOTIFICATION_AUTOCOMPLETE_CONTROLLER_RESULT_READY,
@@ skipping 25 matching lines @@
       ui_test_utils::BROWSER_TEST_NONE);
   new_tab_observer.Wait();
 
   omnibox()->model()->autocomplete_controller()->search_provider()->
       kMinimumTimeBetweenSuggestQueriesMs = 0;
 
   // Set the fake response for suggest request. Response has no prefetch
   // details. Ensure that the page received a blank query to clear the
   // prefetched results.
   fake_factory()->SetFakeResponse(
-      instant_url().spec() + "#q=dogs",
+      instant_url().Resolve("#q=dogs"),
       "[\"dogs\",[\"https://dogs.com\"],[],[],"
           "{\"google:suggesttype\":[\"NAVIGATION\"],"
           "\"google:suggestrelevance\":[2]}]",
       true);
 
   SetOmniboxText("dogs");
   while (!omnibox()->model()->autocomplete_controller()->done()) {
     content::WindowedNotificationObserver ready_observer(
         chrome::NOTIFICATION_AUTOCOMPLETE_CONTROLLER_RESULT_READY,
         content::Source<AutocompleteController>(
@@ skipping 30 matching lines @@
   EXPECT_EQ(ASCIIToUTF16("foo"), omnibox()->GetText());
 
   // Calling ShowURL() should disable search term replacement and show the URL.
   omnibox()->ShowURL();
   EXPECT_FALSE(browser()->toolbar_model()->WouldPerformSearchTermReplacement(
       false));
   // Don't bother looking for a specific URL; ensuring we're no longer showing
   // the search terms is sufficient.
   EXPECT_NE(ASCIIToUTF16("foo"), omnibox()->GetText());
 }