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

chrome/browser/ui/sync/one_click_signin_sync_starter.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/ui/sync/one_click_signin_sync_starter.h"
 
 #include "base/metrics/histogram.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
@@ skipping 22 matching lines @@
 #include "chrome/browser/ui/chrome_pages.h"
 #include "chrome/browser/ui/sync/one_click_signin_sync_observer.h"
 #include "chrome/browser/ui/tab_dialogs.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/browser/ui/webui/signin/login_ui_service_factory.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/grit/chromium_strings.h"
 #include "chrome/grit/generated_resources.h"
 #include "components/signin/core/browser/signin_manager.h"
 #include "components/signin/core/browser/signin_metrics.h"
-#include "components/signin/core/common/profile_management_switches.h"
 #include "components/sync_driver/sync_prefs.h"
 #include "net/url_request/url_request_context_getter.h"
 #include "ui/base/l10n/l10n_util.h"
 
 namespace {
 
 // UMA histogram for tracking what users do when presented with the signin
 // screen.
 // Hence,
 //   (a) existing enumerated constants should never be deleted or reordered, and
@@ skipping 369 matching lines @@
       default:
         DisplayFinalConfirmationBubble(l10n_util::GetStringUTF16(
             IDS_SYNC_ERROR_SIGNING_IN));
         break;
     }
   }
   delete this;
 }
 
 void OneClickSigninSyncStarter::SigninSuccess() {
-  if (switches::IsEnableWebBasedSignin())
-    MergeSessionComplete(GoogleServiceAuthError(GoogleServiceAuthError::NONE));
 }
 
 void OneClickSigninSyncStarter::MergeSessionComplete(
     const GoogleServiceAuthError& error) {
   // Regardless of whether the merge session completed sucessfully or not,
   // continue with sync starting.
 
   if (!sync_setup_completed_callback_.is_null())
     sync_setup_completed_callback_.Run(SYNC_SETUP_SUCCESS);
 
@@ skipping 83 matching lines @@
     // settings UI.
     bool use_same_tab = false;
     if (web_contents()) {
       GURL current_url = web_contents()->GetLastCommittedURL();
       bool is_chrome_signin_url =
           current_url.GetOrigin().spec() == chrome::kChromeUIChromeSigninURL;
       bool is_same_profile =
           Profile::FromBrowserContext(web_contents()->GetBrowserContext()) ==
           profile_;
       use_same_tab =
-          (is_chrome_signin_url ||
-           signin::IsContinueUrlForWebBasedSigninFlow(current_url)) &&
+          is_chrome_signin_url &&
           !signin::IsAutoCloseEnabledInURL(current_url) &&
           is_same_profile;
     }
     if (profile_sync_service) {
       // Need to navigate to the settings page and display the sync UI.
       if (use_same_tab) {
         ShowSettingsPageInWebContents(web_contents(),
                                       chrome::kSyncSetupSubPage);
       } else {
         // If the user is setting up sync for the first time, let them configure
@@ skipping 59 matching lines @@
                                             false /* user_gesture */);
 }
 
 void OneClickSigninSyncStarter::LoadContinueUrl() {
   web_contents()->GetController().LoadURL(
       continue_url_,
       content::Referrer(),
       ui::PAGE_TRANSITION_AUTO_TOPLEVEL,
       std::string());
 }