Simplify LoginState methods.

chrome/browser/metrics/perf_provider_chromeos.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 <string>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/callback.h"
 #include "base/command_line.h"
@@ skipping 68 matching lines @@
 // Name of the histogram that represents the success and various failure modes
 // for collecting and sending perf data.
 const char kGetPerfDataOutcomeHistogram[] = "UMA.Perf.GetData";
 
 void AddToPerfHistogram(GetPerfDataOutcome outcome) {
   UMA_HISTOGRAM_ENUMERATION(kGetPerfDataOutcomeHistogram,
                             outcome,
                             NUM_OUTCOMES);
 }
 
-// Returns true if a normal user is logged in. Returns false if logged in as an
-// guest or as a kiosk app.
+// Returns true if a normal user is logged in. Returns false otherwise (e.g. if
+// logged in as a guest or as a kiosk app).
 bool IsNormalUserLoggedIn() {
-  chromeos::LoginState* login_state = chromeos::LoginState::Get();
-  return (login_state->IsUserLoggedIn() && !login_state->IsGuestUser() &&
-          !login_state->IsKioskApp());
+  return chromeos::LoginState::Get()->IsUserAuthenticated();
 }
 
 }  // namespace
 
 
 namespace metrics {
 
 // This class must be created and used on the UI thread. It watches for any
 // incognito window being opened from the time it is instantiated to the time it
 // is destroyed.
@@ skipping 293 matching lines @@
   DCHECK(!login_time_.is_null());
   collection_data.
       set_ms_after_login((base::TimeTicks::Now() - login_time_)
           .InMilliseconds());
 
   // Finally, store the perf data itself.
   collection_data.mutable_perf_data()->Swap(&perf_data_proto);
 }
 
 }  // namespace metrics