Update AutoImport to import nothing by default (in absence of policy and master_prefs).

chrome/browser/chrome_browser_main.cc

Index: chrome/browser/chrome_browser_main.cc
diff --git a/chrome/browser/chrome_browser_main.cc b/chrome/browser/chrome_browser_main.cc
index e5d0da76330ff5e30f18f2e927d39a7c47222f38..fe686431d29c0f5b8b21b3a7347098b0498f07b1 100644
--- a/chrome/browser/chrome_browser_main.cc
+++ b/chrome/browser/chrome_browser_main.cc
@@ -1681,23 +1681,7 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() {
   // preferences are registered, since some of the code that the importer
   // touches reads preferences.
   if (first_run::IsChromeFirstRun()) {
-    // By default Auto Import is performed on first run.
-    bool auto_import = true;
-
-#if defined(OS_WIN)
-    // Auto Import might be disabled via a field trial.  However, this field
-    // trial is not intended to affect enterprise users.
-    auto_import =
-        base::win::IsEnterpriseManaged() ||
-        !base::FeatureList::IsEnabled(features::kDisableFirstRunAutoImportWin);
-#endif  // defined(OS_WIN)
-
-    if (auto_import) {
-      first_run::AutoImport(profile_, master_prefs_->homepage_defined,
-                            master_prefs_->do_import_items,
-                            master_prefs_->dont_import_items,
-                            master_prefs_->import_bookmarks_path);
-    }
+    first_run::AutoImport(profile_, master_prefs_->import_bookmarks_path);

[Nico, 2017/03/22 18:09:37]

CL description says "Disable AutoImport by default", code as I read it does
"always run autoimport on first run" which sounds like the opposite. Which one
is it?

...aha, looks like the AutoImport() used to import history in addition to
bookmarks, but it still imports bookmarks. The finch thing disabled everything
including bookmarks, and base::win::IsEnterpriseManaged() also controlled
bookmarks.

So doesn't this do more than "import nothing" now, while it didn't before?

[gab, 2017/03/22 18:55:49]

Right, updated title to "Update AutoImport to import nothing by default (in
absence of policy and master_prefs).", we now always make the
first_run::AutoImport() call but it no-ops in absence of policies/master_prefs
telling it to do something.

[Nico, 2017/03/22 18:59:45]

Maybe update the comment right above the if then?

[gab, 2017/03/22 19:06:26]

Oh wow, had missed that comment, it's soooo old (we haven't shown a First Run UI
in forever). Updated: only relevant part is that this uses prefs and therefore
must run after they're initialized.

 
     // Note: this can pop the first run consent dialog on linux.
     first_run::DoPostImportTasks(profile_,