Implement newly designed sign-in related histograms for desktop platorms.

chrome/browser/ui/webui/signin/inline_login_ui_browsertest.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/command_line.h"
 #include "base/prefs/pref_service.h"
 #include "base/prefs/scoped_user_pref_update.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/content_settings/cookie_settings_factory.h"
 #include "chrome/browser/signin/fake_profile_oauth2_token_service_builder.h"
@@ skipping 84 matching lines @@
   content::RenderProcessHost* process = contents->GetRenderProcessHost();
   return ContentInfo(contents, process->GetID(),
                      process->GetStoragePartition());
 }
 
 // Returns a new WebUI object for the WebContents from |arg0|.
 ACTION(ReturnNewWebUI) {
   return new content::WebUIController(arg0);
 }
 
+GURL GetSigninPromoURL() {
+  return signin::GetPromoURL(
+      signin_metrics::AccessPoint::ACCESS_POINT_START_PAGE,
+      signin_metrics::Reason::REASON_SIGNIN_PRIMARY_ACCOUNT, false);
+}
+
 // Mock the TestChromeWebUIControllerFactory::WebUIProvider to prove that we are
 // not called as expected.
 class FooWebUIProvider
     : public TestChromeWebUIControllerFactory::WebUIProvider {
  public:
   MOCK_METHOD2(NewWebUI, content::WebUIController*(content::WebUI* web_ui,
                                                    const GURL& url));
 };
 
 class MockLoginUIObserver : public LoginUIService::Observer {
@@ skipping 22 matching lines @@
       const std::string& gaia_id,
       const std::string& password,
       const std::string& session_index,
       const std::string& auth_code,
       const std::string& signin_scoped_device_id,
       bool choose_what_to_sync,
       bool confirm_untrusted_signin);
 
   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));
 
  private:
   DISALLOW_COPY_AND_ASSIGN(MockInlineSigninHelper);
 };
 
 MockInlineSigninHelper::MockInlineSigninHelper(
     base::WeakPtr<InlineLoginHandlerImpl> handler,
@@ skipping 32 matching lines @@
       const GURL& current_url,
       const std::string& email,
       const std::string& gaia_id,
       const std::string& password,
       const std::string& session_index,
       const std::string& auth_code,
       const std::string& signin_scoped_device_id,
       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));
 
  private:
   DISALLOW_COPY_AND_ASSIGN(MockSyncStarterInlineSigninHelper);
 };
 
 MockSyncStarterInlineSigninHelper::MockSyncStarterInlineSigninHelper(
     base::WeakPtr<InlineLoginHandlerImpl> handler,
@@ skipping 79 matching lines @@
 }
 
 #if defined(OS_LINUX) || defined(OS_WIN)
 // crbug.com/422868
 #define MAYBE_DifferentStorageId DISABLED_DifferentStorageId
 #else
 #define MAYBE_DifferentStorageId DifferentStorageId
 #endif
 IN_PROC_BROWSER_TEST_F(InlineLoginUIBrowserTest, MAYBE_DifferentStorageId) {
   if (switches::IsEnableWebviewBasedSignin()) {
-    ContentInfo info = NavigateAndGetInfo(
-        browser(),
-        signin::GetPromoURL(signin_metrics::SOURCE_START_PAGE, false),
-        CURRENT_TAB);
+    ContentInfo info =
+        NavigateAndGetInfo(browser(), GetSigninPromoURL(), CURRENT_TAB);
     WaitUntilUIReady(browser());
 
     // Make sure storage partition of embedded webview is different from
     // parent.
     std::set<content::WebContents*> set;
     GuestViewManager* manager = GuestViewManager::FromBrowserContext(
         info.contents->GetBrowserContext());
     manager->ForEachGuest(info.contents, base::Bind(&AddToSet, &set));
     ASSERT_EQ(1u, set.size());
     content::WebContents* webview_contents = *set.begin();
     content::RenderProcessHost* process =
         webview_contents->GetRenderProcessHost();
     ASSERT_NE(info.pid, process->GetID());
     ASSERT_NE(info.storage_partition, process->GetStoragePartition());
   } else {
     GURL test_url = ui_test_utils::GetTestUrl(
         base::FilePath(base::FilePath::kCurrentDirectory),
         base::FilePath(FILE_PATH_LITERAL("title1.html")));
 
     ContentInfo info1 =
         NavigateAndGetInfo(browser(), test_url, CURRENT_TAB);
-    ContentInfo info2 = NavigateAndGetInfo(
-        browser(),
-        signin::GetPromoURL(signin_metrics::SOURCE_START_PAGE, false),
-        CURRENT_TAB);
+    ContentInfo info2 =
+        NavigateAndGetInfo(browser(), GetSigninPromoURL(), CURRENT_TAB);
     NavigateAndGetInfo(browser(), test_url, CURRENT_TAB);
-    ContentInfo info3 = NavigateAndGetInfo(
-        browser(),
-        signin::GetPromoURL(signin_metrics::SOURCE_START_PAGE, false),
-        NEW_FOREGROUND_TAB);
+    ContentInfo info3 =
+        NavigateAndGetInfo(browser(), GetSigninPromoURL(), NEW_FOREGROUND_TAB);
 
     // The info for signin should be the same.
     ASSERT_EQ(info2.storage_partition, info3.storage_partition);
     // The info for test_url and signin should be different.
     ASSERT_NE(info1.storage_partition, info2.storage_partition);
   }
 }
 
 IN_PROC_BROWSER_TEST_F(InlineLoginUIBrowserTest, OneProcessLimit) {
   GURL test_url_1 = ui_test_utils::GetTestUrl(
       base::FilePath(base::FilePath::kCurrentDirectory),
       base::FilePath(FILE_PATH_LITERAL("title1.html")));
   GURL test_url_2 = ui_test_utils::GetTestUrl(
       base::FilePath(base::FilePath::kCurrentDirectory),
       base::FilePath(FILE_PATH_LITERAL("data:text/html,Hello world!")));
 
   // Even when the process limit is set to one, the signin process should
   // still be given its own process and storage partition.
   content::RenderProcessHost::SetMaxRendererProcessCount(1);
 
   ContentInfo info1 =
       NavigateAndGetInfo(browser(), test_url_1, CURRENT_TAB);
   ContentInfo info2 =
       NavigateAndGetInfo(browser(), test_url_2, CURRENT_TAB);
-  ContentInfo info3 = NavigateAndGetInfo(
-      browser(),
-      signin::GetPromoURL(signin_metrics::SOURCE_START_PAGE, false),
-      CURRENT_TAB);
+  ContentInfo info3 =
+      NavigateAndGetInfo(browser(), GetSigninPromoURL(), CURRENT_TAB);
 
   ASSERT_EQ(info1.pid, info2.pid);
   ASSERT_NE(info1.pid, info3.pid);
 }
 
 #if !defined(OS_CHROMEOS)
 
 IN_PROC_BROWSER_TEST_F(InlineLoginUIBrowserTest, CanOfferNoProfile) {
   std::string error_message;
   EXPECT_FALSE(InlineLoginHandlerImpl::CanOffer(
@@ skipping 202 matching lines @@
   SimulateStartAuthCodeForOAuth2TokenExchangeSuccess(
       "{\"access_token\": \"access_token\", \"expires_in\": 1234567890,"
       " \"refresh_token\": \"refresh_token\"}");
 }
 
 // Test signin helper creates sync starter with correct confirmation when
 // signing in with default sync options.
 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
   // do need the RunUntilIdle() at the end.
   MockSyncStarterInlineSigninHelper* helper =
       new MockSyncStarterInlineSigninHelper(
           handler,
           browser()->profile()->GetRequestContext(),
           browser()->profile(),
           url,
           "foo@gmail.com",
           "gaiaid-12345",
           "password",
           "",  // session index
           "auth_code",  // auth code
           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();
 }
 
 // Test signin helper creates sync starter with correct confirmation when
 // signing in and choosing what to sync first.
 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
   // do need the RunUntilIdle() at the end.
   MockSyncStarterInlineSigninHelper* helper =
       new MockSyncStarterInlineSigninHelper(
           handler,
           browser()->profile()->GetRequestContext(),
           browser()->profile(),
           url,
           "foo@gmail.com",
           "gaiaid-12345",
           "password",
           "",  // session index
           "auth_code",  // auth code
           std::string(),
           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();
 }
 
 // Test signin helper creates sync starter with correct confirmation when
 // signing in with an untrusted sign occurs.
 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
   // do need the RunUntilIdle() at the end.
   MockSyncStarterInlineSigninHelper* helper =
       new MockSyncStarterInlineSigninHelper(
           handler,
           browser()->profile()->GetRequestContext(),
           browser()->profile(),
           url,
           "foo@gmail.com",
           "gaiaid-12345",
           "password",
           "",  // session index
           "auth_code",  // auth code
           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();
 }
 
 // Test signin helper creates sync starter with correct confirmation during
 // re-auth.
 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
   // do need the RunUntilIdle() at the end.
   MockSyncStarterInlineSigninHelper* helper =
       new MockSyncStarterInlineSigninHelper(
           handler,
           browser()->profile()->GetRequestContext(),
           browser()->profile(),
           url,
           "foo@gmail.com",
           "gaiaid-12345",
           "password",
           "",  // session index
           "auth_code",  // auth code
           std::string(),
           false,  // choose what to sync
           false);  // confirm untrusted signin
 
   // 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();
 }
 
 // Test signin helper does not create sync starter when reauthenticating.
 IN_PROC_BROWSER_TEST_F(InlineLoginHelperBrowserTest,
                        ReauthCallsUpdateCredentials) {
   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(),
                             browser()->profile(),
                             url,
                             "foo@gmail.com",
                             "gaiaid-12345",
                             "password",
                             "",  // session index
                             "auth_code",  // auth code
                             std::string(),
                             false,  // choose what to sync
                             false);  // confirm untrusted signin
   SimulateOnClientOAuthSuccess(&helper, "refresh_token");
   ASSERT_EQ(1ul, token_service()->GetAccounts().size());
   base::MessageLoop::current()->RunUntilIdle();
 }
 
 // Test signin helper does not create sync starter when adding another account
 // to profile.
 IN_PROC_BROWSER_TEST_F(InlineLoginHelperBrowserTest,
                        AddAccountsCallsUpdateCredentials) {
   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(),
                             browser()->profile(),
                             url,
                             "foo@gmail.com",
                             "gaiaid-12345",
                             "password",
                             "",  // session index
                             "auth_code",  // auth code
@@ skipping 56 matching lines @@
 IN_PROC_BROWSER_TEST_F(InlineLoginUISafeIframeBrowserTest, Basic) {
   const GURL kUrl(kFooWebUIURL);
   EXPECT_CALL(foo_provider(), NewWebUI(_, ::testing::Eq(kUrl)))
       .WillOnce(ReturnNewWebUI());
   ui_test_utils::NavigateToURL(browser(), GURL(kFooWebUIURL));
 }
 
 // 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 = GetSigninPromoURL().Resolve(
+      "?source=0&access_point=0&reason=0&frameUrl=chrome://foo");
   EXPECT_CALL(foo_provider(), NewWebUI(_, _)).Times(0);
   ui_test_utils::NavigateToURL(browser(), url);
 }
 
 // Flaky on CrOS, http://crbug.com/364759.
 #if defined(OS_CHROMEOS)
 #define MAYBE_TopFrameNavigationDisallowed DISABLED_TopFrameNavigationDisallowed
 #else
 #define MAYBE_TopFrameNavigationDisallowed TopFrameNavigationDisallowed
 #endif
 
 // Make sure that the gaia iframe cannot trigger top-frame navigation.
 // TODO(guohui): flaky on trybot crbug/364759.
 IN_PROC_BROWSER_TEST_F(InlineLoginUISafeIframeBrowserTest,
     MAYBE_TopFrameNavigationDisallowed) {
   // 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),
-      "frameUrl", deframe_url.spec()));
+  GURL url(net::AppendOrReplaceQueryParameter(GetSigninPromoURL(), "frameUrl",
+                                              deframe_url.spec()));
   ui_test_utils::NavigateToURL(browser(), url);
   WaitUntilUIReady(browser());
 
   content::WebContents* contents =
       browser()->tab_strip_model()->GetActiveWebContents();
   EXPECT_EQ(url, contents->GetVisibleURL());
 
   content::NavigationController& controller = contents->GetController();
   EXPECT_TRUE(controller.GetPendingEntry() == NULL);
 }
 
 // Flaky on CrOS, http://crbug.com/364759.
 // Also flaky on Mac, http://crbug.com/442674.
 // Also flaky on Linux which is just too flaky
 IN_PROC_BROWSER_TEST_F(InlineLoginUISafeIframeBrowserTest,
     DISABLED_NavigationToOtherChromeURLDisallowed) {
-  ui_test_utils::NavigateToURL(
-      browser(), signin::GetPromoURL(signin_metrics::SOURCE_START_PAGE, false));
+  ui_test_utils::NavigateToURL(browser(), GetSigninPromoURL());
   WaitUntilUIReady(browser());
 
   content::WebContents* contents =
       browser()->tab_strip_model()->GetActiveWebContents();
   ASSERT_TRUE(content::ExecuteScript(
       contents, "window.location.href = 'chrome://foo'"));
 
   content::TestNavigationObserver navigation_observer(contents, 1);
   navigation_observer.Wait();
 
   EXPECT_EQ(GURL("about:blank"), contents->GetVisibleURL());
 }
 
 #if !defined(OS_CHROMEOS)
 IN_PROC_BROWSER_TEST_F(InlineLoginUISafeIframeBrowserTest,
     ConfirmationRequiredForNonsecureSignin) {
   FakeGaia fake_gaia;
   fake_gaia.Initialize();
 
   embedded_test_server()->RegisterRequestHandler(
       base::Bind(&FakeGaia::HandleRequest,
                  base::Unretained(&fake_gaia)));
   fake_gaia.SetFakeMergeSessionParams(
       "email@gmail.com", "fake-sid-cookie", "fake-lsid-cookie");
 
   // Navigates to the Chrome signin page which loads the fake gaia auth page.
   // 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));
+  ui_test_utils::NavigateToURL(browser(), GetSigninPromoURL());
   WaitUntilUIReady(browser());
 
   MockLoginUIObserver observer;
   LoginUIServiceFactory::GetForProfile(browser()->profile())
       ->AddObserver(&observer);
   base::RunLoop run_loop;
   EXPECT_CALL(observer, OnUntrustedLoginUIShown())
       .WillOnce(InvokeWithoutArgs(&run_loop, &base::RunLoop::Quit));
 
   ExecuteJsToSigninInSigninFrame(browser(), "email@gmail.com", "password");
   run_loop.Run();
   base::MessageLoop::current()->RunUntilIdle();
 }
 #endif // OS_CHROMEOS