Implement the Windows desktop search redirection feature.

chrome/browser/ui/startup/startup_browser_creator.h

Index: chrome/browser/ui/startup/startup_browser_creator.h
diff --git a/chrome/browser/ui/startup/startup_browser_creator.h b/chrome/browser/ui/startup/startup_browser_creator.h
index c879683bafd6e28f5a268108bb91d0f06684116e..3c77339c3cf08b2c9bd961da795554f6a6b23f01 100644
--- a/chrome/browser/ui/startup/startup_browser_creator.h
+++ b/chrome/browser/ui/startup/startup_browser_creator.h
@@ -99,6 +99,10 @@ class StartupBrowserCreator {
     return show_main_browser_window_;
   }
 
+  bool show_desktop_search_redirection_infobar() const {
+    return show_desktop_search_redirection_infobar_;
+  }
+
   // For faking that no profiles have been launched yet.
   static void ClearLaunchedProfilesForTesting();
 
@@ -133,15 +137,17 @@ class StartupBrowserCreator {
                            ReadingWasRestartedAfterRestart);
   FRIEND_TEST_ALL_PREFIXES(StartupBrowserCreatorTest, UpdateWithTwoProfiles);
   FRIEND_TEST_ALL_PREFIXES(StartupBrowserCreatorTest, LastUsedProfileActivated);
-  FRIEND_TEST_ALL_PREFIXES(StartupBrowserCreatorWinTest,
-                           GetURLsFromCommandLineWithDesktopSearchURL);
 
-  // Returns the list of URLs to open from the command line. The returned
-  // vector is empty if the user didn't specify any URLs on the command line.
+  // Returns the list of URLs to open from the command line. The returned vector
+  // is empty if the user didn't specify any URLs on the command line.
+  // |show_search_redirection_infobar| is set to true if an infobar should be
+  // shown to inform the user that a desktop search has been redirected to the
+  // default search engine.
   static std::vector<GURL> GetURLsFromCommandLine(
       const base::CommandLine& command_line,
       const base::FilePath& cur_dir,
-      Profile* profile);
+      Profile* profile,
+      bool* show_desktop_search_redirection_infobar);
 
   static bool ProcessCmdLineImpl(const base::CommandLine& command_line,
                                  const base::FilePath& cur_dir,
@@ -183,6 +189,10 @@ class StartupBrowserCreator {
   // created. Default is true.
   bool show_main_browser_window_;
 
+  // Whether an infobar should be shown to inform the user that a desktop search
+  // has been redirected to the default search engine.
+  bool show_desktop_search_redirection_infobar_;
+
   // True if we have already read and reset the preference kWasRestarted. (A
   // member variable instead of a static variable inside WasRestarted because
   // of testing.)