Fix stack symbolization in Telemetry on Windows.

chrome/app/chrome_crash_reporter_client.cc

 // Copyright 2013 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 "chrome/app/chrome_crash_reporter_client.h"
 
 #include "base/command_line.h"
 #include "base/environment.h"
 #include "base/files/file_path.h"
 #include "base/logging.h"
@@ skipping 264 matching lines @@
   *version = PRODUCT_VERSION;
 }
 
 base::FilePath ChromeCrashReporterClient::GetReporterLogFilename() {
   return base::FilePath(CrashUploadList::kReporterLogFilename);
 }
 #endif
 
 bool ChromeCrashReporterClient::GetCrashDumpLocation(
     base::FilePath* crash_dir) {
-#if defined(OS_WIN)
-  // TODO(scottmg): Consider supporting --user-data-dir. See
-  // https://crbug.com/565446.
-  return chrome::GetDefaultCrashDumpLocation(crash_dir);
-#else
   // By setting the BREAKPAD_DUMP_LOCATION environment variable, an alternate
   // location to write breakpad crash dumps can be set.
   scoped_ptr<base::Environment> env(base::Environment::Create());
   std::string alternate_crash_dump_location;
   if (env->GetVar("BREAKPAD_DUMP_LOCATION", &alternate_crash_dump_location)) {
     base::FilePath crash_dumps_dir_path =
         base::FilePath::FromUTF8Unsafe(alternate_crash_dump_location);
+
+#if defined(OS_WIN)
+    // If this environment variable exists, then for the time being,
+    // short-circuit how it's handled on Windows. Honoring this
+    // variable is required in order to symbolize stack traces in
+    // Telemetry based tests: http://crbug.com/561763.
+    *crash_dir = crash_dumps_dir_path;
+    return true;
+#else
     PathService::Override(chrome::DIR_CRASH_DUMPS, crash_dumps_dir_path);
+#endif
   }
 
+#if defined(OS_WIN)
+  // TODO(scottmg): Consider supporting --user-data-dir. See
+  // https://crbug.com/565446.
+  return chrome::GetDefaultCrashDumpLocation(crash_dir);
+#else
   return PathService::Get(chrome::DIR_CRASH_DUMPS, crash_dir);
 #endif
 }
 
 size_t ChromeCrashReporterClient::RegisterCrashKeys() {
   return crash_keys::RegisterChromeCrashKeys();
 }
 
 bool ChromeCrashReporterClient::IsRunningUnattended() {
   scoped_ptr<base::Environment> env(base::Environment::Create());
@@ skipping 35 matching lines @@
 #endif
 
 bool ChromeCrashReporterClient::EnableBreakpadForProcess(
     const std::string& process_type) {
   return process_type == switches::kRendererProcess ||
          process_type == switches::kPluginProcess ||
          process_type == switches::kPpapiPluginProcess ||
          process_type == switches::kZygoteProcess ||
          process_type == switches::kGpuProcess;
 }