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

chrome/browser/metro_viewer/chrome_metro_viewer_process_host_aurawin.cc

 // Copyright 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/metro_viewer/chrome_metro_viewer_process_host_aurawin.h"
 
 #include "base/logging.h"
 #include "base/memory/ref_counted.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/browser_process_platform_part_aurawin.h"
 #include "chrome/browser/profiles/profile_manager.h"
-#include "chrome/browser/search_engines/template_url.h"
-#include "chrome/browser/search_engines/template_url_service.h"
-#include "chrome/browser/search_engines/template_url_service_factory.h"
+#include "chrome/browser/search_engines/util.h"
 #include "chrome/browser/ui/ash/ash_init.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/host_desktop.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/notification_service.h"
@@ skipping 73 matching lines @@
       content::NotificationService::AllSources(),
       content::NotificationService::NoDetails());
 }
 
 void ChromeMetroViewerProcessHost::OnOpenURL(const string16& url) {
   OpenURL(GURL(url));
 }
 
 void ChromeMetroViewerProcessHost::OnHandleSearchRequest(
     const string16& search_string) {
-  const TemplateURL* default_provider =
-      TemplateURLServiceFactory::GetForProfile(
-          ProfileManager::GetDefaultProfileOrOffTheRecord())->
-              GetDefaultSearchProvider();
-  if (default_provider) {
-    const TemplateURLRef& search_url = default_provider->url_ref();
-    DCHECK(search_url.SupportsReplacement());
-    GURL request_url = GURL(search_url.ReplaceSearchTerms(
-        TemplateURLRef::SearchTermsArgs(search_string)));
-    OpenURL(request_url);
-  }
+  GURL url(GetDefaultSearchURLForSearchTerms(
+      ProfileManager::GetDefaultProfileOrOffTheRecord(), search_string));
+  if (url.is_valid())
+    OpenURL(url);
 }