Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / signin / signin_manager_factory.cc

diff --git a/src/chrome/browser/signin/signin_manager_factory.cc b/src/chrome/browser/signin/signin_manager_factory.cc
index 4c16c54..7698aeb 100644 (file)
--- a/src/chrome/browser/signin/signin_manager_factory.cc
+++ b/src/chrome/browser/signin/signin_manager_factory.cc
@@ -24,20 +24,6 @@ SigninManagerFactory::SigninManagerFactory()
 }
 
 SigninManagerFactory::~SigninManagerFactory() {
-#if defined(OS_MACOSX)
-  // Check that the number of remaining observers is as expected. Mac has a
-  // known issue wherein there might be a remaining observer
-  // (UIAppListViewDelegate).
-  int num_observers = 0;
-  if (observer_list_.might_have_observers()) {
-    ObserverListBase<SigninManagerFactory::Observer>::Iterator it(
-        observer_list_);
-    while (it.GetNext()) {
-      num_observers++;
-    }
-  }
-  DCHECK_LE(num_observers, 1);
-#endif  // defined(OS_MACOSX)
 }
 
 #if defined(OS_CHROMEOS)
@@ -77,6 +63,10 @@ SigninManagerFactory* SigninManagerFactory::GetInstance() {
 void SigninManagerFactory::RegisterProfilePrefs(
     user_prefs::PrefRegistrySyncable* registry) {
   registry->RegisterStringPref(
+      prefs::kGoogleServicesHostedDomain,
+      std::string(),
+      user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
+  registry->RegisterStringPref(
       prefs::kGoogleServicesLastUsername,
       std::string(),
       user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
@@ -88,6 +78,10 @@ void SigninManagerFactory::RegisterProfilePrefs(
       prefs::kGoogleServicesUsername,
       std::string(),
       user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
+  registry->RegisterStringPref(
+      prefs::kGoogleServicesSigninScopedDeviceId,
+      std::string(),
+      user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
   registry->RegisterBooleanPref(
       prefs::kAutologinEnabled,
       true,
@@ -99,6 +93,10 @@ void SigninManagerFactory::RegisterProfilePrefs(
   registry->RegisterListPref(prefs::kReverseAutologinRejectedEmailList,
                              new base::ListValue,
                              user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
+  registry->RegisterInt64Pref(
+      prefs::kSignedInTime,
+      base::Time().ToInternalValue(),
+      user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
   chrome::RegisterLocalAuthPrefs(registry);
 }