Implement the Windows desktop search redirection feature.

With this CL, Windows desktop searches are redirected to the default
search engine when the DesktopSearchRedirection feature is enabled.
The first time that a desktop search is redirected, an infobar is
shown to inform the user of the redirection.

BUG=539963

Review URL: https://codereview.chromium.org/1598553003

Cr-Commit-Position: refs/heads/master@{#373049}
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
index 84d3ac39..d05d6dc 100644
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -81,7 +81,7 @@
 #endif
 
 #if defined(OS_WIN)
-#include "components/search_engines/desktop_search_win.h"
+#include "components/search_engines/desktop_search_utils.h"
 #endif  // defined(OS_WIN)
 
 #if defined(ENABLE_APP_LIST)
@@ -2058,7 +2058,7 @@
      IDS_FLAGS_WINDOWS_DESKTOP_SEARCH_REDIRECTION_NAME,
      IDS_FLAGS_WINDOWS_DESKTOP_SEARCH_REDIRECTION_DESCRIPTION,
      kOsWin,
-     FEATURE_VALUE_TYPE(kWindowsDesktopSearchRedirectionFeature)},
+     FEATURE_VALUE_TYPE(kDesktopSearchRedirectionFeature)},
 #endif  // defined(OS_WIN)
     {"force-ui-direction",
      IDS_FLAGS_FORCE_UI_DIRECTION_NAME,