Remove unused ImportProgressDialog.

chrome/browser/first_run/first_run_win.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 <windows.h>
 #include <shellapi.h>
 #include <shlobj.h>
 
 #include "base/callback.h"
 #include "base/environment.h"
 #include "base/file_util.h"
 #include "base/files/file_path.h"
 #include "base/path_service.h"
 #include "base/prefs/pref_service.h"
 #include "base/process_util.h"
 #include "base/stringprintf.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_split.h"
 #include "base/threading/sequenced_worker_pool.h"
 #include "base/time.h"
 #include "base/utf_string_conversions.h"
 #include "base/win/metro.h"
 #include "base/win/object_watcher.h"
 #include "base/win/windows_version.h"
 #include "chrome/browser/browser_process.h"
-#include "chrome/browser/first_run/first_run_import_observer.h"
 #include "chrome/browser/first_run/first_run_internal.h"
 #include "chrome/browser/importer/importer_host.h"
 #include "chrome/browser/importer/importer_list.h"
-#include "chrome/browser/importer/importer_progress_dialog.h"
 #include "chrome/browser/process_singleton.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/shell_integration.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_result_codes.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/worker_thread_ticker.h"
 #include "chrome/installer/util/browser_distribution.h"
@@ skipping 233 matching lines @@
       !base::StringToInt(parts[1], options) ||
       !base::StringToInt(parts[2], &skip_first_run_ui_int))
     return false;
   *skip_first_run_ui = !!skip_first_run_ui_int;
   return true;
 }
 
 #if !defined(USE_AURA)
 // Imports browser items in this process. The browser and the items to
 // import are encoded in the command line.
-int ImportFromBrowser(Profile* profile,
+bool ImportFromBrowser(Profile* profile,
                       const CommandLine& cmdline) {
   std::string import_info = cmdline.GetSwitchValueASCII(switches::kImport);
   if (import_info.empty()) {
     NOTREACHED();
     return false;
   }
   int importer_type = 0;
   int items_to_import = 0;
   bool skip_first_run_ui = false;
   if (!DecodeImportParams(import_info, &importer_type, &items_to_import,
                           &skip_first_run_ui)) {
     NOTREACHED();
     return false;
   }
   scoped_refptr<ImporterHost> importer_host(new ImporterHost);
-  FirstRunImportObserver importer_observer;
 
   scoped_refptr<ImporterList> importer_list(new ImporterList(NULL));
   importer_list->DetectSourceProfilesHack();
 
   // If |skip_first_run_ui|, we run in headless mode.  This means that if
   // there is user action required the import is automatically canceled.
   if (skip_first_run_ui)
     importer_host->set_headless();
 
-  importer::ShowImportProgressDialog(static_cast<uint16>(items_to_import),
-      importer_host, &importer_observer,
+  scoped_ptr<first_run::internal::ImportEndedObserver> observer(
+      new first_run::internal::ImportEndedObserver);
+  importer_host->SetObserver(observer.get());
+  importer_host->StartImportSettings(
       importer_list->GetSourceProfileForImporterType(importer_type), profile,
-      true);
-  importer_observer.RunLoop();
-  return importer_observer.import_result();
+      static_cast<uint16>(items_to_import), new ProfileWriter(profile), true);
+  // If the import process has not errored out, block on it.
+  if (!observer->ended()) {
+    observer->set_should_quit_message_loop();
+    MessageLoop::current()->Run();
+  }
+  // TODO(gab): This method will be go away as part of http://crbug.com/219419/,
+  // so it is fine to hardcode |true| here for now.
+  return true;
 }
 #endif  // !defined(USE_AURA)
 
 bool ImportSettingsWin(Profile* profile,
                        int importer_type,
                        int items_to_import,
                        const base::FilePath& import_bookmarks_path,
                        bool skip_first_run_ui) {
   if (!items_to_import && import_bookmarks_path.empty()) {
     return true;
@@ skipping 182 matching lines @@
 
 base::FilePath MasterPrefsPath() {
   // The standard location of the master prefs is next to the chrome binary.
   base::FilePath master_prefs;
   if (!PathService::Get(base::DIR_EXE, &master_prefs))
     return base::FilePath();
   return master_prefs.AppendASCII(installer::kDefaultMasterPrefs);
 }
 
 }  // namespace first_run