Cleanup: Sync up ifdefs in pref_names.cc and pref_names.h.

chrome/common/pref_names.h

Index: chrome/common/pref_names.h
diff --git a/chrome/common/pref_names.h b/chrome/common/pref_names.h
index ae7998cba5c2e8a4ad769017b707e859a4166769..0a867f2dd68066d99392bf9ae52a01cf595a7189 100644
--- a/chrome/common/pref_names.h
+++ b/chrome/common/pref_names.h
@@ -309,7 +309,9 @@ extern const char kPluginsDisabledPluginsExceptions[];
 extern const char kPluginsEnabledPlugins[];
 extern const char kPluginsMigratedToPepperFlash[];
 extern const char kPluginsRemovedOldComponentPepperFlashSettings[];
+#if !defined(OS_ANDROID)
 extern const char kPluginsShowDetails[];
+#endif
 extern const char kPluginsAllowOutdated[];
 extern const char kPluginsAlwaysAuthorize[];
 #if defined(ENABLE_PLUGIN_INSTALLATION)
@@ -326,7 +328,9 @@ extern const char kDefaultContentSettings[];
 extern const char kOverrideContentSettings[];
 extern const char kContentSettingsVersion[];
 extern const char kContentSettingsPatternPairs[];
+#if !defined(OS_ANDROID)
 extern const char kContentSettingsPluginWhitelist[];
+#endif
 extern const char kBlockThirdPartyCookies[];
 extern const char kClearSiteDataOnExit[];
 extern const char kPartitionDefaultZoomLevel[];
@@ -341,7 +345,9 @@ extern const char kAutofillDialogWalletShippingSameAsBilling[];
 extern const char kAutofillGeneratedCardBubbleTimesShown[];
 extern const char kAutofillDialogDefaults[];
 
+#if !defined(OS_ANDROID)
 extern const char kPinnedTabs[];
+#endif
 
 extern const char kDisable3DAPIs[];
 extern const char kEnableDeprecatedWebPlatformFeatures[];
@@ -688,7 +694,7 @@ extern const char kServerBackedDeviceState[];
 extern const char kCustomizationDefaultWallpaperURL[];
 extern const char kLogoutStartedLast[];
 extern const char kConsumerManagementEnrollmentStage[];
-#endif
+#endif  // defined(OS_CHROMEOS)
 
 extern const char kClearPluginLSODataEnabled[];
 extern const char kPepperFlashSettingsEnabled[];
@@ -704,7 +710,9 @@ extern const char kTabStripStackedLayout[];
 
 extern const char kRegisteredBackgroundContents[];
 
+#if !defined(OS_ANDROID)
 extern const char kShownAutoLaunchInfobar[];
+#endif
 
 extern const char kAuthSchemes[];
 extern const char kDisableAuthNegotiateCnameLookup[];