Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(620)

Unified Diff: chrome/browser/ui/sync/one_click_signin_helper_unittest.cc

Issue 12502017: signin: pull basic SigninManager functionality into new SigninManagerBase class. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: deal with new enterprise_platform_keys_private_api Created 7 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/ui/chrome_pages.cc ('k') | chrome/browser/ui/webui/ntp/new_tab_page_sync_handler.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/sync/one_click_signin_helper_unittest.cc
diff --git a/chrome/browser/ui/sync/one_click_signin_helper_unittest.cc b/chrome/browser/ui/sync/one_click_signin_helper_unittest.cc
index 155b4a2495b16d3c6b2620de641e7c4c7f88380b..9cd644942bf7c7fe784c8fb33058acc08a087a16 100644
--- a/chrome/browser/ui/sync/one_click_signin_helper_unittest.cc
+++ b/chrome/browser/ui/sync/one_click_signin_helper_unittest.cc
@@ -13,6 +13,7 @@
#include "chrome/browser/profiles/profile_io_data.h"
#include "chrome/browser/profiles/profile_manager.h"
#include "chrome/browser/signin/fake_signin_manager.h"
+#include "chrome/browser/signin/signin_manager.h"
#include "chrome/browser/signin/signin_manager_factory.h"
#include "chrome/browser/signin/signin_names_io_thread.h"
#include "chrome/browser/sync/profile_sync_service_factory.h"
@@ -53,8 +54,8 @@ const char kImplicitURLString[] =
class SigninManagerMock : public FakeSigninManager {
public:
- explicit SigninManagerMock(Profile* profile)
- : FakeSigninManager(profile) {}
+ explicit SigninManagerMock(Profile* profile) : FakeSigninManager(profile) {
+ }
MOCK_CONST_METHOD1(IsAllowedUsername, bool(const std::string& username));
};
@@ -267,10 +268,10 @@ void OneClickSigninHelperTest::CreateSigninManager(
profile_, BuildSigninManagerMock));
if (signin_manager_)
signin_manager_->SetSigninProcess(trusted_signin_process_id_);
+
if (!username.empty()) {
ASSERT_TRUE(signin_manager_);
- signin_manager_->StartSignIn(username, std::string(), std::string(),
- std::string());
+ signin_manager_->SetAuthenticatedUsername(username);
}
}
« no previous file with comments | « chrome/browser/ui/chrome_pages.cc ('k') | chrome/browser/ui/webui/ntp/new_tab_page_sync_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698