More misc. cleanups to minimize future refactoring diffs.

chrome/browser/instant/instant_browsertest.cc

 // Copyright (c) 2012 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 "base/command_line.h"
 #include "base/string_util.h"
 #include "base/stringprintf.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/autocomplete/autocomplete_edit.h"
 #include "chrome/browser/content_settings/host_content_settings_map.h"
@@ skipping 261 matching lines @@
   EXPECT_TRUE(instant()->IsCurrent());
   EXPECT_EQ("defghi", UTF16ToUTF8(omnibox()->GetText()));
 
   // Make sure the URL that will get committed when we press <Enter> matches
   // that of the default search provider.
   const TemplateURL* default_turl =
       TemplateURLServiceFactory::GetForProfile(browser()->profile())->
       GetDefaultSearchProvider();
   EXPECT_TRUE(default_turl);
   EXPECT_EQ(default_turl->url_ref().ReplaceSearchTerms(ASCIIToUTF16("defghi"),
-      0, string16()), loader()->url().spec());
+                TemplateURLRef::NO_SUGGESTIONS_AVAILABLE, string16()),
+            loader()->url().spec());
 
   // Check that the value is reflected and onchange is called.
   EXPECT_EQ("true 0 0 1 true d false def false 3 3",
             GetSearchStateAsString(preview()->web_contents(), false));
 }
 
 // Verify that the onsubmit event is dispatched upon pressing <Enter>.
 IN_PROC_BROWSER_TEST_F(InstantTest, MAYBE(OnSubmitEvent)) {
   ASSERT_TRUE(test_server()->Start());
   EnableInstant();
@@ skipping 703 matching lines @@
   // Press <Enter> in the omnibox, causing the preview to be committed.
   WebContents* preview_tab = preview()->web_contents();
   ASSERT_TRUE(PressEnter());
 
   // The preview contents should now be the active tab contents.
   EXPECT_FALSE(preview());
   EXPECT_FALSE(instant()->is_displayable());
   EXPECT_FALSE(instant()->IsCurrent());
   EXPECT_EQ(preview_tab, browser()->GetSelectedWebContents());
 }