Revert 201837 "OOP import on Windows."

trunk/src/chrome/browser/first_run/first_run.h

 // 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.
 
 #ifndef CHROME_BROWSER_FIRST_RUN_FIRST_RUN_H_
 #define CHROME_BROWSER_FIRST_RUN_FIRST_RUN_H_
 
 #include <string>
 #include <vector>
 
@@ skipping 21 matching lines @@
 // fully test the custom installer. It also contains the opposite actions to
 // execute during uninstall. When the first run UI is ready we won't
 // do the actions unconditionally. Currently the only action is to create a
 // desktop shortcut.
 //
 // The way we detect first-run is by looking at a 'sentinel' file.
 // If it does not exist we understand that we need to do the first time
 // install work for this user. After that the sentinel file is created.
 namespace first_run {
 
-enum AutoImportState {
-  AUTO_IMPORT_NONE = 0,
-  AUTO_IMPORT_CALLED = 1 << 0,
-  AUTO_IMPORT_PROFILE_IMPORTED = 1 << 1,
-  AUTO_IMPORT_BOOKMARKS_FILE_IMPORTED = 1 << 2,
-};
-
 enum FirstRunBubbleMetric {
   FIRST_RUN_BUBBLE_SHOWN = 0,       // The search engine bubble was shown.
   FIRST_RUN_BUBBLE_CHANGE_INVOKED,  // The bubble's "Change" was invoked.
   NUM_FIRST_RUN_BUBBLE_METRICS
 };
 
 // Options for the first run bubble. The default is FIRST_RUN_BUBBLE_DONT_SHOW.
 // FIRST_RUN_BUBBLE_SUPPRESS is stronger in that FIRST_RUN_BUBBLE_SHOW should
 // never be set once FIRST_RUN_BUBBLE_SUPPRESS is set.
 enum FirstRunBubbleOptions {
@@ skipping 18 matching lines @@
   // dumped into local_state. Also see related TODO in chrome_browser_main.cc.
 
   int ping_delay;
   bool homepage_defined;
   int do_import_items;
   int dont_import_items;
   bool make_chrome_default;
   bool suppress_first_run_default_browser_prompt;
   std::vector<GURL> new_tabs;
   std::vector<GURL> bookmarks;
-  std::string import_bookmarks_path;
   std::string variations_seed;
   std::string suppress_default_browser_prompt_for_version;
 };
 
 // Returns true if this is the first time chrome is run for this user.
 bool IsChromeFirstRun();
 
 // Creates the sentinel file that signals that chrome has been configured.
 bool CreateSentinel();
 
@@ skipping 33 matching lines @@
 // Returns true if the autofill personal data manager first-run action
 // should be taken.
 //
 // This will return true only once, the first time it is called after
 // SetShouldDoPersonalDataManagerFirstRun() is called.
 bool ShouldDoPersonalDataManagerFirstRun();
 
 // Log a metric for the "FirstRun.SearchEngineBubble" histogram.
 void LogFirstRunMetric(FirstRunBubbleMetric metric);
 
+// Allow a test to specify additional arguments for the profile import process.
+void SetExtraArgumentsForImportProcess(const CommandLine& arguments);
+
+// Get any extra arguments set with SetExtraArgumentsForImportProcess.
+const CommandLine& GetExtraArgumentsForImportProcess();
+
+// -- Platform-specific functions --
+
 // Automatically import history and home page (and search engine, if
-// ShouldShowSearchEngineDialog is true). Also imports bookmarks from file if
-// |import_bookmarks_path| is not empty.
+// ShouldShowSearchEngineDialog is true).
 void AutoImport(Profile* profile,
                 bool homepage_defined,
                 int import_items,
-                int dont_import_items,
-                const std::string& import_bookmarks_path);
+                int dont_import_items);
 
 // Does remaining first run tasks for |profile| and makes Chrome default browser
 // if |make_chrome_default|. This can pop the first run consent dialog on linux.
 void DoPostImportTasks(Profile* profile, bool make_chrome_default);
 
-// Returns the current state of AutoImport as recorded in a bitfield formed from
-// values in AutoImportState.
-uint16 auto_import_state();
+// Whether a first-run import was triggered before the browser mainloop began.
+// This is used in testing to verify import startup actions that occur before
+// an observer can be registered in the test.
+bool DidPerformProfileImport(bool* exited_successfully);
+
+// Imports bookmarks and/or browser items (depending on platform support)
+// in this process. This function is paired with first_run::ImportSettings().
+// This function might or might not show a visible UI depending on the
+// cmdline parameters.
+int ImportNow(Profile* profile, const CommandLine& cmdline);
 
 // Set a master preferences file path that overrides platform defaults.
 void SetMasterPrefsPathForTesting(const base::FilePath& master_prefs);
 
 // The master preferences is a JSON file with the same entries as the
 // 'Default\Preferences' file. This function locates this file from a standard
 // location and processes it so it becomes the default preferences in the
 // profile pointed to by |user_data_dir|. After processing the file, the
 // function returns a value from the ProcessMasterPreferencesResult enum,
 // indicating whether the first run flow should be shown, skipped, or whether
@@ skipping 26 matching lines @@
                        const content::NotificationDetails& details) OVERRIDE;
 
   content::NotificationRegistrar registrar_;
 
   DISALLOW_COPY_AND_ASSIGN(FirstRunBubbleLauncher);
 };
 
 }  // namespace first_run
 
 #endif  // CHROME_BROWSER_FIRST_RUN_FIRST_RUN_H_