Add a preference to control Windows desktop search redirection.

chrome/browser/ui/startup/startup_browser_creator.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/startup/startup_browser_creator.h"
 
 #include <algorithm>   // For max().
 #include <set>
 
 #include "apps/app_load_service.h"
@@ skipping 74 matching lines @@
 #if defined(TOOLKIT_VIEWS) && defined(OS_LINUX)
 #include "ui/events/devices/x11/touch_factory_x11.h"
 #endif
 
 #if defined(OS_MACOSX)
 #include "chrome/browser/web_applications/web_app_mac.h"
 #endif
 
 #if defined(OS_WIN)
 #include "chrome/browser/metrics/jumplist_metrics_win.h"
-#include "components/search_engines/detect_desktop_search_win.h"
-#include "components/search_engines/search_engines_switches.h"
+#include "components/search_engines/desktop_search_win.h"
 #endif
 
 #if defined(ENABLE_PRINT_PREVIEW)
 #include "chrome/browser/printing/cloud_print/cloud_print_proxy_service.h"
 #include "chrome/browser/printing/cloud_print/cloud_print_proxy_service_factory.h"
 #include "chrome/browser/printing/print_dialog_cloud.h"
 #endif
 
 using content::BrowserThread;
 using content::ChildProcessSecurityPolicy;
@@ skipping 439 matching lines @@
 
     // Otherwise, fall through to treating it as a URL.
 
     // This will create a file URL or a regular URL.
     // This call can (in rare circumstances) block the UI thread.
     // Allow it until this bug is fixed.
     //  http://code.google.com/p/chromium/issues/detail?id=60641
     GURL url = GURL(param.MaybeAsASCII());
 
 #if defined(OS_WIN)
-    if (command_line.HasSwitch(
-            switches::kUseDefaultSearchProviderForDesktopSearch)) {
+    if (ShouldRedirectWindowsDesktopSearchToDefaultSearchEngine(
+            profile->GetPrefs())) {
       TemplateURLService* template_url_service =
           TemplateURLServiceFactory::GetForProfile(profile);
       DCHECK(template_url_service);
       base::string16 search_terms;
       if (DetectWindowsDesktopSearch(
               url, template_url_service->search_terms_data(), &search_terms)) {
-        GURL search_url(GetDefaultSearchURLForSearchTerms(template_url_service,
-                                                          search_terms));
+        const GURL search_url(GetDefaultSearchURLForSearchTerms(
+            template_url_service, search_terms));
         if (search_url.is_valid()) {
           urls.push_back(search_url);
           continue;
         }
       }
     }
 #endif  // defined(OS_WIN)
 
     // http://crbug.com/371030: Only use URLFixerUpper if we don't have a valid
     // URL, otherwise we will look in the current directory for a file named
@@ skipping 353 matching lines @@
   // If we are showing the app list then chrome isn't shown so load the app
   // list's profile rather than chrome's.
   if (command_line.HasSwitch(switches::kShowAppList)) {
     return AppListService::Get(chrome::HOST_DESKTOP_TYPE_NATIVE)->
         GetProfilePath(user_data_dir);
   }
 
   return g_browser_process->profile_manager()->GetLastUsedProfileDir(
       user_data_dir);
 }