[Sync] Don't display passphrase notification if user dismissed previous one

chrome/browser/sync/sync_error_notifier_ash_unittest.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/sync/sync_error_notifier_ash.h"
 
 #include <stddef.h>
 
 #include <memory>
 
@@ skipping 116 matching lines @@
     display::Screen::SetScreenInstance(nullptr);
     test_screen_.reset();
 #endif
   }
 
  protected:
   // Utility function to test that SyncErrorNotifier behaves correctly for the
   // given error condition.
   void VerifySyncErrorNotifierResult(GoogleServiceAuthError::State error_state,
                                      bool is_signed_in,
-                                     bool is_error) {
+                                     bool is_error,
+                                     bool expected_notification) {
     EXPECT_CALL(*service_, IsFirstSetupComplete())
         .WillRepeatedly(Return(is_signed_in));
 
     GoogleServiceAuthError auth_error(error_state);
     EXPECT_CALL(*service_, GetAuthError()).WillRepeatedly(
         ReturnRef(auth_error));
 
     error_controller_->OnStateChanged(service_.get());
     EXPECT_EQ(is_error, error_controller_->HasError());
 
-    // If there is an error we should see a notification.
     const Notification* notification = notification_ui_manager_->FindById(
         kNotificationId, NotificationUIManager::GetProfileID(profile_));
-    if (is_error) {
+    if (expected_notification) {
       ASSERT_TRUE(notification);
       ASSERT_FALSE(notification->title().empty());
-      ASSERT_FALSE(notification->title().empty());
+      ASSERT_FALSE(notification->message().empty());

[skym, 2017/03/27 20:56:56]

Nice catch

       ASSERT_EQ((size_t)1, notification->buttons().size());
     } else {
       ASSERT_FALSE(notification);
     }
   }
 
 #if defined(OS_WIN)
   std::unique_ptr<display::Screen> test_screen_;
 #endif
   std::unique_ptr<TestingProfileManager> profile_manager_;
@@ skipping 30 matching lines @@
   EXPECT_CALL(*service_, QueryDetailedSyncStatus(_))
               .WillRepeatedly(Return(false));
 
   EXPECT_CALL(*service_, IsPassphraseRequired())
               .WillRepeatedly(Return(true));
   EXPECT_CALL(*service_, IsPassphraseRequiredForDecryption())
               .WillRepeatedly(Return(true));
   {
     SCOPED_TRACE("Expected a notification for passphrase error");
     VerifySyncErrorNotifierResult(GoogleServiceAuthError::NONE,
-                                  true /* signed in */,
-                                  true /* error */);
+                                  true /* signed in */, true /* error */,

[skym, 2017/03/27 20:56:56]

Did you git cl format this?

[pavely, 2017/03/27 21:06:54]

Yeah, I did. The result is worse than before, but if I reverted it git cl format
would do the same thing the next time file is changed.

+                                  true /* expecting notification */);
+  }
+
+  // Sumulate discarded notification and check that notification is not shown.
+  notification_ui_manager_->CancelById(
+      kNotificationId, NotificationUIManager::GetProfileID(profile_));
+  {
+    SCOPED_TRACE("Not expecting notification, one was already discarded");
+    VerifySyncErrorNotifierResult(GoogleServiceAuthError::NONE,
+                                  true /* signed in */, true /* error */,
+                                  false /* not expecting notification */);
   }
 
   // Check that no notification is shown if there is no error.
   EXPECT_CALL(*service_, IsPassphraseRequired())
               .WillRepeatedly(Return(false));
   EXPECT_CALL(*service_, IsPassphraseRequiredForDecryption())
               .WillRepeatedly(Return(false));
   {
     SCOPED_TRACE("Not expecting notification since no error exists");
     VerifySyncErrorNotifierResult(GoogleServiceAuthError::NONE,
-                                  true /* signed in */,
-                                  false /* no error */);
+                                  true /* signed in */, false /* no error */,
+                                  false /* not expecting notification */);
   }
 
   // Check that no notification is shown if sync setup is not completed.
   EXPECT_CALL(*service_, IsPassphraseRequired())
               .WillRepeatedly(Return(true));
   EXPECT_CALL(*service_, IsPassphraseRequiredForDecryption())
               .WillRepeatedly(Return(true));
   {
     SCOPED_TRACE("Not expecting notification since sync setup is incomplete");
     VerifySyncErrorNotifierResult(
         GoogleServiceAuthError::INVALID_GAIA_CREDENTIALS,
-        false /* not signed in */,
-        false /* no error */);
+        false /* not signed in */, false /* no error */,
+        false /* not expecting notification */);
   }
 }
 
 }  // namespace test
 }  // namespace ash