Move DevTools preferences to incognito whitelist.

DevTools preferences are moved to the persistent storage list
for incognito mode. This part of the CL does not make any behavioral
change.
Android preference regarding DevTool enabling is removed from the
incognito whitelist as it is not set from inside an incognito window.

Bug: 861722
Change-Id: Iab189675cdef808f5d03398bb4e7eb6fd9378e97
Reviewed-on: https://chromium-review.googlesource.com/1180881Reviewed-by: David Roger <droger@chromium.org>
Reviewed-by: Dmitry Gozman <dgozman@chromium.org>
Reviewed-by: Martin Šrámek <msramek@chromium.org>
Commit-Queue: Ramin Halavati <rhalavati@chromium.org>
Cr-Commit-Position: refs/heads/master@{#585544}

chrome/browser/prefs/pref_service_incognito_whitelist.cc

@@ -119,6 +119,16 @@ const char* const kPersistentPrefNames[] = {
     metrics::prefs::kUninstallMetricsUptimeSec, metrics::prefs::kUkmCellDataUse,
     metrics::prefs::kUmaCellDataUse, metrics::prefs::kUserCellDataUse,
 
+    // Devtools preferences are stored cross profiles as they are not storing
+    // user data and just keep debugging environment settings.
+    prefs::kDevToolsAdbKey, prefs::kDevToolsAvailability,
+    prefs::kDevToolsDiscoverUsbDevicesEnabled, prefs::kDevToolsEditedFiles,
+    prefs::kDevToolsFileSystemPaths, prefs::kDevToolsPortForwardingEnabled,
+    prefs::kDevToolsPortForwardingDefaultSet,
+    prefs::kDevToolsPortForwardingConfig, prefs::kDevToolsPreferences,
+    prefs::kDevToolsDiscoverTCPTargetsEnabled,
+    prefs::kDevToolsTCPDiscoveryConfig,
+
     // Google URL prefs don't store user data and just keep track of the URL.
     prefs::kLastKnownGoogleURL, prefs::kLastPromptedGoogleURL,
 
@@ -382,17 +392,6 @@ const char* const kTemporaryIncognitoWhitelist[] = {
     prefs::kSuppressUnsupportedOSWarning, prefs::kWasRestarted,
 #endif  // !defined(OS_ANDROID)
 
-    prefs::kDevToolsAdbKey, prefs::kDevToolsAvailability,
-    prefs::kDevToolsDiscoverUsbDevicesEnabled, prefs::kDevToolsEditedFiles,
-    prefs::kDevToolsFileSystemPaths, prefs::kDevToolsPortForwardingEnabled,
-    prefs::kDevToolsPortForwardingDefaultSet,
-    prefs::kDevToolsPortForwardingConfig, prefs::kDevToolsPreferences,
-    prefs::kDevToolsDiscoverTCPTargetsEnabled,
-    prefs::kDevToolsTCPDiscoveryConfig,
-#if defined(OS_ANDROID)
-    prefs::kDevToolsRemoteEnabled,
-#endif
-
     prefs::kGoogleServicesPasswordHash,
 
     prefs::kWebAppCreateOnDesktop, prefs::kWebAppCreateInAppsMenu,

chrome/browser/profiles/profile.cc

@@ -185,10 +185,6 @@ void Profile::RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
                              std::make_unique<base::ListValue>());
 #endif
 
-#if defined(OS_ANDROID)
-  registry->RegisterBooleanPref(prefs::kDevToolsRemoteEnabled, false);
-#endif
-
   registry->RegisterBooleanPref(prefs::kDataSaverEnabled, false);
   data_reduction_proxy::RegisterSyncableProfilePrefs(registry);
 

chrome/common/pref_names.cc

@@ -1548,11 +1548,6 @@ const char kDevToolsTCPDiscoveryConfig[] = "devtools.tcp_discovery_config";
 // A dictionary with generic DevTools settings.
 const char kDevToolsPreferences[] = "devtools.preferences";
 
-#if defined(OS_ANDROID)
-// A boolean specifying whether remote dev tools debugging is enabled.
-const char kDevToolsRemoteEnabled[] = "devtools.remote_enabled";
-#endif
-
 // Local hash of authentication password, used for off-line authentication
 // when on-line authentication is not available.
 const char kGoogleServicesPasswordHash[] = "google.services.password_hash";

chrome/common/pref_names.h

@@ -541,9 +541,6 @@ extern const char kDevToolsPortForwardingConfig[];
 extern const char kDevToolsPreferences[];
 extern const char kDevToolsDiscoverTCPTargetsEnabled[];
 extern const char kDevToolsTCPDiscoveryConfig[];
-#if defined(OS_ANDROID)
-extern const char kDevToolsRemoteEnabled[];
-#endif
 
 extern const char kGoogleServicesPasswordHash[];