| Index: chrome/browser/prefs/browser_prefs.cc
|
| diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc
|
| index af52c8fc9d585c5dbca37d2a8e36b45c2d56a842..17cc0da1d5fbdf086390ceec948422093f674d9c 100644
|
| --- a/chrome/browser/prefs/browser_prefs.cc
|
| +++ b/chrome/browser/prefs/browser_prefs.cc
|
| @@ -24,7 +24,6 @@
|
| #include "chrome/browser/external_protocol/external_protocol_handler.h"
|
| #include "chrome/browser/first_run/first_run.h"
|
| #include "chrome/browser/geolocation/geolocation_prefs.h"
|
| -#include "chrome/browser/google/google_url_tracker_factory.h"
|
| #include "chrome/browser/gpu/gl_string_manager.h"
|
| #include "chrome/browser/gpu/gpu_mode_manager.h"
|
| #include "chrome/browser/intranet_redirect_detector.h"
|
| @@ -86,8 +85,6 @@
|
| #include "components/dom_distiller/core/distilled_page_prefs.h"
|
| #include "components/enhanced_bookmarks/bookmark_server_cluster_service.h"
|
| #include "components/gcm_driver/gcm_channel_status_syncer.h"
|
| -#include "components/google/core/browser/google_pref_names.h"
|
| -#include "components/google/core/browser/google_url_tracker.h"
|
| #include "components/network_time/network_time_tracker.h"
|
| #include "components/password_manager/core/browser/password_manager.h"
|
| #include "components/password_manager/core/browser/password_manager_url_collection_experiment.h"
|
| @@ -224,7 +221,6 @@ enum MigratedPreferences {
|
| NO_PREFS = 0,
|
| DNS_PREFS = 1 << 0,
|
| WINDOWS_PREFS = 1 << 1,
|
| - GOOGLE_URL_TRACKER_PREFS = 1 << 2,
|
| };
|
|
|
| // A previous feature (see
|
| @@ -624,29 +620,6 @@ void MigrateBrowserPrefs(Profile* profile, PrefService* local_state) {
|
| current_version);
|
| }
|
|
|
| - if (!(current_version & GOOGLE_URL_TRACKER_PREFS)) {
|
| - registry->RegisterStringPref(prefs::kLastKnownGoogleURL,
|
| - GoogleURLTracker::kDefaultGoogleHomepage);
|
| - if (local_state->HasPrefPath(prefs::kLastKnownGoogleURL)) {
|
| - user_prefs->SetString(prefs::kLastKnownGoogleURL,
|
| - local_state->GetString(prefs::kLastKnownGoogleURL));
|
| - }
|
| - local_state->ClearPref(prefs::kLastKnownGoogleURL);
|
| -
|
| - registry->RegisterStringPref(prefs::kLastPromptedGoogleURL,
|
| - std::string());
|
| - if (local_state->HasPrefPath(prefs::kLastPromptedGoogleURL)) {
|
| - user_prefs->SetString(
|
| - prefs::kLastPromptedGoogleURL,
|
| - local_state->GetString(prefs::kLastPromptedGoogleURL));
|
| - }
|
| - local_state->ClearPref(prefs::kLastPromptedGoogleURL);
|
| -
|
| - current_version |= GOOGLE_URL_TRACKER_PREFS;
|
| - local_state->SetInteger(prefs::kMultipleProfilePrefMigration,
|
| - current_version);
|
| - }
|
| -
|
| #if !defined(OS_ANDROID)
|
| local_state->ClearPref(kLegacyProfileResetPromptMemento);
|
| #endif
|
|
|