Update To 11.40.268.0

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

diff --git a/src/chrome/browser/signin/fake_signin_manager.cc b/src/chrome/browser/signin/fake_signin_manager.cc
index 7395cda..43de553 100644 (file)
--- a/src/chrome/browser/signin/fake_signin_manager.cc
+++ b/src/chrome/browser/signin/fake_signin_manager.cc
@@ -6,33 +6,30 @@
 
 #include "base/callback_helpers.h"
 #include "base/prefs/pref_service.h"
-#include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/signin/chrome_signin_manager_delegate.h"
-#include "chrome/browser/signin/signin_global_error.h"
+#include "chrome/browser/signin/chrome_signin_client_factory.h"
+#include "chrome/browser/signin/profile_oauth2_token_service_factory.h"
 #include "chrome/browser/signin/signin_manager_factory.h"
 #include "chrome/browser/ui/global_error/global_error_service.h"
 #include "chrome/browser/ui/global_error/global_error_service_factory.h"
-#include "chrome/common/pref_names.h"
-#include "content/public/browser/notification_service.h"
 
-FakeSigninManagerBase::FakeSigninManagerBase() {
-}
+FakeSigninManagerBase::FakeSigninManagerBase(Profile* profile)
+    : SigninManagerBase(
+          ChromeSigninClientFactory::GetInstance()->GetForProfile(profile)) {}
 
 FakeSigninManagerBase::~FakeSigninManagerBase() {
 }
 
 // static
-BrowserContextKeyedService* FakeSigninManagerBase::Build(
-    content::BrowserContext* context) {
+KeyedService* FakeSigninManagerBase::Build(content::BrowserContext* context) {
   SigninManagerBase* manager;
   Profile* profile = static_cast<Profile*>(context);
 #if defined(OS_CHROMEOS)
-  manager = new FakeSigninManagerBase();
+  manager = new FakeSigninManagerBase(profile);
 #else
   manager = new FakeSigninManager(profile);
 #endif
-  manager->Initialize(profile, NULL);
+  manager->Initialize(NULL);
   SigninManagerFactory::GetInstance()
       ->NotifyObserversOfSigninManagerCreationForTesting(manager);
   return manager;
@@ -41,57 +38,58 @@ BrowserContextKeyedService* FakeSigninManagerBase::Build(
 #if !defined (OS_CHROMEOS)
 
 FakeSigninManager::FakeSigninManager(Profile* profile)
-    : SigninManager(scoped_ptr<SigninManagerDelegate>(
-        new ChromeSigninManagerDelegate(profile))) {
-}
+    : SigninManager(
+          ChromeSigninClientFactory::GetInstance()->GetForProfile(profile),
+          ProfileOAuth2TokenServiceFactory::GetForProfile(profile)) {}
 
 FakeSigninManager::~FakeSigninManager() {
 }
 
-void FakeSigninManager::StartSignInWithCredentials(
-    const std::string& session_index,
+void FakeSigninManager::StartSignInWithRefreshToken(
+    const std::string& refresh_token,
     const std::string& username,
     const std::string& password,
     const OAuthTokenFetchedCallback& oauth_fetched_callback) {
   set_auth_in_progress(username);
   set_password(password);
   if (!oauth_fetched_callback.is_null())
-    oauth_fetched_callback.Run("fake_oauth_token");
+    oauth_fetched_callback.Run(refresh_token);
 }
 
+
 void FakeSigninManager::CompletePendingSignin() {
   SetAuthenticatedUsername(GetUsernameForAuthInProgress());
   set_auth_in_progress(std::string());
   FOR_EACH_OBSERVER(Observer,
                     observer_list_,
-                    GoogleSigninSucceeded(authenticated_username_, password_));
+                    GoogleSigninSucceeded(authenticated_username_,
+                                          authenticated_username_,
+                                          password_));
 }
 
 void FakeSigninManager::SignIn(const std::string& username,
                                const std::string& password) {
-  StartSignInWithCredentials(
+  StartSignInWithRefreshToken(
       std::string(), username, password, OAuthTokenFetchedCallback());
   CompletePendingSignin();
 }
 
-void FakeSigninManager::SignOut() {
+void FakeSigninManager::FailSignin(const GoogleServiceAuthError& error) {
+  FOR_EACH_OBSERVER(Observer, observer_list_, GoogleSigninFailed(error));
+}
+
+void FakeSigninManager::SignOut(
+    signin_metrics::ProfileSignout signout_source_metric) {
   if (IsSignoutProhibited())
     return;
   set_auth_in_progress(std::string());
   set_password(std::string());
+  const std::string account_id = GetAuthenticatedAccountId();
   const std::string username = authenticated_username_;
   authenticated_username_.clear();
 
-  // TODO(blundell): Eliminate this notification send once crbug.com/333997 is
-  // fixed.
-  GoogleServiceSignoutDetails details(username);
-  content::NotificationService::current()->Notify(
-      chrome::NOTIFICATION_GOOGLE_SIGNED_OUT,
-      content::Source<Profile>(profile_),
-      content::Details<const GoogleServiceSignoutDetails>(&details));
-
   FOR_EACH_OBSERVER(SigninManagerBase::Observer, observer_list_,
-                    GoogleSignedOut(username));
+                    GoogleSignedOut(account_id, username));
 }
 
 #endif  // !defined (OS_CHROMEOS)