4 files changed, 5 insertions, 17 deletions
diff --git a/chrome/app/breakpad_win.cc b/chrome/app/breakpad_win.cc
index 56f5e9b9..53c397e 100644..100755
--- a/chrome/app/breakpad_win.cc
+++ b/chrome/app/breakpad_win.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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.
 
@@ -727,11 +727,7 @@ static DWORD __stdcall InitCrashReporterThread(void* param) {
       google_breakpad::ExceptionHandler::HANDLER_NONE,
       dump_type, pipe_name.c_str(), info->custom_info);
 
-  if (!g_breakpad->IsOutOfProcess()) {
-    // The out-of-process handler is unavailable.
-    scoped_ptr<base::Environment> env(base::Environment::Create());
-    env->SetVar(env_vars::kNoOOBreakpad, WideToUTF8(info->process_type));
-  } else {
+  if (g_breakpad->IsOutOfProcess()) {
     // Tells breakpad to handle breakpoint and single step exceptions.
     // This might break JIT debuggers, but at least it will always
     // generate a crashdump for these exceptions.
diff --git a/chrome/browser/chrome_browser_main_win.cc b/chrome/browser/chrome_browser_main_win.cc
index 246ff34..a3d5e05 100644..100755
--- a/chrome/browser/chrome_browser_main_win.cc
+++ b/chrome/browser/chrome_browser_main_win.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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.
 
@@ -77,9 +77,6 @@ int GetMinimumFontSize() {
 }  // namespace
 
 void RecordBreakpadStatusUMA(MetricsService* metrics) {
-  DWORD len = ::GetEnvironmentVariableW(
-      ASCIIToWide(env_vars::kNoOOBreakpad).c_str() , NULL, 0);
-  metrics->RecordBreakpadRegistration((len == 0));
   metrics->RecordBreakpadHasDebugger(TRUE == ::IsDebuggerPresent());
 }
 
diff --git a/chrome/common/env_vars.cc b/chrome/common/env_vars.cc
index f63d3e4..f75da13 100644..100755
--- a/chrome/common/env_vars.cc
+++ b/chrome/common/env_vars.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// 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.
 
@@ -33,10 +33,6 @@ const char kRestartInfo[] = "CHROME_RESTART";
 const char kRtlLocale[] = "RIGHT_TO_LEFT";
 const char kLtrLocale[] = "LEFT_TO_RIGHT";
 
-// If the out-of-process breakpad could not be installed, we set this variable
-// according to the process.
-const char kNoOOBreakpad[] = "NO_OO_BREAKPAD";
-
 // Number of times to run a given startup_tests unit test.
 const char kStartupTestsNumCycles[] = "STARTUP_TESTS_NUMCYCLES";
 
diff --git a/chrome/common/env_vars.h b/chrome/common/env_vars.h
index 320a0b4..c31235b 100644..100755
--- a/chrome/common/env_vars.h
+++ b/chrome/common/env_vars.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// 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.
 
@@ -18,7 +18,6 @@ extern const char kShowRestart[];
 extern const char kRestartInfo[];
 extern const char kRtlLocale[];
 extern const char kLtrLocale[];
-extern const char kNoOOBreakpad[];
 extern const char kStartupTestsNumCycles[];
 
 }  // namespace env_vars