|
@@ -746,7 +746,7 @@
|
|
|
std::make_unique<BrowserSigninPolicyHandler>(chrome_schema)));
|
|
|
--- a/chrome/browser/prefs/browser_prefs.cc
|
|
|
+++ b/chrome/browser/prefs/browser_prefs.cc
|
|
|
-@@ -126,7 +126,6 @@
|
|
|
+@@ -127,7 +127,6 @@
|
|
|
#include "components/prefs/pref_service.h"
|
|
|
#include "components/proxy_config/pref_proxy_config_tracker_impl.h"
|
|
|
#include "components/rappor/rappor_service_impl.h"
|
|
@@ -754,7 +754,7 @@
|
|
|
#include "components/search_engines/template_url_prepopulate_data.h"
|
|
|
#include "components/security_state/core/security_state.h"
|
|
|
#include "components/sessions/core/session_id_generator.h"
|
|
|
-@@ -639,7 +638,6 @@ void RegisterLocalState(PrefRegistrySimp
|
|
|
+@@ -640,7 +639,6 @@ void RegisterLocalState(PrefRegistrySimp
|
|
|
profiles::RegisterPrefs(registry);
|
|
|
rappor::RapporServiceImpl::RegisterPrefs(registry);
|
|
|
RegisterScreenshotPrefs(registry);
|
|
@@ -762,7 +762,7 @@
|
|
|
secure_origin_whitelist::RegisterPrefs(registry);
|
|
|
sessions::SessionIdGenerator::RegisterPrefs(registry);
|
|
|
SSLConfigServiceManager::RegisterPrefs(registry);
|
|
|
-@@ -838,7 +836,6 @@ void RegisterProfilePrefs(user_prefs::Pr
|
|
|
+@@ -840,7 +838,6 @@ void RegisterProfilePrefs(user_prefs::Pr
|
|
|
PushMessagingAppIdentifier::RegisterProfilePrefs(registry);
|
|
|
QuietNotificationPermissionUiState::RegisterProfilePrefs(registry);
|
|
|
RegisterBrowserUserPrefs(registry);
|
|
@@ -911,7 +911,7 @@
|
|
|
#include "components/sync/driver/sync_service.h"
|
|
|
--- a/chrome/browser/profiles/profile_impl.cc
|
|
|
+++ b/chrome/browser/profiles/profile_impl.cc
|
|
|
-@@ -133,7 +133,6 @@
|
|
|
+@@ -135,7 +135,6 @@
|
|
|
#include "components/policy/core/common/cloud/user_cloud_policy_manager.h"
|
|
|
#include "components/pref_registry/pref_registry_syncable.h"
|
|
|
#include "components/prefs/scoped_user_pref_update.h"
|
|
@@ -4270,7 +4270,7 @@
|
|
|
#include "components/sync_preferences/testing_pref_service_syncable.h"
|
|
|
--- a/tools/metrics/histograms/enums.xml
|
|
|
+++ b/tools/metrics/histograms/enums.xml
|
|
|
-@@ -62682,7 +62682,6 @@ Full version information for the fingerp
|
|
|
+@@ -62697,7 +62697,6 @@ Full version information for the fingerp
|
|
|
<int value="3" label="kRestoreOnStartup"/>
|
|
|
<int value="4" label="kURLsToRestoreOnStartup"/>
|
|
|
<int value="5" label="extensions::pref_names::kExtensions"/>
|
|
@@ -4278,7 +4278,7 @@
|
|
|
<int value="7" label="kSearchProviderOverrides"/>
|
|
|
<int value="8" label="kDefaultSearchProviderSearchURL (Obsolete 12/2016)"/>
|
|
|
<int value="9" label="kDefaultSearchProviderKeyword (Obsolete 12/2016)"/>
|
|
|
-@@ -62697,10 +62696,7 @@ Full version information for the fingerp
|
|
|
+@@ -62712,10 +62711,7 @@ Full version information for the fingerp
|
|
|
<int value="18" label="kSafeBrowsingIncidentsSent"/>
|
|
|
<int value="19" label="kSwReporterPromptVersion"/>
|
|
|
<int value="20" label="kSwReporterPromptReason"/>
|