Add LoginState class to src/chromeos/login

chrome/browser/chromeos/status/data_promo_notification.cc

Index: chrome/browser/chromeos/status/data_promo_notification.cc
diff --git a/chrome/browser/chromeos/status/data_promo_notification.cc b/chrome/browser/chromeos/status/data_promo_notification.cc
index edda26f8f81a90787f36f607f63cc7d7a87c5767..b02d4854251b66b091d04a9ec3f6947ecde24e0d 100644
--- a/chrome/browser/chromeos/status/data_promo_notification.cc
+++ b/chrome/browser/chromeos/status/data_promo_notification.cc
@@ -16,13 +16,13 @@
 #include "chrome/browser/chromeos/cros/cros_library.h"
 #include "chrome/browser/chromeos/cros/network_library.h"
 #include "chrome/browser/chromeos/login/helper.h"
-#include "chrome/browser/chromeos/login/user_manager.h"
 #include "chrome/browser/chromeos/mobile_config.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/common/pref_names.h"
+#include "chromeos/login/login_state.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "ui/base/l10n/l10n_util.h"
@@ -137,11 +137,12 @@ void DataPromoNotification::ShowOptionalMobileDataPromoNotification(
     NetworkLibrary* cros,
     views::View* host,
     ash::NetworkTrayDelegate* listener) {
-  // Display one-time notification for non-Guest users on first use
+  // Display one-time notification for normal users on first use

[bartfab (slow), 2013/04/05 13:16:33]

Nit: s/normal/regular/

[stevenjb, 2013/04/05 18:17:15]

Done.

   // of Mobile Data connection or if there's a carrier deal defined
   // show that even if user has already seen generic promo.
-  if (UserManager::Get()->IsUserLoggedIn() &&
-      !UserManager::Get()->IsLoggedInAsGuest() &&
+  LoginState::State login_state = LoginState::Get()->GetLoginState();
+  if ((login_state == LoginState::LOGGED_IN_OWNER ||

[bartfab (slow), 2013/04/05 13:16:33]

This is a great example why I think checking the value of GetLoginState() in
consumers is a bad idea: This code here wants to offer a promo to all GAIA
users. Instead of checking whether the current user is a GAIA user of any type,
it needs to be aware that both an owner and any other regular user fall into
that category.

[stevenjb, 2013/04/05 18:17:15]

That makes sense to me, but seems beyond the scope of this CL? Or did you have a
suggested change? I believe that logically this is at least slightly more
accurate than before?

+       login_state == LoginState::LOGGED_IN_USER) &&
       check_for_promo_ &&
       cros->cellular_connected() && !cros->ethernet_connected() &&
       !cros->wifi_connected() && !cros->wimax_connected()) {