Remove enable-iframe-based-signin flag.

chrome/browser/chrome_content_browser_client.cc

 // Copyright (c) 2012 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 "chrome/browser/chrome_content_browser_client.h"
 
 #include <map>
 #include <set>
 #include <utility>
 #include <vector>
@@ skipping 752 matching lines @@
   AfterStartupTaskUtils::PostTask(from_here, task_runner, task);
 }
 
 std::string ChromeContentBrowserClient::GetStoragePartitionIdForSite(
     content::BrowserContext* browser_context,
     const GURL& site) {
   std::string partition_id;
 
   // The partition ID for webview guest processes is the string value of its
   // SiteInstance URL - "chrome-guest://app_id/persist?partition".
-  if (site.SchemeIs(content::kGuestScheme)) {
+  if (site.SchemeIs(content::kGuestScheme))
     partition_id = site.spec();
-  } else if (!switches::IsEnableWebviewBasedSignin() &&
-             site.GetOrigin().spec() == chrome::kChromeUIChromeSigninURL) {
-    // The non-webview Chrome signin page has an embedded iframe of extension
-    // and web content, thus it must be isolated from other webUI pages.
-    partition_id = site.GetOrigin().spec();
-  }
 
   DCHECK(IsValidStoragePartitionId(browser_context, partition_id));
   return partition_id;
 }
 
 bool ChromeContentBrowserClient::IsValidStoragePartitionId(
     content::BrowserContext* browser_context,
     const std::string& partition_id) {
   // The default ID is empty and is always valid.
   if (partition_id.empty())
     return true;
 
   return GURL(partition_id).is_valid();
 }
 
 void ChromeContentBrowserClient::GetStoragePartitionConfigForSite(
     content::BrowserContext* browser_context,
     const GURL& site,
     bool can_be_default,
     std::string* partition_domain,
     std::string* partition_name,
     bool* in_memory) {
   // Default to the browser-wide storage partition and override based on |site|
   // below.
   partition_domain->clear();
   partition_name->clear();
   *in_memory = false;
 
-  bool success = false;
 #if defined(ENABLE_EXTENSIONS)
-  success = extensions::WebViewGuest::GetGuestPartitionConfigForSite(
+  bool success = extensions::WebViewGuest::GetGuestPartitionConfigForSite(
       site, partition_domain, partition_name, in_memory);
 
   if (!success && site.SchemeIs(extensions::kExtensionScheme)) {
     // If |can_be_default| is false, the caller is stating that the |site|
     // should be parsed as if it had isolated storage. In particular it is
     // important to NOT check ExtensionService for the is_storage_isolated()
     // attribute because this code path is run during Extension uninstall
     // to do cleanup after the Extension has already been unloaded from the
     // ExtensionService.
     bool is_isolated = !can_be_default;
     if (can_be_default) {
       if (extensions::util::SiteHasIsolatedStorage(site, browser_context))
         is_isolated = true;
     }
 
     if (is_isolated) {
       CHECK(site.has_host());
       // For extensions with isolated storage, the the host of the |site| is
       // the |partition_domain|. The |in_memory| and |partition_name| are only
       // used in guest schemes so they are cleared here.
       *partition_domain = site.host();
       *in_memory = false;
       partition_name->clear();
     }
     success = true;
   }
 #endif
 
-  if (!success &&
-      (!switches::IsEnableWebviewBasedSignin() &&
-       site.GetOrigin().spec() == chrome::kChromeUIChromeSigninURL)) {
-    // The non-webview Chrome signin page has an embedded iframe of extension
-    // and web content, thus it must be isolated from other webUI pages.
-    *partition_domain = chrome::kChromeUIChromeSigninHost;
-  }
-
   // Assert that if |can_be_default| is false, the code above must have found a
   // non-default partition.  If this fails, the caller has a serious logic
   // error about which StoragePartition they expect to be in and it is not
   // safe to continue.
   CHECK(can_be_default || !partition_domain->empty());
 }
 
 content::WebContentsViewDelegate*
     ChromeContentBrowserClient::GetWebContentsViewDelegate(
         content::WebContents* web_contents) {
@@ skipping 1911 matching lines @@
   if (channel <= kMaxDisableEncryptionChannel) {
     static const char* const kWebRtcDevSwitchNames[] = {
       switches::kDisableWebRtcEncryption,
     };
     to_command_line->CopySwitchesFrom(from_command_line,
                                       kWebRtcDevSwitchNames,
                                       arraysize(kWebRtcDevSwitchNames));
   }
 }
 #endif  // defined(ENABLE_WEBRTC)