Add -devel suffix in UMA versions for non-Chrome-branded builds.

Previously, it would do this only for non-official builds. Now,
we check both.

Bug: 880853
Change-Id: I0f37a32ede20cdcb7379a748341203eab7028cf1
Reviewed-on: https://chromium-review.googlesource.com/1207211Reviewed-by: Nico Weber <thakis@chromium.org>
Reviewed-by: Ilya Sherman <isherman@chromium.org>
Commit-Queue: Ilya Sherman <isherman@chromium.org>
Cr-Commit-Position: refs/heads/master@{#588961}

components/metrics/version_utils.cc

@@ -15,7 +15,13 @@ std::string GetVersionString() {
 #if defined(ARCH_CPU_64_BITS)
   version += "-64";
 #endif  // defined(ARCH_CPU_64_BITS)
-  if (!version_info::IsOfficialBuild())
+
+#if defined(GOOGLE_CHROME_BUILD)
+  bool is_chrome_branded = true;
+#else
+  bool is_chrome_branded = false;
+#endif
+  if (!is_chrome_branded || !version_info::IsOfficialBuild())
     version.append("-devel");
   return version;
 }