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

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 <string>
 
 #include "base/base_switches.h"
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/macros.h"
@@ skipping 158 matching lines @@
     "{\n"
     "}\n";
 typedef FirstRunMasterPrefsBrowserTestT<kImportDefault>
     FirstRunMasterPrefsImportDefault;
 // http://crbug.com/314221
 #if defined(OS_MACOSX) || (defined(GOOGLE_CHROME_BUILD) && defined(OS_LINUX))
 #define MAYBE_ImportDefault DISABLED_ImportDefault
 #else
 #define MAYBE_ImportDefault ImportDefault
 #endif
+// No items are imported by default.
 IN_PROC_BROWSER_TEST_F(FirstRunMasterPrefsImportDefault, MAYBE_ImportDefault) {
   int auto_import_state = first_run::auto_import_state();
+  EXPECT_EQ(MaskExpectedImportState(first_run::AUTO_IMPORT_CALLED),
+            auto_import_state);
+}
+
+extern const char kImportAll[] =

[grt (UTC plus 2), 2017/02/23 14:05:48]

why do these all have external linkage? why not just "constexpr char
kImportAll[] = "?

[gab, 2017/02/23 20:37:40]

I forget, IIRC it was required for the template magic below to link when I
originally wrote it but this no longer appears to be the case (maybe an
improvement in VC++ :)).

Done.

+    "{\n"
+    "  \"distribution\": {\n"
+    "    \"import_bookmarks\": true,\n"
+    "    \"import_history\": true,\n"
+    "    \"import_home_page\": true,\n"
+    "    \"import_search_engine\": true\n"
+    "  }\n"
+    "}\n";
+typedef FirstRunMasterPrefsBrowserTestT<kImportAll>
+    FirstRunMasterPrefsImportAll;
+// http://crbug.com/314221
+#if defined(OS_MACOSX) || (defined(GOOGLE_CHROME_BUILD) && defined(OS_LINUX))
+#define MAYBE_ImportAll DISABLED_ImportAll
+#else
+#define MAYBE_ImportAll ImportAll
+#endif
+IN_PROC_BROWSER_TEST_F(FirstRunMasterPrefsImportAll, MAYBE_ImportAll) {
+  int auto_import_state = first_run::auto_import_state();
   EXPECT_EQ(MaskExpectedImportState(first_run::AUTO_IMPORT_CALLED |
                                     first_run::AUTO_IMPORT_PROFILE_IMPORTED),
             auto_import_state);
 }
 
 // The bookmarks file doesn't actually need to exist for this integration test
 // to trigger the interaction being tested.
 extern const char kImportBookmarksFile[] =
     "{\n"
     "  \"distribution\": {\n"
     "     \"import_bookmarks_from_file\": \"/foo/doesntexists.wtv\"\n"
     "  }\n"
     "}\n";
 typedef FirstRunMasterPrefsBrowserTestT<kImportBookmarksFile>
     FirstRunMasterPrefsImportBookmarksFile;
 // http://crbug.com/314221
 #if (defined(GOOGLE_CHROME_BUILD) && defined(OS_LINUX)) || defined(OS_MACOSX)
 #define MAYBE_ImportBookmarksFile DISABLED_ImportBookmarksFile
 #else
 #define MAYBE_ImportBookmarksFile ImportBookmarksFile
 #endif
 IN_PROC_BROWSER_TEST_F(FirstRunMasterPrefsImportBookmarksFile,
                        MAYBE_ImportBookmarksFile) {
   int auto_import_state = first_run::auto_import_state();
   EXPECT_EQ(
       MaskExpectedImportState(first_run::AUTO_IMPORT_CALLED |
-                              first_run::AUTO_IMPORT_PROFILE_IMPORTED |
                               first_run::AUTO_IMPORT_BOOKMARKS_FILE_IMPORTED),
       auto_import_state);
 }
 
 // Test an import with all import options disabled. This is a regression test
 // for http://crbug.com/169984 where this would cause the import process to
 // stay running, and the NTP to be loaded with no apps.
 extern const char kImportNothing[] =
     "{\n"
     "  \"distribution\": {\n"
@@ skipping 87 matching lines @@
     FirstRunMasterPrefsWithTrackedPreferences,
     testing::Values(
         chrome_prefs::internals::kSettingsEnforcementGroupNoEnforcement,
         chrome_prefs::internals::kSettingsEnforcementGroupEnforceAlways,
         chrome_prefs::internals::
             kSettingsEnforcementGroupEnforceAlwaysWithDSE,
         chrome_prefs::internals::
             kSettingsEnforcementGroupEnforceAlwaysWithExtensionsAndDSE));
 
 #endif  // !defined(OS_CHROMEOS)