commit 1c20e7b529099d1a1592ac45a78a39758a086fb4
author Daniel Bratell <bratell@opera.com> Wed May 22 18:45:33 2019
committer Commit Bot <commit-bot@chromium.org> Wed May 22 18:45:33 2019
tree 4ea576b1e674058a39a38eb1e81187734e2d1998
parent d49831516b1840cc2ac1599ddd327060d07b184c

Avoid having two kImageFetcherUmaClientName in chrome/browser/search

In some extreme (non default) jumbo builds, the two
kImageFetcherUmaClientName would end up in the same translation unit and
break those builds. Since they represent two different strings, this
patch gives them unique names.

Bug: 874325
Change-Id: I4f69d78b7ce9f15a9907f6356f21affd506579a5
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1621177
Auto-Submit: Daniel Bratell <bratell@opera.com>
Reviewed-by: Kyle Milka <kmilka@chromium.org>
Commit-Queue: Daniel Bratell <bratell@opera.com>
Cr-Commit-Position: refs/heads/master@{#662285}

chrome/browser/search/instant_service.cc

diff --git a/chrome/browser/search/instant_service.cc b/chrome/browser/search/instant_service.cc
index 12f07f9..512167f 100644
--- a/chrome/browser/search/instant_service.cc
+++ b/chrome/browser/search/instant_service.cc
@@ -66,7 +66,7 @@
 const char kNtpCustomBackgroundAttributionActionURL[] =
     "attribution_action_url";
 
-const char kImageFetcherUmaClientName[] = "NtpCustomBackgrounds";
+const char kCustomBackgroundsUmaClientName[] = "NtpCustomBackgrounds";
 
 base::DictionaryValue GetBackgroundInfoAsDict(
     const GURL& background_url,
@@ -813,7 +813,7 @@
     })");
 
   image_fetcher::ImageFetcherParams params(traffic_annotation,
-                                           kImageFetcherUmaClientName);
+                                           kCustomBackgroundsUmaClientName);
   image_fetcher_->FetchImage(
       image_url,
       base::BindOnce(&InstantService::UpdateCustomBackgroundColorAsync,

chrome/browser/search/ntp_icon_source.cc

diff --git a/chrome/browser/search/ntp_icon_source.cc b/chrome/browser/search/ntp_icon_source.cc
index fbde10ae..24a4792 100644
--- a/chrome/browser/search/ntp_icon_source.cc
+++ b/chrome/browser/search/ntp_icon_source.cc
@@ -59,7 +59,7 @@
 
 namespace {
 
-const char kImageFetcherUmaClientName[] = "NtpIconSource";
+const char kIconSourceUmaClientName[] = "NtpIconSource";
 
 // The color of the letter drawn for a fallback icon.  Changing this may require
 // changing the algorithm in RenderIconBitmap() that guarantees contrast.
@@ -425,7 +425,7 @@
         policy_exception_justification: "Not implemented."
       })");
   image_fetcher::ImageFetcherParams params(traffic_annotation,
-                                           kImageFetcherUmaClientName);
+                                           kIconSourceUmaClientName);
   params.set_frame_size(
       gfx::Size(request.icon_size_in_pixels, request.icon_size_in_pixels));
   image_fetcher_->FetchImage(