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

chrome/browser/extensions/app_notify_channel_setup_unittest.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 "base/bind.h"
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/memory/weak_ptr.h"
 #include "base/message_loop.h"
 #include "chrome/browser/extensions/app_notify_channel_setup.h"
@@ skipping 164 matching lines @@
     return new AppNotifyChannelSetup(&profile_,
                                      kFakeExtensionId,
                                      "1234",
                                      page_url,
                                      kRouteId,
                                      kCallbackId,
                                      ui_.release(),
                                      delegate_.AsWeakPtr());
   }
 
-  virtual void SetupLogin(bool should_succeed) {
+  virtual void SetupLogin(bool should_prompt, bool should_succeed) {
     if (should_succeed) {
       SetLoggedInUser("user@gmail.com");
       profile_.SetTokenServiceHasTokenResult(true);
-    } else {
-      ui_->SetSyncSetupResult(false);
     }
+    if (should_prompt)
+      ui_->SetSyncSetupResult(should_succeed);
   }
 
   virtual void SetupFetchAccessToken(bool should_succeed) {
     factory_.SetFakeResponse(
         GaiaUrls::GetInstance()->oauth2_token_url(),
         kValidAccessTokenResponse,
         should_succeed);
   }
 
   virtual void SetupRecordGrant(bool should_succeed) {
@@ skipping 21 matching lines @@
  protected:
   MessageLoop message_loop_;
   content::TestBrowserThread ui_thread_;
   TestProfile profile_;
   TestDelegate delegate_;
   scoped_ptr<TestUI> ui_;
   FakeURLFetcherFactory factory_;
 };
 
 TEST_F(AppNotifyChannelSetupTest, LoginFailure) {
-  SetupLogin(false);
+  SetupLogin(true, false);
 
   scoped_refptr<AppNotifyChannelSetup> setup = CreateInstance();
   RunServerTest(setup, "", "canceled_by_user");
 }
 
-TEST_F(AppNotifyChannelSetupTest, FetchAccessTokenFailure) {
-  SetupLogin(true);
+TEST_F(AppNotifyChannelSetupTest, DoubleFetchAccessTokenFailure) {
+  SetupLogin(false, true);
+  SetupFetchAccessToken(false);
+  SetupLogin(true, true);
   SetupFetchAccessToken(false);
 
   scoped_refptr<AppNotifyChannelSetup> setup = CreateInstance();
   RunServerTest(setup, "", "internal_error");
 }
 
 TEST_F(AppNotifyChannelSetupTest, RecordGrantFailure) {
-  SetupLogin(true);
+  SetupLogin(false, true);
   SetupFetchAccessToken(true);
   SetupRecordGrant(false);
 
   scoped_refptr<AppNotifyChannelSetup> setup = CreateInstance();
   RunServerTest(setup, "", "internal_error");
 }
 
 TEST_F(AppNotifyChannelSetupTest, GetChannelIdFailure) {
-  SetupLogin(true);
+  SetupLogin(false, true);
   SetupFetchAccessToken(true);
   SetupRecordGrant(true);
   SetupGetChannelId(false);
 
   scoped_refptr<AppNotifyChannelSetup> setup = CreateInstance();
   RunServerTest(setup, "", "internal_error");
 }
 
-TEST_F(AppNotifyChannelSetupTest, ServerSuccess) {
-  SetupLogin(true);
+TEST_F(AppNotifyChannelSetupTest, FirstFetchAccessTokenSuccess) {
+  SetupLogin(false, true);
   SetupFetchAccessToken(true);
   SetupRecordGrant(true);
   SetupGetChannelId(true);
 
   scoped_refptr<AppNotifyChannelSetup> setup = CreateInstance();
   RunServerTest(setup, "dummy_do_not_use", "");
 }
+
+TEST_F(AppNotifyChannelSetupTest, SecondFetchAccessTokenSuccess) {
+  SetupLogin(false, true);
+  SetupFetchAccessToken(false);
+  SetupLogin(true, true);
+  SetupFetchAccessToken(true);
+  SetupRecordGrant(true);
+  SetupGetChannelId(true);
+
+  scoped_refptr<AppNotifyChannelSetup> setup = CreateInstance();
+  RunServerTest(setup, "dummy_do_not_use", "");
+}