Fix several bugs in First Run.

chrome/browser/first_run_mac.mm

 // Copyright (c) 2009 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/browser/first_run.h"
 
 #import "base/scoped_nsobject.h"
 #include "base/sys_string_conversions.h"
 #import "chrome/app/breakpad_mac.h"
 #import "chrome/browser/cocoa/first_run_dialog.h"
@@ skipping 102 matching lines @@
 
   // FirstRunDialogController will call exit if "Cancel" is clicked.
   [dialog.get() showWindow:nil];
 
   // If user clicked cancel, bail - browser_main will return if we haven't
   // turned off the first run flag when this function returns.
   if ([dialog.get() userDidCancel]) {
     return false;
   }
 
-// Don't enable stats in Chromium.
 #if defined(GOOGLE_CHROME_BUILD)
   BOOL stats_enabled = [dialog.get() statsEnabled];
 
   // Breakpad is normally enabled very early in the startup process,
   // however, on the first run it's off by default.  If the user opts-in to
   // stats, enable breakpad.
   if (stats_enabled) {
     InitCrashReporter();
     InitCrashProcessInfo();
   }
 
+
+#else

[stuartmorgan, 2009/08/12 17:49:46]

Seems like this would make more sense right after the other declaration of
stats_enabled; cutting out the |if| doesn't really buy us anything.

+  // Don't enable stats in Chromium.
+  BOOL stats_enabled = NO;
+#endif  // GOOGLE_CHROME_BUILD
+
   GoogleUpdateSettings::SetCollectStatsConsent(stats_enabled);
-#endif  // GOOGLE_CHROME_BUILD
 
   // If selected set as default browser.
   BOOL make_default_browser = [dialog.get() makeDefaultBrowser];
   if (make_default_browser) {
     bool success = ShellIntegration::SetAsDefaultBrowser();
     DCHECK(success);
   }
 
   // Import bookmarks.
   if ([dialog.get() importBookmarks]) {
     const ProfileInfo& source_profile = importer_host_->GetSourceProfileInfoAt(
         [dialog.get() browserImportSelectedIndex]);
     int16 items = source_profile.services_supported;
     // TODO(port): Do the actual import in a new process like Windows.
     gc.release();
     StartImportingWithUI(nil, items, importer_host_.get(),
                          source_profile, profile, this, true);
   }
 
   return true;
 }