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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/ui/webui/signin/inline_login_ui_browsertest.cc

Issue 1473543002: Implement newly designed sign-in related histograms for desktop platorms. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: add comments Created 5 years 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
« chrome/browser/ui/webui/signin/inline_login_handler.cc ('K') | « chrome/browser/ui/webui/signin/inline_login_handler_impl.cc ('k') | chrome/browser/ui/webui/signin/login_ui_service.cc » ('j') | components/signin/core/browser/signin_metrics.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/webui/signin/inline_login_ui_browsertest.cc
diff --git a/chrome/browser/ui/webui/signin/inline_login_ui_browsertest.cc b/chrome/browser/ui/webui/signin/inline_login_ui_browsertest.cc
index 6357b36916eb27a97de038c0533639966d2f8efd..ac7e746e38dfa71f28aa55bc403912ec1ade4d2f 100644
--- a/chrome/browser/ui/webui/signin/inline_login_ui_browsertest.cc
+++ b/chrome/browser/ui/webui/signin/inline_login_ui_browsertest.cc
@@ -144,10 +144,11 @@ class MockInlineSigninHelper : public InlineSigninHelper {
MOCK_METHOD1(OnClientOAuthSuccess, void(const ClientOAuthResult& result));
MOCK_METHOD1(OnClientOAuthFailure, void(const GoogleServiceAuthError& error));
- MOCK_METHOD6(CreateSyncStarter,
+ MOCK_METHOD7(CreateSyncStarter,
void(Browser*,
content::WebContents*,
const GURL&,
+ const GURL&,
const std::string&,
OneClickSigninSyncStarter::StartSyncMode,
OneClickSigninSyncStarter::ConfirmationRequired));
@@ -200,10 +201,11 @@ class MockSyncStarterInlineSigninHelper : public InlineSigninHelper {
bool choose_what_to_sync,
bool confirm_untrusted_signin);
- MOCK_METHOD6(CreateSyncStarter,
+ MOCK_METHOD7(CreateSyncStarter,
void(Browser*,
content::WebContents*,
const GURL&,
+ const GURL&,
const std::string&,
OneClickSigninSyncStarter::StartSyncMode,
OneClickSigninSyncStarter::ConfirmationRequired));
@@ -304,8 +306,9 @@ void InlineLoginUIBrowserTest::SetAllowedUsernamePattern(
IN_PROC_BROWSER_TEST_F(InlineLoginUIBrowserTest, MAYBE_DifferentStorageId) {
if (switches::IsEnableWebviewBasedSignin()) {
ContentInfo info = NavigateAndGetInfo(
- browser(),
- signin::GetPromoURL(signin_metrics::SOURCE_START_PAGE, false),
+ browser(), signin::GetPromoURL(
+ signin_metrics::ACCESS_POINT_START_PAGE,
+ signin_metrics::REASON_SIGNIN_PRIMARY_ACCOUNT, false),
CURRENT_TAB);
WaitUntilUIReady(browser());
@@ -329,13 +332,15 @@ IN_PROC_BROWSER_TEST_F(InlineLoginUIBrowserTest, MAYBE_DifferentStorageId) {
ContentInfo info1 =
NavigateAndGetInfo(browser(), test_url, CURRENT_TAB);
ContentInfo info2 = NavigateAndGetInfo(
- browser(),
- signin::GetPromoURL(signin_metrics::SOURCE_START_PAGE, false),
+ browser(), signin::GetPromoURL(
+ signin_metrics::ACCESS_POINT_START_PAGE,
+ signin_metrics::REASON_SIGNIN_PRIMARY_ACCOUNT, false),
CURRENT_TAB);
NavigateAndGetInfo(browser(), test_url, CURRENT_TAB);
ContentInfo info3 = NavigateAndGetInfo(
- browser(),
- signin::GetPromoURL(signin_metrics::SOURCE_START_PAGE, false),
+ browser(), signin::GetPromoURL(
+ signin_metrics::ACCESS_POINT_START_PAGE,
+ signin_metrics::REASON_SIGNIN_PRIMARY_ACCOUNT, false),
NEW_FOREGROUND_TAB);
// The info for signin should be the same.
@@ -363,7 +368,8 @@ IN_PROC_BROWSER_TEST_F(InlineLoginUIBrowserTest, OneProcessLimit) {
NavigateAndGetInfo(browser(), test_url_2, CURRENT_TAB);
ContentInfo info3 = NavigateAndGetInfo(
browser(),
- signin::GetPromoURL(signin_metrics::SOURCE_START_PAGE, false),
+ signin::GetPromoURL(signin_metrics::ACCESS_POINT_START_PAGE,
+ signin_metrics::REASON_SIGNIN_PRIMARY_ACCOUNT, false),
CURRENT_TAB);
ASSERT_EQ(info1.pid, info2.pid);
@@ -587,8 +593,8 @@ IN_PROC_BROWSER_TEST_F(InlineLoginHelperBrowserTest, WithAuthCode) {
IN_PROC_BROWSER_TEST_F(InlineLoginHelperBrowserTest,
SigninCreatesSyncStarter1) {
// See Source enum in components/signin/core/browser/signin_metrics.h for
- // possible values of source=.
- GURL url("chrome://chrome-signin/?source=0");
+ // possible values of access_point=, reason=.
+ GURL url("chrome://chrome-signin/?access_point=0&reason=0");
base::WeakPtr<InlineLoginHandlerImpl> handler;
// MockSyncStarterInlineSigninHelper will delete itself when done using
// base::ThreadTaskRunnerHandle::DeleteSoon(), so need to delete here. But
@@ -607,10 +613,11 @@ IN_PROC_BROWSER_TEST_F(InlineLoginHelperBrowserTest,
std::string(),
false, // choose what to sync
false); // confirm untrusted signin
- EXPECT_CALL(*helper, CreateSyncStarter(
- _, _, _, "refresh_token",
- OneClickSigninSyncStarter::CONFIRM_SYNC_SETTINGS_FIRST,
- OneClickSigninSyncStarter::CONFIRM_AFTER_SIGNIN));
+ EXPECT_CALL(
+ *helper,
+ CreateSyncStarter(_, _, _, _, "refresh_token",
+ OneClickSigninSyncStarter::CONFIRM_SYNC_SETTINGS_FIRST,
+ OneClickSigninSyncStarter::CONFIRM_AFTER_SIGNIN));
SimulateOnClientOAuthSuccess(helper, "refresh_token");
base::MessageLoop::current()->RunUntilIdle();
@@ -621,8 +628,8 @@ IN_PROC_BROWSER_TEST_F(InlineLoginHelperBrowserTest,
IN_PROC_BROWSER_TEST_F(InlineLoginHelperBrowserTest,
SigninCreatesSyncStarter2) {
// See Source enum in components/signin/core/browser/signin_metrics.h for
- // possible values of source=.
- const GURL url("chrome://chrome-signin/?source=0");
+ // possible values of access_point=, reason=.
+ const GURL url("chrome://chrome-signin/?access_point=0&reason=0");
base::WeakPtr<InlineLoginHandlerImpl> handler;
// MockSyncStarterInlineSigninHelper will delete itself when done using
// base::ThreadTaskRunnerHandle::DeleteSoon(), so need to delete here. But
@@ -642,9 +649,9 @@ IN_PROC_BROWSER_TEST_F(InlineLoginHelperBrowserTest,
true, // choose what to sync
false); // confirm untrusted signin
EXPECT_CALL(*helper, CreateSyncStarter(
- _, _, _, "refresh_token",
- OneClickSigninSyncStarter::CONFIGURE_SYNC_FIRST,
- OneClickSigninSyncStarter::CONFIRM_AFTER_SIGNIN));
+ _, _, _, _, "refresh_token",
+ OneClickSigninSyncStarter::CONFIGURE_SYNC_FIRST,
+ OneClickSigninSyncStarter::CONFIRM_AFTER_SIGNIN));
SimulateOnClientOAuthSuccess(helper, "refresh_token");
base::MessageLoop::current()->RunUntilIdle();
@@ -655,8 +662,8 @@ IN_PROC_BROWSER_TEST_F(InlineLoginHelperBrowserTest,
IN_PROC_BROWSER_TEST_F(InlineLoginHelperBrowserTest,
SigninCreatesSyncStarter3) {
// See Source enum in components/signin/core/browser/signin_metrics.h for
- // possible values of source=.
- GURL url("chrome://chrome-signin/?source=0");
+ // possible values of access_point=, reason=.
+ GURL url("chrome://chrome-signin/?access_point=0&reason=0");
base::WeakPtr<InlineLoginHandlerImpl> handler;
// MockSyncStarterInlineSigninHelper will delete itself when done using
// base::ThreadTaskRunnerHandle::DeleteSoon(), so need to delete here. But
@@ -675,10 +682,11 @@ IN_PROC_BROWSER_TEST_F(InlineLoginHelperBrowserTest,
std::string(),
false, // choose what to sync
true); // confirm untrusted signin
- EXPECT_CALL(*helper, CreateSyncStarter(
- _, _, _, "refresh_token",
- OneClickSigninSyncStarter::CONFIRM_SYNC_SETTINGS_FIRST,
- OneClickSigninSyncStarter::CONFIRM_UNTRUSTED_SIGNIN));
+ EXPECT_CALL(
+ *helper,
+ CreateSyncStarter(_, _, _, _, "refresh_token",
+ OneClickSigninSyncStarter::CONFIRM_SYNC_SETTINGS_FIRST,
+ OneClickSigninSyncStarter::CONFIRM_UNTRUSTED_SIGNIN));
SimulateOnClientOAuthSuccess(helper, "refresh_token");
base::MessageLoop::current()->RunUntilIdle();
@@ -689,8 +697,8 @@ IN_PROC_BROWSER_TEST_F(InlineLoginHelperBrowserTest,
IN_PROC_BROWSER_TEST_F(InlineLoginHelperBrowserTest,
SigninCreatesSyncStarter4) {
// See Source enum in components/signin/core/browser/signin_metrics.h for
- // possible values of source=.
- const GURL url("chrome://chrome-signin/?source=3");
+ // possible values of access_point=, reason=.
+ const GURL url("chrome://chrome-signin/?access_point=3&reason=0");
base::WeakPtr<InlineLoginHandlerImpl> handler;
// MockSyncStarterInlineSigninHelper will delete itself when done using
// base::ThreadTaskRunnerHandle::DeleteSoon(), so need to delete here. But
@@ -713,9 +721,9 @@ IN_PROC_BROWSER_TEST_F(InlineLoginHelperBrowserTest,
// Even though "choose what to sync" is false, the source of the URL is
// settings, which means the user wants to CONFIGURE_SYNC_FIRST.
EXPECT_CALL(*helper, CreateSyncStarter(
- _, _, _, "refresh_token",
- OneClickSigninSyncStarter::CONFIGURE_SYNC_FIRST,
- OneClickSigninSyncStarter::CONFIRM_AFTER_SIGNIN));
+ _, _, _, _, "refresh_token",
+ OneClickSigninSyncStarter::CONFIGURE_SYNC_FIRST,
+ OneClickSigninSyncStarter::CONFIRM_AFTER_SIGNIN));
SimulateOnClientOAuthSuccess(helper, "refresh_token");
base::MessageLoop::current()->RunUntilIdle();
@@ -727,8 +735,8 @@ IN_PROC_BROWSER_TEST_F(InlineLoginHelperBrowserTest,
ASSERT_EQ(0ul, token_service()->GetAccounts().size());
// See Source enum in components/signin/core/browser/signin_metrics.h for
- // possible values of source=.
- GURL url("chrome://chrome-signin/?source=11");
+ // possible values of access_point=, reason=.
+ GURL url("chrome://chrome-signin/?access_point=3&reason=2");
base::WeakPtr<InlineLoginHandlerImpl> handler;
InlineSigninHelper helper(handler,
browser()->profile()->GetRequestContext(),
@@ -754,8 +762,8 @@ IN_PROC_BROWSER_TEST_F(InlineLoginHelperBrowserTest,
ASSERT_EQ(0ul, token_service()->GetAccounts().size());
// See Source enum in components/signin/core/browser/signin_metrics.h for
- // possible values of source=.
- GURL url("chrome://chrome-signin/?source=9");
+ // possible values of access_point=, reason=.
+ GURL url("chrome://chrome-signin/?access_point=10&reason=1");
base::WeakPtr<InlineLoginHandlerImpl> handler;
InlineSigninHelper helper(handler,
browser()->profile()->GetRequestContext(),
@@ -832,8 +840,10 @@ IN_PROC_BROWSER_TEST_F(InlineLoginUISafeIframeBrowserTest, Basic) {
// Make sure that the foo webui handler does not get created when we try to
// load it inside the iframe of the login ui.
IN_PROC_BROWSER_TEST_F(InlineLoginUISafeIframeBrowserTest, NoWebUIInIframe) {
- GURL url = signin::GetPromoURL(signin_metrics::SOURCE_START_PAGE, false).
- Resolve("?source=0&frameUrl=chrome://foo");
+ GURL url =
+ signin::GetPromoURL(signin_metrics::ACCESS_POINT_START_PAGE,
+ signin_metrics::REASON_SIGNIN_PRIMARY_ACCOUNT, false)
+ .Resolve("?source=0&access_point=0&reason=0&frameUrl=chrome://foo");
EXPECT_CALL(foo_provider(), NewWebUI(_, _)).Times(0);
ui_test_utils::NavigateToURL(browser(), url);
}
@@ -852,7 +862,8 @@ IN_PROC_BROWSER_TEST_F(InlineLoginUISafeIframeBrowserTest,
// Loads into gaia iframe a web page that attempts to deframe on load.
GURL deframe_url(embedded_test_server()->GetURL("/login/deframe.html"));
GURL url(net::AppendOrReplaceQueryParameter(
- signin::GetPromoURL(signin_metrics::SOURCE_START_PAGE, false),
+ signin::GetPromoURL(signin_metrics::ACCESS_POINT_START_PAGE,
+ signin_metrics::REASON_SIGNIN_PRIMARY_ACCOUNT, false),
"frameUrl", deframe_url.spec()));
ui_test_utils::NavigateToURL(browser(), url);
WaitUntilUIReady(browser());
@@ -871,7 +882,9 @@ IN_PROC_BROWSER_TEST_F(InlineLoginUISafeIframeBrowserTest,
IN_PROC_BROWSER_TEST_F(InlineLoginUISafeIframeBrowserTest,
DISABLED_NavigationToOtherChromeURLDisallowed) {
ui_test_utils::NavigateToURL(
- browser(), signin::GetPromoURL(signin_metrics::SOURCE_START_PAGE, false));
+ browser(), signin::GetPromoURL(
+ signin_metrics::ACCESS_POINT_START_PAGE,
+ signin_metrics::REASON_SIGNIN_PRIMARY_ACCOUNT, false));
WaitUntilUIReady(browser());
content::WebContents* contents =
@@ -901,7 +914,9 @@ IN_PROC_BROWSER_TEST_F(InlineLoginUISafeIframeBrowserTest,
// Since the fake gaia auth page is served over HTTP, thus expects to see an
// untrusted signin confirmation dialog upon submitting credentials below.
ui_test_utils::NavigateToURL(
- browser(), signin::GetPromoURL(signin_metrics::SOURCE_START_PAGE, false));
+ browser(), signin::GetPromoURL(
+ signin_metrics::ACCESS_POINT_START_PAGE,
+ signin_metrics::REASON_SIGNIN_PRIMARY_ACCOUNT, false));
WaitUntilUIReady(browser());
MockLoginUIObserver observer;
« chrome/browser/ui/webui/signin/inline_login_handler.cc ('K') | « chrome/browser/ui/webui/signin/inline_login_handler_impl.cc ('k') | chrome/browser/ui/webui/signin/login_ui_service.cc » ('j') | components/signin/core/browser/signin_metrics.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698