1)When we enabled breakpad on first run we weren't correctly setting the process type.

2)Fixed another logic inversion in SetActiveRendererURL.
3)Change IsCrashReporterEnabled-> IsCrashReporterDisabled to prevent future confusion since that was the question all the callers where askign anyway.

Review URL: http://codereview.chromium.org/113737

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@16707 0039d316-1c4b-4281-b951-d872f2087c98

6 files changed, 10 insertions, 9 deletions

diff --git a/chrome/app/breakpad_mac.h b/chrome/app/breakpad_mac.h
index 3d8ab32..9c48752 100644
--- a/chrome/app/breakpad_mac.h
+++ b/chrome/app/breakpad_mac.h
@@ -15,8 +15,8 @@ void InitCrashReporter();
 // CommandLine::Init has been called.
 void InitCrashProcessInfo();
 
-// Is Breakpad enabled?
-bool IsCrashReporterEnabled();
+// Is Breakpad disabled?
+bool IsCrashReporterDisabled();
 
 // Call on clean process shutdown.
 void DestructCrashReporter();
diff --git a/chrome/app/breakpad_mac.mm b/chrome/app/breakpad_mac.mm
index 9155e29..bda33fe4 100644
--- a/chrome/app/breakpad_mac.mm
+++ b/chrome/app/breakpad_mac.mm
@@ -49,8 +49,8 @@ BreakpadRef gBreakpadRef = NULL;
 
 } // namespace
 
-bool IsCrashReporterEnabled() {
-  return gBreakpadRef != NULL;
+bool IsCrashReporterDisabled() {
+  return gBreakpadRef == NULL;
 }
 
 void DestructCrashReporter() {
diff --git a/chrome/app/breakpad_mac_stubs.mm b/chrome/app/breakpad_mac_stubs.mm
index d70fce6..ea5cfdc 100644
--- a/chrome/app/breakpad_mac_stubs.mm
+++ b/chrome/app/breakpad_mac_stubs.mm
@@ -7,8 +7,8 @@
 // Stubbed out versions of breakpad integration functions so we can compile
 // unit tests without linking in Breakpad.
 
-bool IsCrashReporterEnabled() {
-  return false;
+bool IsCrashReporterDisabled() {
+  return true;
 }
 
 void InitCrashProcessInfo() {
diff --git a/chrome/app/chrome_dll_main.cc b/chrome/app/chrome_dll_main.cc
index 223b303..87c0598 100644
--- a/chrome/app/chrome_dll_main.cc
+++ b/chrome/app/chrome_dll_main.cc
@@ -272,7 +272,7 @@ int ChromeMain(int argc, const char** argv) {
 #if defined(OS_MACOSX)
   // If Breakpad is not present then turn off os crash dumps so we don't have
   // to wait eons for Apple's Crash Reporter to generate a dump.
-  if (!IsCrashReporterEnabled()) {
+  if (IsCrashReporterDisabled()) {
     DebugUtil::DisableOSCrashDumps();
   }
 #endif
diff --git a/chrome/browser/first_run_mac.mm b/chrome/browser/first_run_mac.mm
index 41bc9a5..70d1afd 100644
--- a/chrome/browser/first_run_mac.mm
+++ b/chrome/browser/first_run_mac.mm
@@ -35,7 +35,7 @@ void OpenFirstRunDialog(Profile* profile, ProcessSingleton* process_singleton) {
   // but display a confirmation dialog before sending a crash report so we
   // respect a user's privacy while still getting any crashes that might happen
   // before this point.  Then remove the need for that dialog here.
-  DCHECK(!IsCrashReporterEnabled());
+  DCHECK(IsCrashReporterDisabled());
 
   scoped_nsobject<FirstRunDialogController> dialog(
       [[FirstRunDialogController alloc] init]);
@@ -49,6 +49,7 @@ void OpenFirstRunDialog(Profile* profile, ProcessSingleton* process_singleton) {
   // stats, enable breakpad.
   if (stats_enabled) {
     InitCrashReporter();
+    InitCrashProcessInfo();
   }
 #endif  // defined(GOOGLE_CHROME_BUILD)
 }
diff --git a/chrome/renderer/renderer_logging_mac.mm b/chrome/renderer/renderer_logging_mac.mm
index d108a85..bb0ea92 100644
--- a/chrome/renderer/renderer_logging_mac.mm
+++ b/chrome/renderer/renderer_logging_mac.mm
@@ -61,7 +61,7 @@ void SetActiveRendererURLImpl(const GURL& url,
 
 void SetActiveRendererURL(const GURL& url) {
   // If Breakpad isn't initialized then bail.
-  if (IsCrashReporterEnabled()) {
+  if (IsCrashReporterDisabled()) {
     return;
   }