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

chrome/browser/profiles/host_zoom_map_browsertest.cc

 // Copyright 2014 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 "content/public/browser/host_zoom_map.h"
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/path_service.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/stringprintf.h"
 #include "base/values.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_impl.h"
+#include "chrome/browser/signin/signin_promo.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/browser/ui/zoom/chrome_zoom_level_prefs.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/testing_profile.h"
 #include "chrome/test/base/ui_test_utils.h"
@@ skipping 86 matching lines @@
     dictionaries->GetDictionary(partition_key, &values);
     std::vector<std::string> results;
     if (values) {
       for (base::DictionaryValue::Iterator it(*values);
            !it.IsAtEnd(); it.Advance())
         results.push_back(it.key());
     }
     return results;
   }
 
   GURL ConstructTestServerURL(const char* url_template) {

[Bernhard Bauer, 2015/12/04 11:06:24]

This method should probably take a base::StringPiece, so it can work with both a
string constant and a std::string object.

[gogerald1, 2015/12/04 20:49:09]

Acknowledged. Slightly prefer to use .c_str to convert std::string to c string,
it looks a little simpler and neat here.

     return GURL(base::StringPrintf(
         url_template, embedded_test_server()->port()));
   }
 
  private:
   scoped_ptr<net::test_server::HttpResponse> HandleRequest(
       const net::test_server::HttpRequest& request) {
     return scoped_ptr<net::test_server::HttpResponse>(
         new net::test_server::BasicHttpResponse);
   }
@@ skipping 96 matching lines @@
   host_zoom_map->SetZoomLevelForHostAndScheme(test_scheme, test_host,
                                               new_zoom_level);
   observer.BlockUntilZoomLevelForHostHasChanged(test_host);
   EXPECT_EQ(new_zoom_level, host_zoom_map->GetZoomLevelForHostAndScheme(
                                 test_scheme, test_host));
 }
 
 IN_PROC_BROWSER_TEST_F(
     HostZoomMapBrowserTest,
     WebviewBasedSigninUsesDefaultStoragePartitionForEmbedder) {
-  GURL test_url = ConstructTestServerURL(chrome::kChromeUIChromeSigninURL);
+  GURL test_url = ConstructTestServerURL(

[sky, 2015/12/03 22:45:28]

How about a common function rather than duplicating this code.

[gogerald1, 2015/12/04 20:49:09]

Done.

+      signin::GetPromoURL(signin_metrics::ACCESS_POINT_START_PAGE,
+                          signin_metrics::REASON_SIGNIN_PRIMARY_ACCOUNT, false)
+          .spec()
+          .c_str());
   std::string test_host(test_url.host());
   std::string test_scheme(test_url.scheme());
   ui_test_utils::NavigateToURL(browser(), test_url);
 
   content::WebContents* web_contents =
       browser()->tab_strip_model()->GetActiveWebContents();
 
   HostZoomMap* host_zoom_map = HostZoomMap::GetForWebContents(web_contents);
 
   // For the webview based sign-in code, the sign in page uses the default host
@@ skipping 17 matching lines @@
 
 // Regression test for crbug.com/435017.
 IN_PROC_BROWSER_TEST_F(HostZoomMapIframeSigninBrowserTest,
                        EventsForNonDefaultStoragePartition) {
   ZoomLevelChangeObserver observer(browser()->profile());
   // TODO(wjmaclean): Make this test more general by implementing a way to
   // force a generic URL to be loaded in a non-default storage partition. This
   // test currently relies on the signin page being loaded into a non-default
   // storage partition (and verifies this is the case), but ultimately it would
   // be better not to rely on what the signin page is doing.
-  GURL test_url = ConstructTestServerURL(chrome::kChromeUIChromeSigninURL);
+  GURL test_url = ConstructTestServerURL(
+      signin::GetPromoURL(signin_metrics::ACCESS_POINT_START_PAGE,
+                          signin_metrics::REASON_SIGNIN_PRIMARY_ACCOUNT, false)
+          .spec()
+          .c_str());
   std::string test_host(test_url.host());
   std::string test_scheme(test_url.scheme());
   ui_test_utils::NavigateToURL(browser(), test_url);
 
   content::WebContents* web_contents =
       browser()->tab_strip_model()->GetActiveWebContents();
 
   // We are forcing non-webview based signin, so we expect the signin page to
   // be in a different storage partition, and hence a different HostZoomMap.
   HostZoomMap* host_zoom_map = HostZoomMap::GetForWebContents(web_contents);
@@ skipping 151 matching lines @@
   ZoomLevelChangeObserver observer(browser()->profile());
 
   web_contents->SetPageScale(1.5);
   observer.BlockUntilZoomLevelForHostHasChanged(test_host);
   EXPECT_FALSE(content::HostZoomMap::PageScaleFactorIsOne(web_contents));
 
   web_contents->SetPageScale(1.f);
   observer.BlockUntilZoomLevelForHostHasChanged(test_host);
   EXPECT_TRUE(content::HostZoomMap::PageScaleFactorIsOne(web_contents));
 }