[Clean-up] Remove some dead code for handling Webstore sign-in.

chrome/browser/ui/sync/one_click_signin_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/ui/sync/one_click_signin_helper.h"
 
 #include <algorithm>
 #include <functional>
 #include <utility>
 #include <vector>
@@ skipping 286 matching lines @@
   } else {
     // Perform a redirection to the NTP/Apps page to hide the blank page when
     // the action is CLOSE or CREATE_NEW_USER. The redirection is useful when
     // the action is CREATE_NEW_USER because the "Create new user" page might
     // be opened in a different tab that is already showing settings.
     if (enable_inline) {
       // Redirect/tab closing for inline flow is handled by the sync callback.
       args.callback.Run(OneClickSigninSyncStarter::SYNC_SETUP_FAILURE);
     } else {
       // Don't redirect when the visible URL is not a blank page: if the
       // source is SOURCE_WEBSTORE_INSTALL, |contents| might be showing an app

[Ilya Sherman, 2014/09/17 22:42:02]

Note: I'm not sure how this comment should be updated now that
SOURCE_WEBSTORE_INSTALL has been removed.

[guohui, 2014/09/18 21:25:55]

i think the comment could be removed, together with the if (isContinueUrl..)
check below.

[Ilya Sherman, 2014/09/18 21:55:57]

Done.

       // page that shouldn't be hidden.
       //
       // If redirecting, don't do so immediately, otherwise there may be 2
       // nested navigations and a crash would occur (crbug.com/293261).  Post
       // the task to the current thread instead.
       if (signin::IsContinueUrlForWebBasedSigninFlow(
               contents->GetVisibleURL())) {
         base::MessageLoopProxy::current()->PostNonNestableTask(
             FROM_HERE,
             base::Bind(RedirectToNtpOrAppsPageWithIds,
@@ skipping 203 matching lines @@
       session_index(session_index),
       email(email),
       password(password),
       refresh_token(refresh_token),
       web_contents(web_contents),
       source(source),
       callback(callback) {
   DCHECK(session_index.empty() != refresh_token.empty());
   if (untrusted_confirmation_required) {
     confirmation_required = OneClickSigninSyncStarter::CONFIRM_UNTRUSTED_SIGNIN;
-  } else if (source == signin::SOURCE_SETTINGS ||
-             source == signin::SOURCE_WEBSTORE_INSTALL) {
-    // Do not display a status confirmation for webstore installs or re-auth.
+  } else if (source == signin::SOURCE_SETTINGS) {
+    // Do not display a status confirmation for re-auth.
     confirmation_required = OneClickSigninSyncStarter::NO_CONFIRMATION;
   } else {
     confirmation_required = OneClickSigninSyncStarter::CONFIRM_AFTER_SIGNIN;
   }
 }
 
 OneClickSigninHelper::StartSyncArgs::~StartSyncArgs() {}
 
 // SyncStarterWrapper ---------------------------------------------------------
 
@@ skipping 176 matching lines @@
                                 one_click_signin::HISTOGRAM_MAX);
       break;
     case signin::SOURCE_SETTINGS:
       UMA_HISTOGRAM_ENUMERATION("Signin.SettingsActions", action,
                                 one_click_signin::HISTOGRAM_MAX);
       break;
     case signin::SOURCE_EXTENSION_INSTALL_BUBBLE:
       UMA_HISTOGRAM_ENUMERATION("Signin.ExtensionInstallBubbleActions", action,
                                 one_click_signin::HISTOGRAM_MAX);
       break;
-    case signin::SOURCE_WEBSTORE_INSTALL:
-      UMA_HISTOGRAM_ENUMERATION("Signin.WebstoreInstallActions", action,
-                                one_click_signin::HISTOGRAM_MAX);
-      break;
     case signin::SOURCE_APP_LAUNCHER:
       UMA_HISTOGRAM_ENUMERATION("Signin.AppLauncherActions", action,
                                 one_click_signin::HISTOGRAM_MAX);
       break;
     case signin::SOURCE_APPS_PAGE_LINK:
       UMA_HISTOGRAM_ENUMERATION("Signin.AppsPageLinkActions", action,
                                 one_click_signin::HISTOGRAM_MAX);
       break;
     case signin::SOURCE_BOOKMARK_BUBBLE:
       UMA_HISTOGRAM_ENUMERATION("Signin.BookmarkBubbleActions", action,
@@ skipping 10 matching lines @@
     case signin::SOURCE_DEVICES_PAGE:
       UMA_HISTOGRAM_ENUMERATION("Signin.DevicesPageActions", action,
                                 one_click_signin::HISTOGRAM_MAX);
       break;
     case signin::SOURCE_REAUTH:
       UMA_HISTOGRAM_ENUMERATION("Signin.ReauthActions", action,
                                 one_click_signin::HISTOGRAM_MAX);
       break;
     default:
       // This switch statement needs to be updated when the enum Source changes.
-      COMPILE_ASSERT(signin::SOURCE_UNKNOWN == 13,
+      COMPILE_ASSERT(signin::SOURCE_UNKNOWN == 12,
                      kSourceEnumHasChangedButNotThisSwitchStatement);
       UMA_HISTOGRAM_ENUMERATION("Signin.UnknownActions", action,
                                 one_click_signin::HISTOGRAM_MAX);
   }
   UMA_HISTOGRAM_ENUMERATION("Signin.AllAccessPointActions", action,
                             one_click_signin::HISTOGRAM_MAX);
 }
 
 // static
 void OneClickSigninHelper::CreateForWebContentsWithPasswordManager(
@@ skipping 430 matching lines @@
                                 content::Referrer(),
                                 CURRENT_TAB,
                                 content::PAGE_TRANSITION_AUTO_TOPLEVEL,
                                 false);
   contents->OpenURL(params);
 }
 
 // static
 void OneClickSigninHelper::RedirectToNtpOrAppsPageIfNecessary(
     content::WebContents* contents, signin::Source source) {
-  if (source != signin::SOURCE_SETTINGS &&
-      source != signin::SOURCE_WEBSTORE_INSTALL) {
+  if (source != signin::SOURCE_SETTINGS) {
     RedirectToNtpOrAppsPage(contents, source);
   }
 }
 
 void OneClickSigninHelper::RedirectToSignin() {
   VLOG(1) << "OneClickSigninHelper::RedirectToSignin";
 
   // Extract the existing sounce=X value.  Default to "2" if missing.
   signin::Source source = signin::GetSourceForPromoURL(continue_url_);
   if (source == signin::SOURCE_UNKNOWN)
@@ skipping 321 matching lines @@
               start_mode);
         }
 
         // If this explicit sign in is not from settings page/webstore, show
         // the NTP/Apps page after sign in completes. In the case of the
         // settings page, it will get auto-closed after sync setup. In the case
         // of webstore, it will redirect back to webstore.
         RedirectToNtpOrAppsPageIfNecessary(web_contents(), source_);
       }
 
-      // Observe the sync service if the Webstore tab or the settings tab
-      // requested a gaia sign in, so that when sign in and sync setup are
-      // successful, we can redirect to the correct URL, or auto-close the gaia
-      // sign in tab.
-      if (original_source == signin::SOURCE_SETTINGS ||
-          (original_source == signin::SOURCE_WEBSTORE_INSTALL &&
-           source_ == signin::SOURCE_SETTINGS)) {
+      // Observe the sync service if the settings tab requested a gaia sign in,
+      // so that when sign in and sync setup are successful, we can redirect to
+      // the correct URL, or auto-close the gaia sign in tab.
+      if (original_source == signin::SOURCE_SETTINGS) {
         // The observer deletes itself once it's done.
         new OneClickSigninSyncObserver(contents, original_continue_url_);

[guohui, 2014/09/18 21:25:55]

i think original_continue_url was added for webstore signin flow, and now it is
useless. Also i remember you created the class OneClickSigninSyncObserver for
webstore signin flow, much logic in that class should now be pruned, e.g.
anything about continue url.

[Ilya Sherman, 2014/09/18 21:55:57]

I think you might be right, but I'm not 100% certain, and it wasn't obvious to
me from reading the code whether the original_continue_url_ was no longer
useful.  I seem to recall that it might have existed before my changes, though
my memory of this code is imperfect.  Do you know whether the "original_source
== signin::SOURCE_SETTINGS" case is no longer relevant?

I think this CL is approximately the limit of what I feel comfortable with
changing given my current knowledge of the signin code.  If you have time and
interest, it would be great if you could do a pass after this lands to see if
there's more that can be pruned.  I'm happy to help in any way I can; I'm just
not certain what paths are no longer reachable.

       }
       break;
     }
     case AUTO_ACCEPT_REJECTED_FOR_PROFILE:
       AddEmailToOneClickRejectedList(profile, email_);
       LogOneClickHistogramValue(one_click_signin::HISTOGRAM_REJECTED);
       break;
     default:
       NOTREACHED() << "Invalid auto_accept=" << auto_accept_;
       break;
@@ skipping 20 matching lines @@
     // If the web contents is showing a blank page and not about to be closed,
     // redirect to the NTP or apps page.
     if (signin::IsContinueUrlForWebBasedSigninFlow(current_url) &&
         !signin::IsAutoCloseEnabledInURL(original_continue_url_)) {
       RedirectToNtpOrAppsPage(
           web_contents(),
           signin::GetSourceForPromoURL(original_continue_url_));
     }
   }
 }