Misc. cleanup:

chrome/browser/ui/views/frame/browser_frame_win.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/ui/views/frame/browser_frame_win.h"
 
 #include <dwmapi.h>
 #include <shellapi.h>
 #include <set>
 
 #include "base/command_line.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/win/metro.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/lifetime/application_lifetime.h"
 #include "chrome/browser/profiles/profile.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/browser_commands.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/browser/ui/views/frame/browser_frame_common_win.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
 #include "chrome/browser/ui/views/frame/system_menu_insertion_delegate_win.h"
 #include "chrome/browser/ui/views/tabs/tab_strip.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_switches.h"
 #include "content/public/browser/browser_accessibility_state.h"
@@ skipping 429 matching lines @@
 
   if (!w_param && !l_param) {
     NOTREACHED() << "Invalid metro request parameters";
     return;
   }
 
   Browser* browser = browser_view()->browser();
   DCHECK(browser);
 
   GURL request_url;
-
   if (w_param) {
-    const wchar_t* url = reinterpret_cast<const wchar_t*>(w_param);
-    request_url = GURL(url);
+    request_url = GURL(reinterpret_cast<const wchar_t*>(w_param));
   } else if (l_param) {
-    const wchar_t* search_string =
-        reinterpret_cast<const wchar_t*>(l_param);
-    const TemplateURL* default_provider =
-        TemplateURLServiceFactory::GetForProfile(browser->profile())->
-        GetDefaultSearchProvider();
-    if (default_provider) {
-      const TemplateURLRef& search_url = default_provider->url_ref();
-      DCHECK(search_url.SupportsReplacement());
-      request_url = GURL(search_url.ReplaceSearchTerms(
-          TemplateURLRef::SearchTermsArgs(search_string)));
-    }
+    request_url = GetDefaultSearchURLForSearchTerms(
+        browser->profile(), reinterpret_cast<const wchar_t*>(l_param));

[Jered, 2013/06/28 21:57:28]

Keep the named temp for search terms.

[Peter Kasting, 2013/06/28 22:16:02]

Same question, you think that really buys much over just having the function
name?

[Jered, 2013/06/28 22:22:28]

I mostly like it for code search, so there's a line that says "search_terms =
l_param" somewhere. But this is a super nit so feel free to ignore it.

   }
   if (request_url.is_valid()) {
     browser->OpenURL(OpenURLParams(request_url, Referrer(), NEW_FOREGROUND_TAB,
                                    content::PAGE_TRANSITION_TYPED, false));
   }
 }
 
 void BrowserFrameWin::GetMetroCurrentTabInfo(WPARAM w_param) {
   if (!base::win::IsMetroProcess()) {
     NOTREACHED() << "Received unexpected metro request";
@@ skipping 43 matching lines @@
 
 ////////////////////////////////////////////////////////////////////////////////
 // NativeBrowserFrame, public:
 
 // static
 NativeBrowserFrame* NativeBrowserFrame::CreateNativeBrowserFrame(
     BrowserFrame* browser_frame,
     BrowserView* browser_view) {
   return new BrowserFrameWin(browser_frame, browser_view);
 }