Merge from Chromium at DEPS revision r212014
This commit was generated by merge_to_master.py.
Change-Id: Ie0f261e9682cd8abea1eea1e51beab83d5eea21a
diff --git a/chrome/common/pref_names.h b/chrome/common/pref_names.h
index 6a9a357..92b6ff6 100644
--- a/chrome/common/pref_names.h
+++ b/chrome/common/pref_names.h
@@ -190,7 +190,9 @@
extern const char kDisabledSchemes[];
extern const char kUrlBlacklist[];
extern const char kUrlWhitelist[];
-extern const char kSearchInstantEnabled[];
+#if defined(OS_ANDROID)
+extern const char kLastPolicyCheckTime[];
+#endif
extern const char kInstantUIZeroSuggestUrlPrefix[];
extern const char kMultipleProfilePrefMigration[];
extern const char kNetworkPredictionEnabled[];
@@ -204,7 +206,6 @@
extern const char kTapToClickEnabled[];
extern const char kTapDraggingEnabled[];
extern const char kEnableTouchpadThreeFingerClick[];
-extern const char kEnableTouchpadThreeFingerSwipe[];
extern const char kNaturalScroll[];
extern const char kPrimaryMouseButtonRight[];
extern const char kMouseSensitivity[];
@@ -317,6 +318,7 @@
extern const char kUsedPolicyCertificatesOnce[];
extern const char kAttestationEnabled[];
extern const char kAttestationExtensionWhitelist[];
+extern const char kTouchHudProjectionEnabled[];
#endif // defined(OS_CHROMEOS)
extern const char kIpcDisabledMessages[];
extern const char kShowHomeButton[];
@@ -388,10 +390,11 @@
extern const char kClearSiteDataOnExit[];
extern const char kDefaultZoomLevel[];
extern const char kPerHostZoomLevels[];
-extern const char kAutofillDialogShowCount[];
+extern const char kAutofillDialogAutofillDefault[];
extern const char kAutofillDialogHasPaidWithWallet[];
extern const char kAutofillDialogPayWithoutWallet[];
-extern const char kAutofillDialogAutofillDefault[];
+extern const char kAutofillDialogShowCount[];
+extern const char kAutofillGeneratedCardBubbleTimesShown[];
extern const char kEditBookmarksEnabled[];
extern const char kEnableTranslate[];
@@ -469,6 +472,7 @@
extern const char kVariationsRestrictParameter[];
extern const char kVariationsSeed[];
extern const char kVariationsSeedDate[];
+extern const char kVariationsSeedHash[];
extern const char kProfileLastUsed[];
extern const char kProfilesLastActive[];
@@ -476,9 +480,6 @@
extern const char kProfileInfoCache[];
extern const char kProfileCreatedByVersion[];
-extern const char kProfileMetrics[];
-extern const char kProfilePrefix[];
-
extern const char kStabilityExitedCleanly[];
extern const char kStabilityStatsVersion[];
extern const char kStabilityStatsBuildTime[];
@@ -603,6 +604,7 @@
extern const char kNtpWebStoreEnabled[];
extern const char kNtpAppPageNames[];
+extern const char kDevToolsAdbKey[];
extern const char kDevToolsDisabled[];
extern const char kDevToolsDockSide[];
extern const char kDevToolsEditedFiles[];
@@ -670,8 +672,6 @@
extern const char kSyncPromoShowNTPBubble[];
extern const char kSyncPromoErrorMessage[];
-extern const char kSyncFaviconsEnabled[];
-
extern const char kProfileGAIAInfoUpdateTime[];
extern const char kProfileGAIAInfoPictureURL[];