[cros New-GAIA] Webview login and new GAIA endpoint enabled by default

chrome/browser/chromeos/login/helper.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/chromeos/login/helper.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/chromeos/login/startup_utils.h"
@@ skipping 135 matching lines @@
   content::WebContents* embedder = GetLoginWebContents();
   if (!embedder)
     return nullptr;
 
   // Note the partition name must match the sign-in webview used. For now,
   // this is the default unnamed, shared, in-memory partition.
   return GetPartition(embedder, std::string());
 }
 
 net::URLRequestContextGetter* GetSigninContext() {
-  if (StartupUtils::IsWebviewSigninEnabled())
-    return GetSigninPartition()->GetURLRequestContext();
+  if (StartupUtils::IsWebviewSigninEnabled()) {
+    content::StoragePartition* signin_partition = GetSigninPartition();
+
+    // Special case for unit tests. There's no LoginDisplayHost thus no
+    // webview instance.
+    if (!signin_partition && !LoginDisplayHostImpl::default_host())

[dzhioev (left Google), 2015/04/15 17:36:24]

Please try to return nullptr in this case. Or at least check that we are in unit
test.

[Nikita (slow), 2015/04/15 18:35:42]

Returning nullptr here wouldn't work as UserCloudPolicyManagerChromeOS expects
to get something to fetch tokens it needs (in tests). I've added TODO and a bug.

Another unclear thing to me right now is whether this codepath gets hit when
browser gets restarted after crash and there's no webview instance as well. I'll
investigate that too just not in this CL.

So the plan is to enable this by default one month before branch to see what
breaks.

I'll file a separate bug for enterprise team to investigate.

+      return ProfileHelper::GetSigninProfile()->GetRequestContext();
+
+    if (!signin_partition)
+      return nullptr;
+
+    return signin_partition->GetURLRequestContext();
+  }
 
   return ProfileHelper::GetSigninProfile()->GetRequestContext();
 }
 
 }  // namespace login
 
 }  // namespace chromeos