The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/76a90fd93f34f1adad1da31c12f7ffbd3a1f7519

commit 76a90fd93f34f1adad1da31c12f7ffbd3a1f7519
Author: Marcin Wiacek <marcin@mwiacek.com>
Date: Wed Oct 17 17:43:47 2018

kFaviconsPerCategoryImage compilation fix for Jumbo builds

Fix for error during creating chrome_public_apk:

In file included from gen/chrome/browser/browser_jumbo_17.cc:42:
./../../chrome/browser/android/explore_sites/image_helper.cc:22:11: error: redefinition of 'kFaviconsPerCategoryImage'
const int kFaviconsPerCategoryImage = 4;
          ^
./../../chrome/browser/android/explore_sites/explore_sites_service_impl.cc:27:11: note: previous definition is here
const int kFaviconsPerCategoryImage = 4;
          ^
1 error generated.

Example compilation settings:

target_os="android"
target_cpu="arm"
enable_nacl=false
symbol_level=0
remove_webcore_debug_symbols=true
is_debug=false
dcheck_always_on=false
is_component_build=false
use_jumbo_build=true

BUG= 895593 

Change-Id: Ic9eaae0239fd4ab53a357df7dff2143b0cc921c4
Reviewed-on: https://chromium-review.googlesource.com/c/1285056
Reviewed-by: Cathy Li <chili@chromium.org>
Commit-Queue: Marcin Wiącek <marcin@mwiacek.com>
Cr-Commit-Position: refs/heads/master@{#600459}
[modify] https://crrev.com/76a90fd93f34f1adad1da31c12f7ffbd3a1f7519/chrome/browser/android/explore_sites/explore_sites_service_impl.cc
[modify] https://crrev.com/76a90fd93f34f1adad1da31c12f7ffbd3a1f7519/chrome/browser/android/explore_sites/image_helper.cc
[modify] https://crrev.com/76a90fd93f34f1adad1da31c12f7ffbd3a1f7519/chrome/browser/android/explore_sites/image_helper.h

Fixed in: 
  https://chromium.googlesource.com/chromium/src/+/8c97247e25f177b4fadb9b8158706e4914cfaaff

commit	8c97247e25f177b4fadb9b8158706e4914cfaaff
Author:	Daniel Bratell <bratell@opera.com>
Date: Tue Oct 16 23:07:29 2018

[jumbo] Merge two identical kFaviconsPerCategoryImage constants

In some jumbo build experiments (not official) there was an
identical constant in two explore_sites files. In jumbo builds
many cc files are merged into one translation unit for much
faster compilation.

This moves the constant to a header where it can be reused.

Change-Id: Id460645a39d69999bf2227c25651d1149f1a6d6c
Reviewed-on: https://chromium-review.googlesource.com/c/1275895
Commit-Queue: Justin DeWitt <dewittj@chromium.org>
Reviewed-by: Justin DeWitt <dewittj@chromium.org>
Cr-Commit-Position: refs/heads/master@{#600172}

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/3ebb371d0dccbe15f469bce829304de6e1ebcc03

commit 3ebb371d0dccbe15f469bce829304de6e1ebcc03
Author: Justin DeWitt <dewittj@chromium.org>
Date: Wed Oct 17 20:08:47 2018

Revert "kFaviconsPerCategoryImage compilation fix for Jumbo builds"

This reverts commit 76a90fd93f34f1adad1da31c12f7ffbd3a1f7519.

Reason for revert: <INSERT REASONING HERE>

Original change's description:
> kFaviconsPerCategoryImage compilation fix for Jumbo builds
> 
> Fix for error during creating chrome_public_apk:
> 
> In file included from gen/chrome/browser/browser_jumbo_17.cc:42:
> ./../../chrome/browser/android/explore_sites/image_helper.cc:22:11: error: redefinition of 'kFaviconsPerCategoryImage'
> const int kFaviconsPerCategoryImage = 4;
>           ^
> ./../../chrome/browser/android/explore_sites/explore_sites_service_impl.cc:27:11: note: previous definition is here
> const int kFaviconsPerCategoryImage = 4;
>           ^
> 1 error generated.
> 
> Example compilation settings:
> 
> target_os="android"
> target_cpu="arm"
> enable_nacl=false
> symbol_level=0
> remove_webcore_debug_symbols=true
> is_debug=false
> dcheck_always_on=false
> is_component_build=false
> use_jumbo_build=true
> 
> BUG= 895593 
> 
> Change-Id: Ic9eaae0239fd4ab53a357df7dff2143b0cc921c4
> Reviewed-on: https://chromium-review.googlesource.com/c/1285056
> Reviewed-by: Cathy Li <chili@chromium.org>
> Commit-Queue: Marcin Wiącek <marcin@mwiacek.com>
> Cr-Commit-Position: refs/heads/master@{#600459}

TBR=dewittj@chromium.org,dimich@chromium.org,chili@chromium.org,marcin@mwiacek.com,freedjm@chromium.org

Change-Id: Ia4b4969a8036063a1a44f843f3fbddc044eb6dae
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug:  895593 
Reviewed-on: https://chromium-review.googlesource.com/c/1287094
Reviewed-by: Justin DeWitt <dewittj@chromium.org>
Commit-Queue: Justin DeWitt <dewittj@chromium.org>
Cr-Commit-Position: refs/heads/master@{#600534}
[modify] https://crrev.com/3ebb371d0dccbe15f469bce829304de6e1ebcc03/chrome/browser/android/explore_sites/explore_sites_service_impl.cc
[modify] https://crrev.com/3ebb371d0dccbe15f469bce829304de6e1ebcc03/chrome/browser/android/explore_sites/image_helper.cc
[modify] https://crrev.com/3ebb371d0dccbe15f469bce829304de6e1ebcc03/chrome/browser/android/explore_sites/image_helper.h