Disconnect one click sign in code. The code itself will be removed in followup

chrome/browser/signin/chrome_signin_client.cc

 // Copyright 2014 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/signin/chrome_signin_client.h"
 
 #include "base/command_line.h"
 #include "base/guid.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 161 matching lines @@
   cache.SetLocalAuthCredentialsOfProfileAtIndex(index, std::string());
   cache.SetUserNameOfProfileAtIndex(index, base::string16());
   cache.SetProfileSigninRequiredAtIndex(index, false);
 }
 
 net::URLRequestContextGetter* ChromeSigninClient::GetURLRequestContext() {
   return profile_->GetRequestContext();
 }
 
 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() {
   chrome::VersionInfo chrome_version;
   return chrome_version.CreateVersionString();
 }
 
 bool ChromeSigninClient::IsFirstRun() const {
 #if defined(OS_ANDROID)
   return false;
@@ skipping 63 matching lines @@
 
   ProfileInfoCache& cache = g_browser_process->profile_manager()->
       GetProfileInfoCache();
   size_t index = cache.GetIndexOfProfileWithPath(profile_->GetPath());
   if (index == std::string::npos)
     return;
 
   cache.SetProfileIsAuthErrorAtIndex(index,
       signin_error_controller_->HasError());
 }