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

chrome/browser/prefs/browser_prefs.cc

 // Copyright 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/prefs/browser_prefs.h"
 
 #include <string>
 
 #include "base/files/file_util.h"
 #include "base/metrics/histogram_macros.h"
@@ skipping 244 matching lines @@
 #endif
 
 #if !defined(OS_ANDROID) && !defined(OS_IOS)
 #include "chrome/browser/ui/webui/md_history_ui.h"
 #endif
 
 namespace {
 
 #if BUILDFLAG(ENABLE_GOOGLE_NOW)
 // Deprecated 3/2016
-const char kGoogleGeolocationAccessEnabled[] =
+constexpr char kGoogleGeolocationAccessEnabled[] =
     "googlegeolocationaccess.enabled";
 #endif
 
 // Deprecated 4/2016.
-const char kCheckDefaultBrowser[] = "browser.check_default_browser";
+constexpr char kCheckDefaultBrowser[] = "browser.check_default_browser";
 
 // Deprecated 5/2016.
-const char kDesktopSearchRedirectionInfobarShownPref[] =
+constexpr char kDesktopSearchRedirectionInfobarShownPref[] =
     "desktop_search_redirection_infobar_shown";
 
 // Deprecated 7/2016.
-const char kNetworkPredictionEnabled[] = "dns_prefetching.enabled";
-const char kDisableSpdy[] = "spdy.disabled";
+constexpr char kNetworkPredictionEnabled[] = "dns_prefetching.enabled";
+constexpr char kDisableSpdy[] = "spdy.disabled";
 
 // Deprecated 8/2016.
-const char kRecentlySelectedEncoding[] = "profile.recently_selected_encodings";
-const char kStaticEncodings[] = "intl.static_encodings";
+constexpr char kRecentlySelectedEncoding[] = "profile.recently_selected_encodings";
+constexpr char kStaticEncodings[] = "intl.static_encodings";
 
 // Deprecated 9/2016.
-const char kWebKitUsesUniversalDetector[] =
+constexpr char kWebKitUsesUniversalDetector[] =
     "webkit.webprefs.uses_universal_detector";
-const char kWebKitAllowDisplayingInsecureContent[] =
+constexpr char kWebKitAllowDisplayingInsecureContent[] =
     "webkit.webprefs.allow_displaying_insecure_content";
 
 #if BUILDFLAG(ENABLE_EXTENSIONS)
 // Deprecated 2/2017.
-const char kToolbarMigratedComponentActionStatus[] =
+constexpr char kToolbarMigratedComponentActionStatus[] =
     "toolbar_migrated_component_action_status";
 #endif
 
+// master_preferences used to be mapped as-is to Preferences on first run but
+// the "distribution" dictionary was never used beyond first run. It is now
+// stripped in first_run.cc prior to applying this mapping. Cleanup for existing
+// Preferences files added here 2/2017.
+constexpr char kDistroDict[] = "distribution";
+
 void DeleteWebRTCIdentityStoreDBOnFileThread(
     const base::FilePath& profile_path) {
   base::DeleteFile(profile_path.Append(
       FILE_PATH_LITERAL("WebRTCIdentityStore")), false);
   base::DeleteFile(profile_path.Append(
       FILE_PATH_LITERAL("WebRTCIdentityStore-journal")), false);
 }
 
 void DeleteWebRTCIdentityStoreDB(const Profile& profile) {
   content::BrowserThread::PostDelayedTask(
@@ skipping 327 matching lines @@
   registry->RegisterBooleanPref(kDisableSpdy, false);
   registry->RegisterStringPref(kStaticEncodings, std::string());
   registry->RegisterStringPref(kRecentlySelectedEncoding, std::string());
   registry->RegisterBooleanPref(kWebKitUsesUniversalDetector, true);
 
   registry->RegisterBooleanPref(kWebKitAllowDisplayingInsecureContent, true);
 
 #if BUILDFLAG(ENABLE_EXTENSIONS)
   registry->RegisterDictionaryPref(kToolbarMigratedComponentActionStatus);
 #endif
+
+  registry->RegisterDictionaryPref(kDistroDict);
 }
 
 void RegisterUserProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
   RegisterProfilePrefs(registry);
 
 #if defined(OS_CHROMEOS)
   chromeos::PowerPrefs::RegisterUserProfilePrefs(registry);
 #endif
 
 #if defined(OS_ANDROID)
@@ skipping 72 matching lines @@
   profile_prefs->ClearPref(kRecentlySelectedEncoding);
 
   // Added 9/2016.
   profile_prefs->ClearPref(kWebKitUsesUniversalDetector);
   profile_prefs->ClearPref(kWebKitAllowDisplayingInsecureContent);
 
 #if BUILDFLAG(ENABLE_EXTENSIONS)
   // Added 2/2017.
   profile_prefs->ClearPref(kToolbarMigratedComponentActionStatus);
 #endif
+
+  // Added 2/2017.
+  profile_prefs->ClearPref(kDistroDict);

[grt (UTC plus 2), 2017/02/23 21:19:01]

can't do this because of PingDelay :-(

[gab, 2017/02/23 23:27:53]

Fixed in precursor CL.

 }
 
 }  // namespace chrome