While trying to enable webview sign-in by default, I found a bunch of issues

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>
 
@@ skipping 12 matching lines @@
 #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"
+#include "components/signin/core/common/profile_management_switches.h"
 #include "components/ui/zoom/zoom_event_manager.h"
 #include "content/public/test/test_utils.h"
 #include "net/dns/mock_host_resolver.h"
 #include "net/test/embedded_test_server/embedded_test_server.h"
 #include "net/test/embedded_test_server/http_response.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "url/gurl.h"
 
 using content::HostZoomMap;
 
@@ skipping 207 matching lines @@
   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();
 
   // Verify that our loaded page is using a HostZoomMap different from the
   // one for the default StoragePartition.
   HostZoomMap* host_zoom_map = HostZoomMap::GetForWebContents(web_contents);
-  HostZoomMap* default_profile_host_zoom_map =
-      HostZoomMap::GetDefaultForBrowserContext(browser()->profile());
-  EXPECT_NE(host_zoom_map, default_profile_host_zoom_map);
+
+  // For the webview based sign-in code, the sign in page uses the default host
+  // zoom map.
+  if (!switches::IsEnableWebviewBasedSignin()) {
+    HostZoomMap* default_profile_host_zoom_map =
+        HostZoomMap::GetDefaultForBrowserContext(browser()->profile());
+    EXPECT_NE(host_zoom_map, default_profile_host_zoom_map);
+  }
 
   double new_zoom_level =
       host_zoom_map->GetZoomLevelForHostAndScheme(test_scheme, test_host) + 0.5;
   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));
 }
 
@@ skipping 179 matching lines @@
   parent_zoom_map->SetZoomLevelForHost(host, zoom_level_40);
   ASSERT_EQ(
       parent_zoom_map->GetZoomLevelForHostAndScheme("http", host),
       zoom_level_40);
 
   EXPECT_EQ(parent_zoom_map->GetZoomLevelForHostAndScheme("http", host),
             child_zoom_map->GetZoomLevelForHostAndScheme("http", host)) <<
                 "Parent change should propagate to child.";
   base::RunLoop().RunUntilIdle();
 }