Remove support for special "sign in process" state.

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 <set>
 #include <utility>
 #include <vector>
 
@@ skipping 173 matching lines @@
 #include "ui/base/ui_base_paths.h"
 #include "ui/gfx/android/device_display_info.h"
 #endif
 
 #if defined(OS_ANDROID)
 #include "chrome/browser/android/dev_tools_manager_delegate_android.h"
 #else
 #include "chrome/browser/devtools/chrome_devtools_manager_delegate.h"
 #endif
 
-#if !defined(OS_CHROMEOS)
-#include "chrome/browser/signin/chrome_signin_client.h"
-#include "chrome/browser/signin/chrome_signin_client_factory.h"
-#include "chrome/browser/signin/signin_manager_factory.h"
-#include "components/signin/core/browser/signin_manager.h"
-#endif
-
 #if defined(TOOLKIT_VIEWS)
 #include "chrome/browser/ui/views/chrome_browser_main_extra_parts_views.h"
 #endif
 
 #if defined(USE_ASH)
 #include "chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.h"
 #endif
 
 #if defined(USE_AURA)
 #include "chrome/browser/ui/aura/chrome_browser_main_extra_parts_aura.h"
@@ skipping 290 matching lines @@
     static breakpad::CrashHandlerHostLinux* crash_handler = NULL;
     if (!crash_handler)
       crash_handler = CreateCrashHandlerHost(process_type);
     return crash_handler->GetDeathSignalSocket();
   }
 
   return -1;
 }
 #endif  // defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX)
 
-#if !defined(OS_CHROMEOS)
-GURL GetEffectiveURLForSignin(const GURL& url) {
-  CHECK(SigninManager::IsWebBasedSigninFlowURL(url));
-
-  GURL effective_url(SigninManager::kChromeSigninEffectiveSite);
-  // Copy the path because the argument to SetPathStr must outlive
-  // the Replacements object.
-  const std::string path_copy(url.path());
-  GURL::Replacements replacements;
-  replacements.SetPathStr(path_copy);
-  effective_url = effective_url.ReplaceComponents(replacements);
-  return effective_url;
-}
-#endif
-
 void SetApplicationLocaleOnIOThread(const std::string& locale) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   g_io_thread_application_locale.Get() = locale;
 }
 
 void HandleBlockedPopupOnUIThread(const BlockedWindowParams& params) {
   // TODO(jochen): This code path should use RenderFrameHosts. See
   // http://crbug.com/431769 for details.
   RenderViewHost* render_view_host =
       RenderViewHost::FromID(params.render_process_id(), params.opener_id());
@@ skipping 435 matching lines @@
     content::BrowserContext* browser_context, const GURL& url) {
   Profile* profile = Profile::FromBrowserContext(browser_context);
   if (!profile)
     return url;
 
   // If the input |url| should be assigned to the Instant renderer, make its
   // effective URL distinct from other URLs on the search provider's domain.
   if (chrome::ShouldAssignURLToInstantRenderer(url, profile))
     return chrome::GetEffectiveURLForInstant(url, profile);
 
-#if !defined(OS_CHROMEOS)
-  // If the input |url| should be assigned to the Signin renderer, make its
-  // effective URL distinct from other URLs on the signin service's domain.
-  // Note that the signin renderer will be allowed to sign the user in to
-  // Chrome.
-  if (SigninManager::IsWebBasedSigninFlowURL(url))
-    return GetEffectiveURLForSignin(url);
-#endif
-
 #if defined(ENABLE_EXTENSIONS)
   return ChromeContentBrowserClientExtensionsPart::GetEffectiveURL(
       profile, url);
 #else
   return url;
 #endif
 }
 
 bool ChromeContentBrowserClient::ShouldUseProcessPerSite(
     content::BrowserContext* browser_context, const GURL& effective_url) {
   // Non-extension, non-Instant URLs should generally use
   // process-per-site-instance.  Because we expect to use the effective URL,
   // URLs for hosted apps (apart from bookmark apps) should have an extension
   // scheme by now.
 
   Profile* profile = Profile::FromBrowserContext(browser_context);
   if (!profile)
     return false;
 
   if (chrome::ShouldUseProcessPerSiteForInstantURL(effective_url, profile))
     return true;
 
-#if !defined(OS_CHROMEOS)
-  if (SigninManager::IsWebBasedSigninFlowURL(effective_url))
-    return true;
-#endif
-
 #if defined(ENABLE_EXTENSIONS)
   return ChromeContentBrowserClientExtensionsPart::ShouldUseProcessPerSite(
       profile, effective_url);
 #else
   return false;
 #endif
 }
 
 // These are treated as WebUI schemes but do not get WebUI bindings. Also,
 // view-source is allowed for these schemes.
@@ skipping 93 matching lines @@
       InstantServiceFactory::GetForProfile(profile);
   if (instant_service) {
     bool is_instant_process = instant_service->IsInstantProcess(
         process_host->GetID());
     bool should_be_in_instant_process =
         chrome::ShouldAssignURLToInstantRenderer(site_url, profile);
     if (is_instant_process || should_be_in_instant_process)
       return is_instant_process && should_be_in_instant_process;
   }
 
-#if !defined(OS_CHROMEOS)
-  SigninClient* signin_client =
-      ChromeSigninClientFactory::GetForProfile(profile);
-  if (signin_client && signin_client->IsSigninProcess(process_host->GetID()))
-    return SigninManager::IsWebBasedSigninFlowURL(site_url);
-#endif
-
 #if defined(ENABLE_EXTENSIONS)
   return ChromeContentBrowserClientExtensionsPart::IsSuitableHost(
       profile, process_host, site_url);
 #else
   return true;
 #endif
 }
 
 bool ChromeContentBrowserClient::MayReuseHost(
     content::RenderProcessHost* process_host) {
@@ skipping 40 matching lines @@
   // Remember the ID of the Instant process to signal the renderer process
   // on startup in |AppendExtraCommandLineSwitches| below.
   if (chrome::ShouldAssignURLToInstantRenderer(
           site_instance->GetSiteURL(), profile)) {
     InstantService* instant_service =
         InstantServiceFactory::GetForProfile(profile);
     if (instant_service)
       instant_service->AddInstantProcess(site_instance->GetProcess()->GetID());
   }
 
-#if !defined(OS_CHROMEOS)
-  // We only expect there to be one signin process as we use process-per-site
-  // for signin URLs. The signin process will be cleared from SigninManager
-  // when the renderer is destroyed.
-  if (SigninManager::IsWebBasedSigninFlowURL(site_instance->GetSiteURL())) {
-    SigninClient* signin_client =
-        ChromeSigninClientFactory::GetForProfile(profile);
-    if (signin_client)
-      signin_client->SetSigninProcess(site_instance->GetProcess()->GetID());
-#if defined(ENABLE_EXTENSIONS)
-    ChromeContentBrowserClientExtensionsPart::SetSigninProcess(site_instance);
-#endif
-  }
-#endif
-
   for (size_t i = 0; i < extra_parts_.size(); ++i)
     extra_parts_[i]->SiteInstanceGotProcess(site_instance);
 }
 
 void ChromeContentBrowserClient::SiteInstanceDeleting(
     SiteInstance* site_instance) {
   if (!site_instance->HasProcess())
     return;
 
   for (size_t i = 0; i < extra_parts_.size(); ++i)
@@ skipping 172 matching lines @@
       }
 
       if (prefs->GetBoolean(prefs::kPrintPreviewDisabled))
         command_line->AppendSwitch(switches::kDisablePrintPreview);
 
       InstantService* instant_service =
           InstantServiceFactory::GetForProfile(profile);
       if (instant_service &&
           instant_service->IsInstantProcess(process->GetID()))
         command_line->AppendSwitch(switches::kInstantProcess);
-
-#if !defined(OS_CHROMEOS)
-      SigninClient* signin_client =
-          ChromeSigninClientFactory::GetForProfile(profile);
-      if (signin_client && signin_client->IsSigninProcess(process->GetID()))
-        command_line->AppendSwitch(switches::kSigninProcess);
-#endif
     }
 
     if (IsAutoReloadEnabled())
       command_line->AppendSwitch(switches::kEnableOfflineAutoReload);
     if (IsAutoReloadVisibleOnlyEnabled()) {
       command_line->AppendSwitch(
           switches::kEnableOfflineAutoReloadVisibleOnly);
     }
 
     {
@@ skipping 1219 matching lines @@
       switches::kDisableWebRtcEncryption,
     };
     to_command_line->CopySwitchesFrom(from_command_line,
                                       kWebRtcDevSwitchNames,
                                       arraysize(kWebRtcDevSwitchNames));
   }
 }
 #endif  // defined(ENABLE_WEBRTC)
 
 }  // namespace chrome