Fix the first_run regression issue related to skip_first_run_ui setting processing.

chrome/browser/first_run/first_run.cc

 // 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.
 
 #include "chrome/browser/first_run/first_run.h"
 
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/file_util.h"
 #include "base/metrics/histogram.h"
@@ skipping 248 matching lines @@
 void SetShowWelcomePagePrefIfNeeded(
     installer::MasterPreferences* install_prefs) {
   bool value = false;
   if (install_prefs->GetBool(
           installer::master_preferences::kDistroShowWelcomePage, &value)
           && value) {
     SetShowWelcomePagePref();
   }
 }
 
-bool SkipFirstRunUI(installer::MasterPreferences* install_prefs) {
+bool NotSkipFirstRunUI(installer::MasterPreferences* install_prefs) {

[msw, 2012/07/10 01:51:21]

I dislike this name, please leave it SkipFirstRunUI.

[jennyz, 2012/07/10 16:07:16]

Done.

   // TODO(mirandac): Refactor skip-first-run-ui process into regular first run
   // import process.  http://crbug.com/49647
   // Note we are skipping all other master preferences if skip-first-run-ui

[msw, 2012/07/10 01:51:21]

This note/comment belong with the code that actually returns early if the value
isn't specified. Or, (if you prefer) you can make a utility function here like
"bool HasMasterPrefs()" that just returns whether or not this bool is specified
(presuming that we still intend to enforce the behavior described here), and put
the comment there.

[jennyz, 2012/07/10 16:07:16]

Done.

   // is *not* specified. (That is, we continue only if skipping first run ui.)
   bool value = false;
-  return (install_prefs->GetBool(
-          installer::master_preferences::kDistroSkipFirstRunPref,
-          &value) || !value);
+  return (!install_prefs->GetBool(

[msw, 2012/07/10 01:51:21]

In keeping the original name, this function can just do:
bool value = false;             (returns false by default)
install_prefs->GetBool(...);    (ignore the read success/fail)
return value;

[jennyz, 2012/07/10 16:07:16]

Done.

+             installer::master_preferences::kDistroSkipFirstRunPref, &value)
+          || !value);
 }
 
 void SetRLZPref(first_run::MasterPrefs* out_prefs,
                 installer::MasterPreferences* install_prefs) {
   if (!install_prefs->GetInt(installer::master_preferences::kDistroPingDelay,
                     &out_prefs->ping_delay)) {
     // Default value in case master preferences is missing or corrupt,
     // or ping_delay is missing.
     out_prefs->ping_delay = 90;
   }
@@ skipping 253 matching lines @@
 
   // Reset the preference and notifications to avoid showing the bubble again.
   prefs->SetBoolean(prefs::kShouldShowFirstRunBubble, false);
 
   // Show the bubble now and destroy this bubble launcher.
   browser->ShowFirstRunBubble();
   delete this;
 }
 
 }  // namespace first_run