Capture the exit status of the first-run AutoImport and make it available to tests.

chrome/browser/first_run/first_run.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/first_run/first_run.h"
 
 #include <algorithm>
 
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
@@ skipping 47 matching lines @@
 #include "googleurl/src/gurl.h"
 
 using content::UserMetricsAction;
 
 namespace {
 
 // Flags for functions of similar name.
 bool should_show_welcome_page_ = false;
 bool should_do_autofill_personal_data_manager_first_run_ = false;
 
+// Flags indicating whether a first-run profile auto import was performed, and
+// whether the importer process exited successfully.
+bool did_perform_profile_import = false;
+bool profile_import_exited_successfully = false;
+
 // Helper class that performs delayed first-run tasks that need more of the
 // chrome infrastructure to be up and running before they can be attempted.
 class FirstRunDelayedTasks : public content::NotificationObserver {
  public:
   enum Tasks {
     NO_TASK,
     INSTALL_EXTENSIONS
   };
 
   explicit FirstRunDelayedTasks(Tasks task) {
@@ skipping 610 matching lines @@
                   dont_import_items,
                   importer::SEARCH_ENGINES,
                   items);
     SetImportItem(user_prefs,
                   prefs::kImportBookmarks,
                   import_items,
                   dont_import_items,
                   importer::FAVORITES,
                   items);
 
-    internal::ImportSettings(profile, importer_host, importer_list, items);
+    profile_import_exited_successfully =
+        internal::ImportSettings(profile, importer_host, importer_list, items);
+    DCHECK(profile_import_exited_successfully);
   }
 
   content::RecordAction(UserMetricsAction("FirstRunDef_Accept"));
 
   process_singleton->Unlock();
   first_run::CreateSentinel();
 #endif  // !defined(USE_AURA)
+  did_perform_profile_import = true;
 }
 
 void DoPostImportTasks(Profile* profile, bool make_chrome_default) {
   if (make_chrome_default &&
       ShellIntegration::CanSetAsDefaultBrowser() ==
           ShellIntegration::SET_DEFAULT_UNATTENDED) {
     ShellIntegration::SetAsDefaultBrowser();
   }
 
 #if !defined(USE_AURA)
@@ skipping 12 matching lines @@
       TemplateURLServiceFactory::GetForProfile(profile);
   if (template_url && template_url->GetDefaultSearchProvider())
     FirstRunBubbleLauncher::ShowFirstRunBubbleSoon();
   SetShouldShowWelcomePage();
   SetShouldDoPersonalDataManagerFirstRun();
 #endif  // !defined(USE_AURA)
 
   internal::DoPostImportPlatformSpecificTasks();
 }
 
+bool DidPerformProfileImport(bool* exited_successfully) {
+  if (exited_successfully)
+    *exited_successfully = profile_import_exited_successfully;
+  return did_perform_profile_import;
+}
+
 }  // namespace first_run