Misc. cleanup:

chrome/browser/metro_viewer/chrome_metro_viewer_process_host_aurawin.cc

Index: chrome/browser/metro_viewer/chrome_metro_viewer_process_host_aurawin.cc
===================================================================
--- chrome/browser/metro_viewer/chrome_metro_viewer_process_host_aurawin.cc	(revision 208964)
+++ chrome/browser/metro_viewer/chrome_metro_viewer_process_host_aurawin.cc	(working copy)
@@ -9,9 +9,7 @@
 #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"
@@ -105,15 +103,8 @@
 
 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);
 }