Add a preference to control Windows desktop search redirection.

chrome/browser/about_flags.cc

Index: chrome/browser/about_flags.cc
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
index 3216eb2784dc5b4f3b696f4f87139f42745d43ff..7279b305b9709b7b58672747fdffc763a04596ea 100644
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -92,6 +92,10 @@
 #include "ui/ozone/public/ozone_switches.h"
 #endif
 
+#if defined(OS_WIN)
+#include "components/search_engines/desktop_search_win.h"
+#endif  // defined(OS_WIN)

[Peter Kasting, 2015/12/03 05:41:39]

Nit: I suggest grouping together OS_, USE_, and ENABLE_ groups of ifdefs; right
now the order is arbitrary.

[fdoray, 2015/12/03 17:16:17]

Done.

+
 using flags_ui::FeatureEntry;
 using flags_ui::kOsMac;
 using flags_ui::kOsWin;
@@ -2067,6 +2071,13 @@ const FeatureEntry kFeatureEntries[] = {
          autofill::switches::kEnableOfferUploadCreditCards,
          autofill::switches::kDisableOfferUploadCreditCards)},
 #endif  // defined(TOOLKIT_VIEWS)
+#if defined(OS_WIN)
+    {"enable-windows-desktop-search-redirection",
+     IDS_FLAGS_WINDOWS_DESKTOP_SEARCH_REDIRECTION_NAME,
+     IDS_FLAGS_WINDOWS_DESKTOP_SEARCH_REDIRECTION_DESCRIPTION,
+     kOsWin,
+     FEATURE_VALUE_TYPE(kWindowsDesktopSearchRedirectionFeature)},
+#endif  // defined(OS_WIN)
     // NOTE: Adding new command-line switches requires adding corresponding
     // entries to enum "LoginCustomFlags" in histograms.xml. See note in
     // histograms.xml and don't forget to run AboutFlagsHistogramTest unit test.