Remove PRODUCT_STRING_PATH from chrome_constants.h on Windows.

chrome/common/chrome_constants.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "build/build_config.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_version.h"
 
+#if defined(OS_WIN)
+#include "chrome/installer/util/browser_distribution.h"
+#endif
+
 #define FPL FILE_PATH_LITERAL
 
 #if defined(OS_MACOSX)
 #define CHROMIUM_PRODUCT_STRING "Chromium"
 #if defined(GOOGLE_CHROME_BUILD)
 #define PRODUCT_STRING "Google Chrome"
 #elif defined(CHROMIUM_BUILD)
 #define PRODUCT_STRING "Chromium"
 #else
 #error Unknown branding
@@ skipping 181 matching lines @@
 #if defined(OS_LINUX)
 const int kLowestRendererOomScore = 300;
 const int kHighestRendererOomScore = 1000;
 #endif
 
 #if defined(OS_WIN)
 const wchar_t kMetroNavigationAndSearchMessage[] =
     L"CHROME_METRO_NAV_SEARCH_REQUEST";
 const wchar_t kMetroGetCurrentTabInfoMessage[] =
     L"CHROME_METRO_GET_CURRENT_TAB_INFO";
-// This is used by breakpad and the metrics reporting.
-const wchar_t kBrowserCrashDumpAttemptsRegistryPath[] =
-    L"Software\\" PRODUCT_STRING_PATH L"\\BrowserCrashDumpAttempts";
-const wchar_t kBrowserCrashDumpAttemptsRegistryPathSxS[] =
-    L"Software\\" PRODUCT_STRING_PATH L"\\BrowserCrashDumpAttemptsSxS";
-// This is used by browser exit code metrics reporting.
-const wchar_t kBrowserExitCodesRegistryPath[] =
-    L"Software\\" PRODUCT_STRING_PATH L"\\BrowserExitCodes";
 #endif
 
 #if defined(OS_CHROMEOS)
 const char kProfileDirPrefix[] = "u-";
 const char kLegacyProfileDir[] = "user";
 const char kTestUserProfileDir[] = "test-user";
 #endif
 
 // This GUID is associated with any 'don't ask me again' settings that the
 // user can select for different file types.
 // {2676A9A2-D919-4FEE-9187-152100393AB2}
 const char kApplicationClientIDStringForAVScanning[] =
     "2676A9A2-D919-4FEE-9187-152100393AB2";
 
 const size_t kMaxMetaTagAttributeLength = 2000;
 
+#if defined(OS_WIN)
+
+namespace {
+
+base::string16 GetSuffixedRegistryPath(const wchar_t* suffix) {
+  BrowserDistribution* chrome_distribution =

[Sigurður Ásgeirsson, 2016/01/25 20:50:24]

will this return the same constants as previously, or will this abandon existing
data?

[gab, 2016/01/26 02:55:05]

This will return the same constant as previously for Google Chrome
Dev/Beta/Stable but will return a new product specific constant for SxS Canary
(see CL description for details).

+      BrowserDistribution::GetDistribution();
+  DCHECK(chrome_distribution);
+  DCHECK_EQ(BrowserDistribution::CHROME_BROWSER,
+            chrome_distribution->GetType());
+  return chrome_distribution->GetRegistryPath() + suffix;
+}
+
+}  // namespace
+
+base::string16 GetBrowserCrashDumpAttemptsRegistryPath() {
+  return GetSuffixedRegistryPath(L"\\BrowserCrashDumpAttempts");
+}
+
+base::string16 GetBrowserExitCodesRegistryPath() {
+  return GetSuffixedRegistryPath(L"\\BrowserExitCodes");
+}
+
+#endif  // OS_WIN
+
 }  // namespace chrome
 
 #undef FPL