| Index: chrome/browser/signin/chrome_signin_client.cc
|
| diff --git a/chrome/browser/signin/chrome_signin_client.cc b/chrome/browser/signin/chrome_signin_client.cc
|
| index 0d445212b476c9278dbf166eff7f4935b0acbadd..82e1663dc56d09cca95177a1f1c6156954ea6414 100644
|
| --- a/chrome/browser/signin/chrome_signin_client.cc
|
| +++ b/chrome/browser/signin/chrome_signin_client.cc
|
| @@ -185,10 +185,7 @@ net::URLRequestContextGetter* ChromeSigninClient::GetURLRequestContext() {
|
| }
|
|
|
| bool ChromeSigninClient::ShouldMergeSigninCredentialsIntoCookieJar() {
|
| - // If inline sign in is enabled, but account consistency is not, the user's
|
| - // credentials should be merge into the cookie jar.
|
| - return !switches::IsEnableWebBasedSignin() &&
|
| - !switches::IsEnableAccountConsistency();
|
| + return !switches::IsEnableAccountConsistency();
|
| }
|
|
|
| std::string ChromeSigninClient::GetProductVersion() {
|
|
|