Reland "Add option to import from bookmarks html file to ...""

chrome/browser/first_run/first_run_browsertest.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 "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/memory/ref_counted.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 128 matching lines @@
 int MaskExpectedImportState(int expected_import_state) {
   scoped_refptr<ImporterList> importer_list(new ImporterList());
   importer_list->DetectSourceProfilesHack(
       g_browser_process->GetApplicationLocale());
   int source_profile_count = importer_list->count();
 #if defined(OS_WIN)
   // On Windows, the importer's DetectIEProfiles() will always add to the count.
   // Internet Explorer always exists and always has something to import.
   EXPECT_GT(source_profile_count, 0);
 #endif
-  if (source_profile_count == 0)
+  if (source_profile_count == 1)

[gab, 2013/09/17 22:06:00]

This is wrong, as mentioned in another comment, AutoImport should *never* import
from bookmarks file.

     return expected_import_state & ~first_run::AUTO_IMPORT_PROFILE_IMPORTED;
 
   return expected_import_state;
 }
 
 }  // namespace
 
 extern const char kImportDefault[] =
     "{\n"
     "}\n";
@@ skipping 44 matching lines @@
                        ImportNothingAndShowNewTabPage) {
   EXPECT_EQ(first_run::AUTO_IMPORT_CALLED, first_run::auto_import_state());
   ui_test_utils::NavigateToURLWithDisposition(
       browser(), GURL(chrome::kChromeUINewTabURL), CURRENT_TAB,
       ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
   content::WebContents* tab = browser()->tab_strip_model()->GetWebContentsAt(0);
   EXPECT_EQ(1, tab->GetMaxPageID());
 }
 
 #endif  // !defined(OS_CHROMEOS)