Remove the enable_themes build flag and define.

Remove the enable_themes build flag and define.

This is always defined on non-mobile platforms and it is not possible to
override in the build. Since //chrome is no longer build on iOS, most uses
can be easily keyed off of the Android defines. For files not compiled on
Android, the conditionals were removed altogether.

This change additionally coalesces some Android blocks in
chrome/browser/BUILD.gn and chrome/browser/ui/BUILD.gn

BUG=671706
Committed: https://crrev.com/9b0866fd103e996c5927d183dfa68f0931a76a45
Cr-Commit-Position: refs/heads/master@{#437784}

[brettw, 2016-12-08 00:46:46]

Description was changed from

==========
Remove the enable_themes build flag and define.

This is always defined on non-mobile platforms and it is not possible to
override in the build. Since //chrome is no longer build on iOS, most uses
can be easily keyed off of the Android defines.

BUG=671706
==========

to

==========
Remove the enable_themes build flag and define.

This is always defined on non-mobile platforms and it is not possible to
override in the build. Since //chrome is no longer build on iOS, most uses
can be easily keyed off of the Android defines.

This change additionally coalesces two Android blocks in chrome/browser/BUILD.gn

BUG=671706
==========

[brettw, 2016-12-08 00:51:47]

Description was changed from

==========
Remove the enable_themes build flag and define.

This is always defined on non-mobile platforms and it is not possible to
override in the build. Since //chrome is no longer build on iOS, most uses
can be easily keyed off of the Android defines.

This change additionally coalesces two Android blocks in chrome/browser/BUILD.gn

BUG=671706
==========

to

==========
Remove the enable_themes build flag and define.

This is always defined on non-mobile platforms and it is not possible to
override in the build. Since //chrome is no longer build on iOS, most uses
can be easily keyed off of the Android defines.

This change additionally coalesces some Android blocks in
chrome/browser/BUILD.gn and chrome/browser/ui/BUILD.gn

BUG=671706
==========

[brettw, 2016-12-08 00:52:10]

Include

[brettw, 2016-12-08 00:52:10]

The CQ bit was checked by brettw@chromium.org to run a CQ dry run

[commit-bot: I haz the power, 2016-12-08 00:52:43]

Dry run: CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[brettw, 2016-12-08 00:52:44]

brettw@chromium.org changed reviewers:
+ yzshen@chromium.org

[brettw, 2016-12-08 00:52:44]

Sorry, I'm kind of picking people at random for these patches.

[Dan Beam, 2016-12-08 01:36:49]

fwiw, i don't know that any of the webui code you've put OS_ANDROID checks in
actually builds on Android (other than *version_ui*), so these conditionals
could probably just be  removed completely.  just fyi.

[commit-bot: I haz the power, 2016-12-08 02:43:23]

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

[commit-bot: I haz the power, 2016-12-08 02:43:24]

Dry run: Try jobs failed on following builders:
  mac_chromium_compile_dbg_ng on master.tryserver.chromium.mac (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.mac/builders/mac_chromium_comp...)

[brettw, 2016-12-08 20:58:22]

Remove unnecessary

[brettw, 2016-12-08 20:58:23]

The CQ bit was checked by brettw@chromium.org to run a CQ dry run

[commit-bot: I haz the power, 2016-12-08 20:59:34]

Dry run: CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[brettw, 2016-12-08 20:59:37]

The CQ bit was unchecked by brettw@chromium.org

[brettw, 2016-12-08 21:01:54]

Remove unnecessary includes

[brettw, 2016-12-08 21:02:26]

Good point, I removed the defines altogether from files not compiled on Android.

[brettw, 2016-12-08 21:02:50]

Description was changed from

==========
Remove the enable_themes build flag and define.

This is always defined on non-mobile platforms and it is not possible to
override in the build. Since //chrome is no longer build on iOS, most uses
can be easily keyed off of the Android defines.

This change additionally coalesces some Android blocks in
chrome/browser/BUILD.gn and chrome/browser/ui/BUILD.gn

BUG=671706
==========

to

==========
Remove the enable_themes build flag and define.

This is always defined on non-mobile platforms and it is not possible to
override in the build. Since //chrome is no longer build on iOS, most uses
can be easily keyed off of the Android defines. For files not compiled on
Android, the conditionals were removed altogether.

This change additionally coalesces some Android blocks in
chrome/browser/BUILD.gn and chrome/browser/ui/BUILD.gn

BUG=671706
==========

[brettw, 2016-12-08 21:03:05]

The CQ bit was checked by brettw@chromium.org

[commit-bot: I haz the power, 2016-12-08 21:03:47]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2016-12-08 21:03:48]

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

[commit-bot: I haz the power, 2016-12-08 21:03:49]

No L-G-T-M from a valid reviewer yet. 
CQ run can only be started by full committers or once the patch has
received an L-G-T-M from a full committer.
Even if an L-G-T-M may have been provided, it was from a non-committer,
_not_ a full super star committer.
See http://www.chromium.org/getting-involved/become-a-committer
Note that this has nothing to do with OWNERS files.

[brettw, 2016-12-08 21:05:27]

The CQ bit was checked by brettw@chromium.org to run a CQ dry run

[commit-bot: I haz the power, 2016-12-08 21:05:55]

Dry run: CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[Dan Beam, 2016-12-08 22:41:11]

dbeam@chromium.org changed reviewers:
+ dbeam@chromium.org

[Dan Beam, 2016-12-08 22:41:12]

webui lgtm if that helps with your CQ

[commit-bot: I haz the power, 2016-12-08 23:08:47]

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

[commit-bot: I haz the power, 2016-12-08 23:08:48]

Dry run: Try jobs failed on following builders:
  linux_chromium_rel_ng on master.tryserver.chromium.linux (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.linux/builders/linux_chromium_...)

[brettw, 2016-12-09 00:55:36]

Fix

[brettw, 2016-12-09 00:55:36]

The CQ bit was checked by brettw@chromium.org to run a CQ dry run

[commit-bot: I haz the power, 2016-12-09 00:56:17]

Dry run: CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2016-12-09 03:07:14]

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

[commit-bot: I haz the power, 2016-12-09 03:07:16]

Dry run: Try jobs failed on following builders:
  linux_chromium_chromeos_rel_ng on master.tryserver.chromium.linux (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.linux/builders/linux_chromium_...)

[yzshen1, 2016-12-09 19:11:47]

On 2016/12/09 00:55:36, brettw (ping after 24h) wrote:
> Fix

LGTM

[brettw, 2016-12-09 20:15:35]

The CQ bit was checked by brettw@chromium.org

[brettw, 2016-12-09 20:15:35]

The patchset sent to the CQ was uploaded after l-g-t-m from dbeam@chromium.org
Link to the patchset: https://codereview.chromium.org/2561013002/#ps80001
(title: "Fix")

[commit-bot: I haz the power, 2016-12-09 20:16:30]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2016-12-10 03:50:34]

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

[commit-bot: I haz the power, 2016-12-10 03:50:35]

Try jobs failed on following builders:
  linux_chromium_compile_dbg_ng on master.tryserver.chromium.linux (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.linux/builders/linux_chromium_...)

[brettw, 2016-12-10 04:40:40]

The CQ bit was checked by brettw@chromium.org

[commit-bot: I haz the power, 2016-12-10 04:40:47]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2016-12-10 07:02:39]

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

[commit-bot: I haz the power, 2016-12-10 07:02:41]

Failed to apply patch for chrome/browser/search/instant_service.cc:
While running git apply --index -p1;
  error: patch failed: chrome/browser/search/instant_service.cc:49
  error: chrome/browser/search/instant_service.cc: patch does not apply

Patch:       chrome/browser/search/instant_service.cc
Index: chrome/browser/search/instant_service.cc
diff --git a/chrome/browser/search/instant_service.cc
b/chrome/browser/search/instant_service.cc
index
9470eed421117d2ad55d6b96977a911485358213..c3f524fb5416b3a352c1e44e5368fb3d7e26672f
100644
--- a/chrome/browser/search/instant_service.cc
+++ b/chrome/browser/search/instant_service.cc
@@ -49,13 +49,10 @@
 
 #if !defined(OS_ANDROID)
 #include "chrome/browser/search/local_ntp_source.h"
-#endif
-
-#if defined(ENABLE_THEMES)
 #include "chrome/browser/themes/theme_properties.h"
 #include "chrome/browser/themes/theme_service.h"
 #include "chrome/browser/themes/theme_service_factory.h"
-#endif  // defined(ENABLE_THEMES)
+#endif
 
 InstantService::InstantService(Profile* profile)
     : profile_(profile),
@@ -110,18 +107,15 @@ InstantService::InstantService(Profile* profile)
   }
 
   // Set up the data sources that Instant uses on the NTP.
-#if defined(ENABLE_THEMES)
+  // TODO(aurimas) remove this #if once instant_service.cc is no longer
compiled
+  // on Android.
+#if !defined(OS_ANDROID)
   // Listen for theme installation.
   registrar_.Add(this, chrome::NOTIFICATION_BROWSER_THEME_CHANGED,
                  content::Source<ThemeService>(
                      ThemeServiceFactory::GetForProfile(profile_)));
 
   content::URLDataSource::Add(profile_, new ThemeSource(profile_));
-#endif  // defined(ENABLE_THEMES)
-
-  // TODO(aurimas) remove this #if once instant_service.cc is no longer
compiled
-  // on Android.
-#if !defined(OS_ANDROID)
   content::URLDataSource::Add(profile_, new LocalNtpSource(profile_));
   content::URLDataSource::Add(profile_, new ThumbnailSource(profile_, false));
   content::URLDataSource::Add(profile_, new ThumbnailSource(profile_, true));
@@ -198,7 +192,7 @@ void InstantService::UndoAllMostVisitedDeletions() {
 }
 
 void InstantService::UpdateThemeInfo() {
-#if defined(ENABLE_THEMES)
+#if !defined(OS_ANDROID)
   // Update theme background info.
   // Initialize |theme_info| if necessary.
   if (!theme_info_) {
@@ -207,7 +201,7 @@ void InstantService::UpdateThemeInfo() {
     for (InstantServiceObserver& observer : observers_)
       observer.ThemeInfoChanged(*theme_info_);
   }
-#endif  // defined(ENABLE_THEMES)
+#endif  // !defined(OS_ANDROID)
 }
 
 void InstantService::UpdateMostVisitedItemsInfo() {
@@ -256,11 +250,11 @@ void InstantService::Observe(int type,
       OnRendererProcessTerminated(
           content::Source<content::RenderProcessHost>(source)->GetID());
       break;
-#if defined(ENABLE_THEMES)
+#if !defined(OS_ANDROID)
     case chrome::NOTIFICATION_BROWSER_THEME_CHANGED:
       OnThemeChanged();
       break;
-#endif  // defined(ENABLE_THEMES)
+#endif  // !defined(OS_ANDROID)
     default:
       NOTREACHED() << "Unexpected notification type in InstantService.";
   }
@@ -296,7 +290,7 @@ void InstantService::NotifyAboutMostVisitedItems() {
     observer.MostVisitedItemsChanged(most_visited_items_);
 }
 
-#if defined(ENABLE_THEMES)
+#if !defined(OS_ANDROID)
 
 namespace {
 
@@ -415,7 +409,7 @@ void InstantService::OnThemeChanged() {
   for (InstantServiceObserver& observer : observers_)
     observer.ThemeInfoChanged(*theme_info_);
 }
-#endif  // defined(ENABLE_THEMES)
+#endif  // !defined(OS_ANDROID)
 
 void InstantService::OnTemplateURLServiceChanged() {
   // Check whether the default search provider was changed.

[brettw, 2016-12-10 16:28:46]

Merge

[brettw, 2016-12-10 16:28:47]

The CQ bit was checked by brettw@chromium.org

[brettw, 2016-12-10 16:28:47]

The patchset sent to the CQ was uploaded after l-g-t-m from yzshen@chromium.org,
dbeam@chromium.org
Link to the patchset: https://codereview.chromium.org/2561013002/#ps100001
(title: "Merge")

[commit-bot: I haz the power, 2016-12-10 16:28:56]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2016-12-10 17:33:32]

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

[commit-bot: I haz the power, 2016-12-10 17:33:34]

Try jobs failed on following builders:
  linux_chromium_rel_ng on master.tryserver.chromium.linux (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.linux/builders/linux_chromium_...)

[brettw, 2016-12-10 17:58:36]

The CQ bit was checked by brettw@chromium.org

[commit-bot: I haz the power, 2016-12-10 17:58:44]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2016-12-10 18:29:42]

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

[commit-bot: I haz the power, 2016-12-10 18:29:43]

Try jobs failed on following builders:
  linux_chromium_asan_rel_ng on master.tryserver.chromium.linux (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.linux/builders/linux_chromium_...)

[brettw, 2016-12-10 18:30:18]

The CQ bit was checked by brettw@chromium.org

[commit-bot: I haz the power, 2016-12-10 18:30:33]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2016-12-10 19:49:41]

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

[commit-bot: I haz the power, 2016-12-10 19:49:43]

Try jobs failed on following builders:
  linux_android_rel_ng on master.tryserver.chromium.android (JOB_FAILED,
https://build.chromium.org/p/tryserver.chromium.android/builders/linux_androi...)

[brettw, 2016-12-10 21:15:42]

The CQ bit was checked by brettw@chromium.org

[commit-bot: I haz the power, 2016-12-10 21:15:50]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2016-12-10 23:02:56]

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

[commit-bot: I haz the power, 2016-12-10 23:02:57]

Try jobs failed on following builders:
  linux_android_rel_ng on master.tryserver.chromium.android (JOB_FAILED,
https://build.chromium.org/p/tryserver.chromium.android/builders/linux_androi...)

[brettw, 2016-12-11 01:56:00]

The CQ bit was checked by brettw@chromium.org

[commit-bot: I haz the power, 2016-12-11 01:56:10]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2016-12-11 02:34:10]

CQ is committing da patch.

Bot data: {"patchset_id": 100001, "attempt_start_ts": 1481421360284040,
"parent_rev": "6b2d10256884c3dae67031e8096fdf7889404244", "commit_rev":
"6820947febbdeaa67ae5c02b539f4b5fb9a6f4ae"}

[commit-bot: I haz the power, 2016-12-11 02:35:15]

Description was changed from

==========
Remove the enable_themes build flag and define.

This is always defined on non-mobile platforms and it is not possible to
override in the build. Since //chrome is no longer build on iOS, most uses
can be easily keyed off of the Android defines. For files not compiled on
Android, the conditionals were removed altogether.

This change additionally coalesces some Android blocks in
chrome/browser/BUILD.gn and chrome/browser/ui/BUILD.gn

BUG=671706
==========

to

==========
Remove the enable_themes build flag and define.

This is always defined on non-mobile platforms and it is not possible to
override in the build. Since //chrome is no longer build on iOS, most uses
can be easily keyed off of the Android defines. For files not compiled on
Android, the conditionals were removed altogether.

This change additionally coalesces some Android blocks in
chrome/browser/BUILD.gn and chrome/browser/ui/BUILD.gn

BUG=671706

Review-Url: https://codereview.chromium.org/2561013002
==========

[commit-bot: I haz the power, 2016-12-11 02:35:16]

Committed patchset #6 (id:100001)

[commit-bot: I haz the power, 2016-12-12 15:07:37]

Description was changed from

==========
Remove the enable_themes build flag and define.

This is always defined on non-mobile platforms and it is not possible to
override in the build. Since //chrome is no longer build on iOS, most uses
can be easily keyed off of the Android defines. For files not compiled on
Android, the conditionals were removed altogether.

This change additionally coalesces some Android blocks in
chrome/browser/BUILD.gn and chrome/browser/ui/BUILD.gn

BUG=671706

Review-Url: https://codereview.chromium.org/2561013002
==========

to

==========
Remove the enable_themes build flag and define.

This is always defined on non-mobile platforms and it is not possible to
override in the build. Since //chrome is no longer build on iOS, most uses
can be easily keyed off of the Android defines. For files not compiled on
Android, the conditionals were removed altogether.

This change additionally coalesces some Android blocks in
chrome/browser/BUILD.gn and chrome/browser/ui/BUILD.gn

BUG=671706

Committed: https://crrev.com/9b0866fd103e996c5927d183dfa68f0931a76a45
Cr-Commit-Position: refs/heads/master@{#437784}
==========

[commit-bot: I haz the power, 2016-12-12 15:07:38]

Patchset 6 (id:??) landed as
https://crrev.com/9b0866fd103e996c5927d183dfa68f0931a76a45
Cr-Commit-Position: refs/heads/master@{#437784}