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

chrome/browser/profiles/profile_manager.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 <set>
 
 #include "chrome/browser/profiles/profile_manager.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
@@ skipping 59 matching lines @@
 #include "chrome/browser/chromeos/login/user_manager.h"
 #include "chromeos/dbus/cryptohome_client.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #endif
 
 using content::BrowserThread;
 using content::UserMetricsAction;
 
 namespace {
 
-static bool did_perform_profile_import = false;
-
 // Profiles that should be deleted on shutdown.
 std::vector<base::FilePath>& ProfilesToDelete() {
   CR_DEFINE_STATIC_LOCAL(std::vector<base::FilePath>, profiles_to_delete, ());
   return profiles_to_delete;
 }
 
 // Simple task to log the size of the current profile.
 void ProfileSizeTask(const base::FilePath& path, int extension_count) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
 
@@ skipping 562 matching lines @@
     }
   }
 }
 
 // static
 bool ProfileManager::IsImportProcess(const CommandLine& command_line) {
   return (command_line.HasSwitch(switches::kImport) ||
           command_line.HasSwitch(switches::kImportFromFile));
 }
 
-// static
-bool ProfileManager::DidPerformProfileImport() {
-  return did_perform_profile_import;
-}
-
 void ProfileManager::SetWillImport() {
   will_import_ = true;
 }
 
 void ProfileManager::OnImportFinished(Profile* profile) {
   will_import_ = false;
-  did_perform_profile_import = true;
   DCHECK(profile);
 
 #if !defined(OS_CHROMEOS)
   // If the import process was not run, it means this branch was not called,
   // and it was handled by ProfileImpl::DoFinalInit().
   BookmarkModel* model = BookmarkModelFactory::GetForProfile(profile);
   model->AddObserver(new BookmarkModelLoadedObserver(profile));
 #endif
 
   content::NotificationService::current()->Notify(
@@ skipping 420 matching lines @@
 ProfileManager::ProfileInfo::ProfileInfo(
     Profile* profile,
     bool created)
     : profile(profile),
       created(created) {
 }
 
 ProfileManager::ProfileInfo::~ProfileInfo() {
   ProfileDestroyer::DestroyProfileWhenAppropriate(profile.release());
 }