Remove unused ImportProgressDialog.

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"
 #include "base/file_util.h"
 #include "base/lazy_instance.h"
 #include "base/message_loop.h"
 #include "base/metrics/histogram.h"
 #include "base/path_service.h"
 #include "base/prefs/pref_service.h"
 #include "base/stringprintf.h"
 #include "base/time.h"
 #include "base/utf_string_conversions.h"
 #include "build/build_config.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/updater/extension_updater.h"
 #include "chrome/browser/first_run/first_run_dialog.h"
-#include "chrome/browser/first_run/first_run_import_observer.h"
 #include "chrome/browser/first_run/first_run_internal.h"
 #include "chrome/browser/google/google_util.h"
 #include "chrome/browser/importer/external_process_importer_host.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/importer/importer_progress_observer.h"
 #include "chrome/browser/process_singleton.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/search_engines/template_url_service.h"
 #include "chrome/browser/search_engines/template_url_service_factory.h"
 #include "chrome/browser/shell_integration.h"
 #include "chrome/browser/signin/signin_manager.h"
 #include "chrome/browser/signin/signin_manager_factory.h"
 #include "chrome/browser/signin/signin_tracker.h"
 #include "chrome/browser/ui/browser.h"
@@ skipping 152 matching lines @@
     if (user_prefs->GetBoolean(pref_path))
       items |= import_type;
   } else { // no policy (recommended or managed) is set
     if (should_import)
       items |= import_type;
   }
 
   user_prefs->ClearPref(pref_path);
 }
 
 // Imports bookmarks from an html file. The path to the file is provided in

[cpu_(ooo_6.6-7.5), 2013/04/17 21:35:20]

is comment of line 202 correct?

[gab, 2013/04/18 14:51:56]

For now yes, this is currently provided on the command line of the import
process.

This will change as part of getting rid of the import process.

 // the command line.
-int ImportFromFile(Profile* profile, const CommandLine& cmdline) {
+void ImportFromFile(Profile* profile, const CommandLine& cmdline) {
   base::FilePath file_path =
       cmdline.GetSwitchValuePath(switches::kImportFromFile);
   if (file_path.empty()) {
     NOTREACHED();
-    return false;
+    return;
   }
   scoped_refptr<ImporterHost> importer_host(new ImporterHost);
   importer_host->set_headless();
 
   importer::SourceProfile source_profile;
   source_profile.importer_type = importer::TYPE_BOOKMARKS_FILE;
   source_profile.source_path = file_path;
 
-  FirstRunImportObserver importer_observer;
-  importer::ShowImportProgressDialog(importer::FAVORITES,
-                                     importer_host,
-                                     &importer_observer,
-                                     source_profile,
-                                     profile,
-                                     true);
-
-  importer_observer.RunLoop();
-  return importer_observer.import_result();
+  scoped_ptr<first_run::internal::ImportEndedObserver> observer(
+      new first_run::internal::ImportEndedObserver);
+  importer_host->SetObserver(observer.get());
+  importer_host->StartImportSettings(
+      source_profile, profile, importer::FAVORITES, 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();
+  }

[cpu_(ooo_6.6-7.5), 2013/04/17 21:35:20]

it seems the observer can be allocated in the stack?

[gab, 2013/04/18 14:51:56]

Definitely, also changed the call site this was copied from (note that this
copy/pasted code will all land in a common method in first_run.cc in
https://codereview.chromium.org/12670013).

 }
 
 GURL UrlFromString(const std::string& in) {
   return GURL(in);
 }
 
 void ConvertStringVectorToGURLVector(
     const std::vector<std::string>& src,
     std::vector<GURL>* ret) {
   ret->resize(src.size());
   std::transform(src.begin(), src.end(), ret->begin(), &UrlFromString);
 }
 
 }  // namespace
 
 namespace first_run {
 namespace internal {
 
 FirstRunState first_run_ = FIRST_RUN_UNKNOWN;
 
 static base::LazyInstance<base::FilePath> master_prefs_path_for_testing
     = LAZY_INSTANCE_INITIALIZER;
 
+// TODO(gab): This will go back inline above when it is moved to first_run.cc
+// (see TODO above), but needs to be separate for now to satisfy clang error:
+// "[chromium-style] virtual methods with non-empty bodies shouldn't be declared
+// inline".
+void ImportEndedObserver::ImportEnded() {
+  ended_ = true;
+  if (should_quit_message_loop_)
+    MessageLoop::current()->Quit();
+}
+
 installer::MasterPreferences*
     LoadMasterPrefs(base::FilePath* master_prefs_path) {
   if (!master_prefs_path_for_testing.Get().empty())
     *master_prefs_path = master_prefs_path_for_testing.Get();
   else
     *master_prefs_path = base::FilePath(MasterPrefsPath());
   if (master_prefs_path->empty())
     return NULL;
   installer::MasterPreferences* install_prefs =
       new installer::MasterPreferences(*master_prefs_path);
@@ skipping 125 matching lines @@
 #if !defined(OS_LINUX) && !defined(OS_BSD)
 bool IsOrganicFirstRun() {
   std::string brand;
   google_util::GetBrand(&brand);
   return google_util::IsOrganicFirstRun(brand);
 }
 #endif
 
 int ImportBookmarkFromFileIfNeeded(Profile* profile,
                                    const CommandLine& cmdline) {
-  int return_code = true;
   if (cmdline.HasSwitch(switches::kImportFromFile)) {
     // Silently import preset bookmarks from file.
     // This is an OEM scenario.
-    return_code = ImportFromFile(profile, cmdline);
+    ImportFromFile(profile, cmdline);
   }
-  return return_code;
+  // ImportBookmarkFromFileIfNeeded() will go away as part of
+  // http://crbug.com/219419, so it is fine to hardcode |true| for now.
+  return true;
 }
 
 }  // namespace internal
 }  // namespace first_run
 
 namespace first_run {
 
 MasterPrefs::MasterPrefs()
     : ping_delay(0),
       homepage_defined(false),
@@ skipping 383 matching lines @@
   internal::DoPostImportPlatformSpecificTasks();
 }
 
 bool DidPerformProfileImport(bool* exited_successfully) {
   if (exited_successfully)
     *exited_successfully = profile_import_exited_successfully;
   return did_perform_profile_import;
 }
 
 }  // namespace first_run