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

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: Created 5 years, 1 month 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_impl.cc ('K') | « chrome/browser/ui/webui/signin/inline_login_handler_impl.cc ('k') | chrome/browser/ui/webui/signin/login_ui_service.cc » ('j') | no next file with comments »
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..a2ecdb9648dce8668ec5fca4194391e898e10400 100644
--- a/chrome/browser/ui/webui/signin/inline_login_ui_browsertest.cc
+++ b/chrome/browser/ui/webui/signin/inline_login_ui_browsertest.cc
@@ -304,8 +304,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 +330,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 +366,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 +591,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
@@ -621,8 +625,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
@@ -655,8 +659,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
@@ -689,8 +693,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
@@ -727,8 +731,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 +758,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 +836,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 +858,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 +878,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 +910,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_impl.cc ('K') | « chrome/browser/ui/webui/signin/inline_login_handler_impl.cc ('k') | chrome/browser/ui/webui/signin/login_ui_service.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698