Replace --google-base-suggest-url and --instant-url with --google-base-url.

chrome/browser/autocomplete/autocomplete_controller.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 "chrome/browser/autocomplete/autocomplete_controller.h"
 
 #include <set>
 #include <string>
 
 #include "base/command_line.h"
@@ skipping 446 matching lines @@
     AutocompleteResult* result) {
   if (!keyword_provider_)
     return;
 
   std::set<string16> keywords;
   for (ACMatches::iterator match(result->begin()); match != result->end();
        ++match) {
     string16 keyword(match->GetSubstitutingExplicitlyInvokedKeyword(profile_));
     if (!keyword.empty()) {
       keywords.insert(keyword);
+      continue;
+    }
+    keyword = match->associated_keyword.get() ?
+        match->associated_keyword->keyword :
+        keyword_provider_->GetKeywordForText(match->fill_into_edit);
+
+    // Only add the keyword if the match does not have a duplicate keyword
+    // with a more relevant match.
+    if (!keyword.empty() && !keywords.count(keyword)) {
+      keywords.insert(keyword);
+
+      if (!match->associated_keyword.get())
+        match->associated_keyword.reset(new AutocompleteMatch(
+            keyword_provider_->CreateAutocompleteMatch(match->fill_into_edit,
+                keyword, input_)));
     } else {
-      string16 keyword = match->associated_keyword.get() ?
-          match->associated_keyword->keyword :
-          keyword_provider_->GetKeywordForText(match->fill_into_edit);
-
-      // Only add the keyword if the match does not have a duplicate keyword
-      // with a more relevant match.
-      if (!keyword.empty() && !keywords.count(keyword)) {
-        keywords.insert(keyword);
-
-        if (!match->associated_keyword.get())
-          match->associated_keyword.reset(new AutocompleteMatch(
-              keyword_provider_->CreateAutocompleteMatch(match->fill_into_edit,
-                  keyword, input_)));
-      } else {
-        match->associated_keyword.reset();
-      }
+      match->associated_keyword.reset();
     }
   }
 }
 
 void AutocompleteController::UpdateAssistedQueryStats(
     AutocompleteResult* result) {
   if (result->empty())
     return;
 
   // Build the impressions string (the AQS part after ".").
@@ skipping 152 matching lines @@
       !chrome::IsInstantEnabled(profile_))
 #endif
   {
     stop_timer_.Start(FROM_HERE,
                       base::TimeDelta::FromMilliseconds(kStopTimeMS),
                       base::Bind(&AutocompleteController::Stop,
                                  base::Unretained(this),
                                  false));
   }
 }