Remove PRODUCT_STRING_PATH from chrome_constants.h on Windows.

chrome/common/chrome_constants.h

Index: chrome/common/chrome_constants.h
diff --git a/chrome/common/chrome_constants.h b/chrome/common/chrome_constants.h
index 5805daa7864bc07e4e7601df180584a3cf10bc49..170db737486d4577e2c22c5f2746e1053c0c21e7 100644
--- a/chrome/common/chrome_constants.h
+++ b/chrome/common/chrome_constants.h
@@ -13,16 +13,8 @@
 #include "build/build_config.h"
 
 #if defined(OS_WIN)
-// Do not use this, instead use BrowserDistribution's methods which will ensure
-// Google Chrome and Canary installs don't collide. http://crbug.com/577820
-#if defined(GOOGLE_CHROME_BUILD)
-#define PRODUCT_STRING_PATH L"Google\\Chrome"
-#elif defined(CHROMIUM_BUILD)
-#define PRODUCT_STRING_PATH L"Chromium"
-#else
-#error Unknown branding
-#endif
-#endif  // defined(OS_WIN)
+#include "base/strings/string16.h"
+#endif  // OS_WIN
 
 namespace chrome {
 
@@ -119,14 +111,6 @@ extern const int kHighestRendererOomScore;
 extern const wchar_t kMetroNavigationAndSearchMessage[];
 // Used by Metro Chrome to get information about the current tab.
 extern const wchar_t kMetroGetCurrentTabInfoMessage[];
-// Used to store crash report metrics using
-// content/browser_watcher/crash_reporting_metrics_win.h.
-extern const wchar_t kBrowserCrashDumpAttemptsRegistryPath[];
-extern const wchar_t kBrowserCrashDumpAttemptsRegistryPathSxS[];
-// Registry location where the browser watcher stores browser exit codes.
-// This is picked up and stored in histograms by the browser on the subsequent
-// launch.
-extern const wchar_t kBrowserExitCodesRegistryPath[];
 #endif
 
 #if defined(OS_CHROMEOS)
@@ -148,6 +132,16 @@ extern const char kApplicationClientIDStringForAVScanning[];
 // The largest reasonable length we'd assume for a meta tag attribute.
 extern const size_t kMaxMetaTagAttributeLength;
 
+#if defined(OS_WIN)
+// Returns the registry path where crash dump attempts are stored for this
+// product. This is used by breakpad and the metrics reporting.
+base::string16 GetBrowserCrashDumpAttemptsRegistryPath();

[grt (UTC plus 2), 2016/01/25 21:18:20]

is there a better place than a *_constants.{cc,h} pair for these functions? i
prefer keeping only constants in these sorts of files.

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

How about chrome_constants_util_win.{cc,h} ?

[grt (UTC plus 2), 2016/01/26 16:13:04]

WDYT about chrome/common/chrome_paths_win.cc? A registry path is a kind of
path...

[gab, 2016/01/26 18:23:29]

I prefer "constants_util", _paths is already used in the codebase and only ever
used for file paths (and meant for PathService) so using it for registry paths +
without PathService feels wrong.

+
+// Returns the registry path where exit code are stored for this product. This
+// is used by browser exit code metrics reporting.
+base::string16 GetBrowserExitCodesRegistryPath();
+#endif  // OS_WIN
+
 }  // namespace chrome
 
 #endif  // CHROME_COMMON_CHROME_CONSTANTS_H_