Remove enable-iframe-based-signin flag.

chrome/browser/ui/zoom/zoom_controller_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 "components/ui/zoom/zoom_controller.h"
 
 #include "base/prefs/pref_service.h"
 #include "base/process/kill.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
@@ skipping 279 matching lines @@
   content::WebContents* web_contents =
       browser()->tab_strip_model()->GetActiveWebContents();
   EXPECT_NE(
       content::PAGE_TYPE_ERROR,
       web_contents->GetController().GetLastCommittedEntry()->GetPageType());
 
   EXPECT_EQ(signin_url, web_contents->GetLastCommittedURL());
   ZoomController* zoom_controller =
       ZoomController::FromWebContents(web_contents);
 
-  content::HostZoomMap* host_zoom_map_signin =
-      content::HostZoomMap::GetForWebContents(web_contents);
-
   GURL settings_url(chrome::kChromeUISettingsURL);
   ui_test_utils::NavigateToURL(browser(), settings_url);
   EXPECT_NE(
       content::PAGE_TYPE_ERROR,
       web_contents->GetController().GetLastCommittedEntry()->GetPageType());
 
   // Verify new tab was created.
   EXPECT_EQ(2, browser()->tab_strip_model()->count());
   // Verify that the settings page is using the same WebContents.
   EXPECT_EQ(web_contents, browser()->tab_strip_model()->GetActiveWebContents());
   // TODO(wjmaclean): figure out why this next line fails, i.e. why does this
   // test not properly trigger a navigation to the settings page.
   EXPECT_EQ(settings_url, web_contents->GetLastCommittedURL());
   EXPECT_EQ(zoom_controller, ZoomController::FromWebContents(web_contents));
 
-  // For the webview based sign-in code, the sign in page uses the default host
-  // zoom map.
-  if (!switches::IsEnableWebviewBasedSignin()) {
-    // We expect the navigation from the chrome sign in page to the settings
-    // page to invoke a storage partition switch, and thus a different
-    // HostZoomMap for the web_contents.
-    content::HostZoomMap* host_zoom_map_settings =
-        content::HostZoomMap::GetForWebContents(web_contents);
-    EXPECT_NE(host_zoom_map_signin, host_zoom_map_settings);
-  }
-
   // If we zoom the new page, it should still generate a ZoomController event.
   double old_zoom_level = zoom_controller->GetZoomLevel();
   double new_zoom_level = old_zoom_level + 0.5;
 
   ZoomController::ZoomChangedEventData zoom_change_data(
       web_contents,
       old_zoom_level,
       new_zoom_level,
       ZoomController::ZOOM_MODE_DEFAULT,
       true);  // We have a non-empty host, so this will be 'true'.
   ZoomChangedWatcher zoom_change_watcher(web_contents, zoom_change_data);
   zoom_controller->SetZoomLevel(new_zoom_level);
   zoom_change_watcher.Wait();
 }
 #endif  // !defined(OS_CHROMEOS)