Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(76)

Unified Diff: chrome/browser/chromeos/login/helper.cc

Issue 1083683003: Speculative revert by sheriff (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Removed an unrelated commit that had accidentally slipped in. Created 5 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/chromeos/login/helper.cc
diff --git a/chrome/browser/chromeos/login/helper.cc b/chrome/browser/chromeos/login/helper.cc
index f949875e9bb9bc4ef2d9b36ad5f167fd175cfa21..afe1bf41c12aceddfa83632945d7c3b89c4394fa 100644
--- a/chrome/browser/chromeos/login/helper.cc
+++ b/chrome/browser/chromeos/login/helper.cc
@@ -153,20 +153,8 @@ content::StoragePartition* GetSigninPartition() {
}
net::URLRequestContextGetter* GetSigninContext() {
- if (StartupUtils::IsWebviewSigninEnabled()) {
- content::StoragePartition* signin_partition = GetSigninPartition();
-
- // Special case for unit tests. There's no LoginDisplayHost thus no
- // webview instance. TODO(nkostylev): Investigate if there's a better
- // place to address this like dependency injection. http://crbug.com/477402
- if (!signin_partition && !LoginDisplayHostImpl::default_host())
- return ProfileHelper::GetSigninProfile()->GetRequestContext();
-
- if (!signin_partition)
- return nullptr;
-
- return signin_partition->GetURLRequestContext();
- }
+ if (StartupUtils::IsWebviewSigninEnabled())
+ return GetSigninPartition()->GetURLRequestContext();
return ProfileHelper::GetSigninProfile()->GetRequestContext();
}

Powered by Google App Engine
This is Rietveld 408576698