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

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

Committed: https://crrev.com/ea0e4af3f7ed2d3334c5566b00d0d160fc3e17da
Cr-Commit-Position: refs/heads/master@{#301505}

[Lei Zhang, 2014-10-24 23:34:21]

thestig@chromium.org changed reviewers:
+ estade@chromium.org

[Lei Zhang, 2014-10-24 23:34:21]

https://codereview.chromium.org/673343003/diff/1/chrome/common/pref_names.cc
File chrome/common/pref_names.cc (left):

https://codereview.chromium.org/673343003/diff/1/chrome/common/pref_names.cc#...
chrome/common/pref_names.cc:1657: #if !defined(OS_ANDROID)
I believe these are being used on Android via
chrome/browser/signin/signin_promo.cc.

[Evan Stade, 2014-10-24 23:55:50]

https://codereview.chromium.org/673343003/diff/1/chrome/common/pref_names.cc
File chrome/common/pref_names.cc (left):

https://codereview.chromium.org/673343003/diff/1/chrome/common/pref_names.cc#...
chrome/common/pref_names.cc:1657: #if !defined(OS_ANDROID)
On 2014/10/24 23:34:21, Lei Zhang wrote:
> I believe these are being used on Android via
> chrome/browser/signin/signin_promo.cc.

then how did it work before?

[Lei Zhang, 2014-10-25 00:53:12]

https://codereview.chromium.org/673343003/diff/1/chrome/common/pref_names.cc
File chrome/common/pref_names.cc (left):

https://codereview.chromium.org/673343003/diff/1/chrome/common/pref_names.cc#...
chrome/common/pref_names.cc:1657: #if !defined(OS_ANDROID)
On 2014/10/24 23:55:50, Evan Stade wrote:
> On 2014/10/24 23:34:21, Lei Zhang wrote:
> > I believe these are being used on Android via
> > chrome/browser/signin/signin_promo.cc.
> 
> then how did it work before?

By the magic of linker garbage collection. I added a TODO. Properly fixing this
is a bit more complicated and will be done in a separate CL. I just want to fix
the #ifdef inconsistencies in this CL.

[Evan Stade, 2014-10-27 18:21:46]

lgtm

[Lei Zhang, 2014-10-27 21:11:47]

The CQ bit was checked by thestig@chromium.org

[commit-bot: I haz the power, 2014-10-27 21:14:34]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/673343003/20001

[commit-bot: I haz the power, 2014-10-27 21:24:04]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-10-27 21:24:05]

Try jobs failed on following builders:
  linux_gpu on tryserver.chromium.gpu
(http://build.chromium.org/p/tryserver.chromium.gpu/builders/linux_gpu/builds/...)
  mac_gpu on tryserver.chromium.gpu
(http://build.chromium.org/p/tryserver.chromium.gpu/builders/mac_gpu/builds/74180)
  android_aosp on tryserver.chromium.linux
(http://build.chromium.org/p/tryserver.chromium.linux/builders/android_aosp/bu...)
  android_arm64_dbg_recipe on tryserver.chromium.linux
(http://build.chromium.org/p/tryserver.chromium.linux/builders/android_arm64_d...)
  android_clang_dbg_recipe on tryserver.chromium.linux
(http://build.chromium.org/p/tryserver.chromium.linux/builders/android_clang_d...)
  android_dbg_tests_recipe on tryserver.chromium.linux
(http://build.chromium.org/p/tryserver.chromium.linux/builders/android_dbg_tes...)
  chromium_presubmit on tryserver.chromium.linux
(http://build.chromium.org/p/tryserver.chromium.linux/builders/chromium_presub...)
  linux_chromium_compile_dbg_32 on tryserver.chromium.linux
(http://build.chromium.org/p/tryserver.chromium.linux/builders/linux_chromium_...)
  win8_chromium_rel on tryserver.chromium.win
(http://build.chromium.org/p/tryserver.chromium.win/builders/win8_chromium_rel...)

[Lei Zhang, 2014-10-27 22:20:18]

The CQ bit was checked by thestig@chromium.org

[commit-bot: I haz the power, 2014-10-27 22:23:09]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/673343003/40001

[commit-bot: I haz the power, 2014-10-28 00:14:01]

Committed patchset #3 (id:40001)

[commit-bot: I haz the power, 2014-10-28 00:14:47]

Patchset 3 (id:??) landed as
https://crrev.com/ea0e4af3f7ed2d3334c5566b00d0d160fc3e17da
Cr-Commit-Position: refs/heads/master@{#301505}