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

chrome/browser/android/provider/chrome_browser_provider.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/android/provider/chrome_browser_provider.h"
 
 #include <list>
 #include <utility>
 
 #include "base/android/jni_android.h"
@@ skipping 876 matching lines @@
     DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
     TemplateURLService* template_service =
         TemplateURLServiceFactory::GetForProfile(profile_);
     template_service->Load();
 
     const TemplateURL* search_engine =
         template_service->GetDefaultSearchProvider();
     if (search_engine) {
       const TemplateURLRef* search_url = &search_engine->url_ref();
-      std::string url = search_url->ReplaceSearchTerms(
-                     TemplateURLRef::SearchTermsArgs(row->search_term()));
+      TemplateURLRef::SearchTermsArgs search_terms_args(row->search_term());
+      search_terms_args.append_extra_query_params = true;
+      std::string url = search_url->ReplaceSearchTerms(search_terms_args);
       if (!url.empty()) {
         row->set_url(GURL(url));
         row->set_template_url_id(search_engine->id());
       }
     }
   }
 
  private:
   Profile* profile_;
 
@@ skipping 694 matching lines @@
       chrome::NOTIFICATION_HISTORY_KEYWORD_SEARCH_TERM_UPDATED) {
     JNIEnv* env = AttachCurrentThread();
     ScopedJavaLocalRef<jobject> obj = weak_java_provider_.get(env);
     if (obj.is_null())
       return;
     Java_ChromeBrowserProvider_onSearchTermChanged(env, obj.obj());
   } else if (type == chrome::NOTIFICATION_TEMPLATE_URL_SERVICE_LOADED) {
     template_loaded_event_.Signal();
   }
 }