Fix the app notify channel setup for the case where the user may have explicitly revoked permissi...

chrome/browser/extensions/app_notify_channel_setup.cc

 // Copyright (c) 2011 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/extensions/app_notify_channel_setup.h"
 
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
@@ skipping 63 matching lines @@
     AppNotifyChannelUI* ui,
     base::WeakPtr<AppNotifyChannelSetup::Delegate> delegate)
     : profile_(profile),
       extension_id_(extension_id),
       client_id_(client_id),
       requestor_url_(requestor_url),
       return_route_id_(return_route_id),
       callback_id_(callback_id),
       delegate_(delegate),
       ui_(ui),
-      state_(INITIAL) {}
+      state_(INITIAL),
+      oauth2_access_token_failure_(false) {}
 
 AppNotifyChannelSetup::~AppNotifyChannelSetup() {}
 
 void AppNotifyChannelSetup::Start() {
   if (g_interceptor_for_tests) {
     std::string channel_id;
     std::string error;
     g_interceptor_for_tests->DoIntercept(this, &channel_id, &error);
     delegate_->AppNotifyChannelSetupComplete(channel_id, error, this);
     return;
@@ skipping 45 matching lines @@
   fetcher->SetExtraRequestHeaders(MakeAuthorizationHeader(auth_token));
   if (!body.empty()) {
     fetcher->SetUploadData("application/x-www-form-urlencoded", body);
   }
   return fetcher;
 }
 
 bool AppNotifyChannelSetup::ShouldPromptForLogin() const {
   std::string username = profile_->GetPrefs()->GetString(
       prefs::kGoogleServicesUsername);
-  // Prompt for login if either the user has not logged in at all or
-  // if the user is logged in but there is no OAuth2 login token.
-  // The latter happens for users who are already logged in before the
-  // code to generate OAuth2 login token is released.
+  // Prompt for login if either:
+  // 1. the user has not logged in at all or
+  // 2. if the user is logged in but there is no OAuth2 login token.
+  //    The latter happens for users who are already logged in before the
+  //    code to generate OAuth2 login token is released.
+  // 3. If the OAuth2 login token does not work anymore.
+  //    This can happen if the user explicitly revoked access to Google Chrome
+  //    from Google Accounts page.
   return username.empty() ||
-         !profile_->GetTokenService()->HasOAuthLoginToken();
+         !profile_->GetTokenService()->HasOAuthLoginToken() ||
+         oauth2_access_token_failure_;
 }
 
 void AppNotifyChannelSetup::BeginLogin() {
   CHECK_EQ(INITIAL, state_);
   state_ = LOGIN_STARTED;
   if (ShouldPromptForLogin()) {
     ui_->PromptSyncSetup(this);
     // We'll get called back in OnSyncSetupResult
   } else {
     EndLogin(true);
@@ skipping 25 matching lines @@
       GaiaUrls::GetInstance()->oauth2_chrome_client_secret(),
       profile_->GetTokenService()->GetOAuth2LoginRefreshToken(),
       scopes);
 }
 
 void AppNotifyChannelSetup::EndGetAccessToken(bool success) {
   CHECK_EQ(FETCH_ACCESS_TOKEN_STARTED, state_);
   if (success) {
     state_ = FETCH_ACCESS_TOKEN_DONE;
     BeginRecordGrant();
+  } else if (!oauth2_access_token_failure_) {
+    oauth2_access_token_failure_ = true;
+    // If access token generation fails, then it means somehow the
+    // OAuth2 login scoped token became invalid. One way this cna happen
+    // is if a user explicitly revoked access to Google Chrome from
+    // Google Accounts page. In such a case, we should try to show the
+    // login setup again to the user, but only if we have not already
+    // done so once (to avoid infinite loop).
+    state_ = INITIAL;
+    BeginLogin();
   } else {
     state_ = ERROR_STATE;
     ReportResult("", kChannelSetupInternalError);
   }
 }
 
 void AppNotifyChannelSetup::BeginRecordGrant() {
   CHECK_EQ(FETCH_ACCESS_TOKEN_DONE, state_);
   state_ = RECORD_GRANT_STARTED;
 
@@ skipping 126 matching lines @@
   DictionaryValue* dict = static_cast<DictionaryValue*>(value.get());
   if (!dict->Get("id", &channel_id_value))
     return false;
   if (channel_id_value->GetType() != base::Value::TYPE_STRING)
     return false;
 
   StringValue* channel_id = static_cast<StringValue*>(channel_id_value);
   channel_id->GetAsString(result);
   return true;
 }