ProtectorService supports multiple change instances.

chrome/browser/protector/protector_service_browsertest.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 "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/protector/mock_setting_change.h"
 #include "chrome/browser/protector/protector_service.h"
 #include "chrome/browser/protector/protector_service_factory.h"
@@ skipping 15 matching lines @@
 class ProtectorServiceTest : public InProcessBrowserTest {
  public:
   virtual void SetUpOnMainThread() {
     protector_service_ =
         ProtectorServiceFactory::GetForProfile(browser()->profile());
     // ProtectService will own this change instance.
     mock_change_ = new NiceMock<MockSettingChange>();
   }
 
  protected:
-  GlobalError* GetGlobalError() {
-    return protector_service_->error_.get();
+  // Default NULL value for |change| argument means using |mock_change_|.
+

[whywhat, 2012/02/29 18:55:14]

Default arguments are forbidden by the style guide afair. Remove the blank line.

[Ivan Korotkov, 2012/02/29 19:23:44]

Done :((

+  GlobalError* GetGlobalError(BaseSettingChange* change = NULL) {
+    if (!change)
+      change = mock_change_;
+    std::vector<ProtectorService::Item>::iterator item =
+        std::find_if(protector_service_->items_.begin(),
+                     protector_service_->items_.end(),
+                     ProtectorService::MatchItemByChange(change));
+    return item == protector_service_->items_.end() ?
+        NULL : item->error.get();
   }
 
-  void ExpectGlobalErrorActive(bool active) {
-    GlobalError* error =
-        GlobalErrorServiceFactory::GetForProfile(browser()->profile())->
-            GetGlobalErrorByMenuItemCommandID(IDC_SHOW_SETTINGS_CHANGES);
-    EXPECT_EQ(active, error != NULL);
-    EXPECT_EQ(active, GetGlobalError() != NULL);
-    EXPECT_EQ(active, protector_service_->IsShowingChange());
+  // Checks that |protector_service_| has an error instance corresponding to
+  // |change| and that GlobalErrorService knows about it.
+  bool IsGlobalErrorActive(BaseSettingChange* change = NULL) {

[whywhat, 2012/02/29 18:55:14]

Ditto.

[Ivan Korotkov, 2012/02/29 19:23:44]

Done :(((

+    if (!change)
+      change = mock_change_;
+    GlobalError* error = GetGlobalError(change);
+    if (!error)
+      return false;
+    if (!GlobalErrorServiceFactory::GetForProfile(browser()->profile())->
+            GetGlobalErrorByMenuItemCommandID(error->MenuItemCommandID())) {
+      return false;
+    }
+    return protector_service_->IsShowingChange();
   }
 
   ProtectorService* protector_service_;
   MockSettingChange* mock_change_;
 };
 
 IN_PROC_BROWSER_TEST_F(ProtectorServiceTest, ChangeInitError) {
   // Init fails and causes the change to be ignored.
   EXPECT_CALL(*mock_change_, MockInit(browser()->profile())).
       WillOnce(Return(false));
   protector_service_->ShowChange(mock_change_);
-  ExpectGlobalErrorActive(false);
+  EXPECT_FALSE(IsGlobalErrorActive());
   ui_test_utils::RunAllPendingInMessageLoop();
-  ExpectGlobalErrorActive(false);
+  EXPECT_FALSE(IsGlobalErrorActive());
 }
 
 IN_PROC_BROWSER_TEST_F(ProtectorServiceTest, ShowAndDismiss) {
   // Show the change and immediately dismiss it.
   EXPECT_CALL(*mock_change_, MockInit(browser()->profile())).
       WillOnce(Return(true));
   protector_service_->ShowChange(mock_change_);
   ui_test_utils::RunAllPendingInMessageLoop();
-  ExpectGlobalErrorActive(true);
-  protector_service_->DismissChange();
+  EXPECT_TRUE(IsGlobalErrorActive());
+  protector_service_->DismissChange(mock_change_);
   ui_test_utils::RunAllPendingInMessageLoop();
-  ExpectGlobalErrorActive(false);
+  EXPECT_FALSE(IsGlobalErrorActive());
 }
 
 IN_PROC_BROWSER_TEST_F(ProtectorServiceTest, ShowAndApply) {
   // Show the change and apply it.
   EXPECT_CALL(*mock_change_, MockInit(browser()->profile())).
       WillOnce(Return(true));
   protector_service_->ShowChange(mock_change_);
   ui_test_utils::RunAllPendingInMessageLoop();
-  ExpectGlobalErrorActive(true);
+  EXPECT_TRUE(IsGlobalErrorActive());
   EXPECT_CALL(*mock_change_, Apply(browser()));
-  protector_service_->ApplyChange(browser());
+  protector_service_->ApplyChange(mock_change_, browser());
   ui_test_utils::RunAllPendingInMessageLoop();
-  ExpectGlobalErrorActive(false);
+  EXPECT_FALSE(IsGlobalErrorActive());
 }
 
 IN_PROC_BROWSER_TEST_F(ProtectorServiceTest, ShowAndApplyManually) {
   // Show the change and apply it, mimicking a button click.
   EXPECT_CALL(*mock_change_, MockInit(browser()->profile())).
       WillOnce(Return(true));
   protector_service_->ShowChange(mock_change_);
   ui_test_utils::RunAllPendingInMessageLoop();
-  ExpectGlobalErrorActive(true);
+  EXPECT_TRUE(IsGlobalErrorActive());
   EXPECT_CALL(*mock_change_, Apply(browser()));
   // Pressing Cancel applies the change.
   GlobalError* error = GetGlobalError();
+  ASSERT_TRUE(error);
   error->BubbleViewCancelButtonPressed(browser());
   error->GetBubbleView()->CloseBubbleView();
   ui_test_utils::RunAllPendingInMessageLoop();
-  ExpectGlobalErrorActive(false);
+  EXPECT_FALSE(IsGlobalErrorActive());
 }
 
 IN_PROC_BROWSER_TEST_F(ProtectorServiceTest, ShowAndDiscard) {
   // Show the change and discard it.
   EXPECT_CALL(*mock_change_, MockInit(browser()->profile())).
       WillOnce(Return(true));
   protector_service_->ShowChange(mock_change_);
   ui_test_utils::RunAllPendingInMessageLoop();
-  ExpectGlobalErrorActive(true);
+  EXPECT_TRUE(IsGlobalErrorActive());
   EXPECT_CALL(*mock_change_, Discard(browser()));
-  protector_service_->DiscardChange(browser());
+  protector_service_->DiscardChange(mock_change_, browser());
   ui_test_utils::RunAllPendingInMessageLoop();
-  ExpectGlobalErrorActive(false);
+  EXPECT_FALSE(IsGlobalErrorActive());
 }
 
 IN_PROC_BROWSER_TEST_F(ProtectorServiceTest, ShowAndDiscardManually) {
   // Show the change and discard it, mimicking a button click.
   EXPECT_CALL(*mock_change_, MockInit(browser()->profile())).
       WillOnce(Return(true));
   protector_service_->ShowChange(mock_change_);
   ui_test_utils::RunAllPendingInMessageLoop();
-  ExpectGlobalErrorActive(true);
+  EXPECT_TRUE(IsGlobalErrorActive());
   EXPECT_CALL(*mock_change_, Discard(browser()));
   // Pressing Apply discards the change.
   GlobalError* error = GetGlobalError();
+  ASSERT_TRUE(error);
   error->BubbleViewAcceptButtonPressed(browser());
   error->GetBubbleView()->CloseBubbleView();
   ui_test_utils::RunAllPendingInMessageLoop();
-  ExpectGlobalErrorActive(false);
+  EXPECT_FALSE(IsGlobalErrorActive());
 }
 
 IN_PROC_BROWSER_TEST_F(ProtectorServiceTest, BubbleClosedInsideApply) {
   EXPECT_CALL(*mock_change_, MockInit(browser()->profile())).
       WillOnce(Return(true));
   protector_service_->ShowChange(mock_change_);
   ui_test_utils::RunAllPendingInMessageLoop();
-  ExpectGlobalErrorActive(true);
+  EXPECT_TRUE(IsGlobalErrorActive());
 
   GlobalError* error = GetGlobalError();
+  ASSERT_TRUE(error);
   GlobalErrorBubbleViewBase* bubble_view = error->GetBubbleView();
-  EXPECT_TRUE(bubble_view);
+  ASSERT_TRUE(bubble_view);
   EXPECT_CALL(*mock_change_, Apply(browser())).WillOnce(InvokeWithoutArgs(
       bubble_view, &GlobalErrorBubbleViewBase::CloseBubbleView));
 
   // Pressing Cancel applies the change.
   error->BubbleViewCancelButtonPressed(browser());
   ui_test_utils::RunAllPendingInMessageLoop();
-  ExpectGlobalErrorActive(false);
+  EXPECT_FALSE(IsGlobalErrorActive());
+}
+
+IN_PROC_BROWSER_TEST_F(ProtectorServiceTest, ShowMultipleChangesAndApply) {
+  // Show the first change.
+  EXPECT_CALL(*mock_change_, MockInit(browser()->profile())).
+      WillOnce(Return(true));
+  protector_service_->ShowChange(mock_change_);
+  ui_test_utils::RunAllPendingInMessageLoop();
+  EXPECT_TRUE(IsGlobalErrorActive(mock_change_));
+
+  // ProtectService will own this change instance as well.
+  MockSettingChange* mock_change2 = new NiceMock<MockSettingChange>();
+  // Show the second change.
+  EXPECT_CALL(*mock_change2, MockInit(browser()->profile())).
+      WillOnce(Return(true));
+  protector_service_->ShowChange(mock_change2);
+  ui_test_utils::RunAllPendingInMessageLoop();
+  EXPECT_TRUE(IsGlobalErrorActive(mock_change_));
+  EXPECT_TRUE(IsGlobalErrorActive(mock_change2));
+
+  // Apply the first change, the second should still be active.
+  EXPECT_CALL(*mock_change_, Apply(browser()));
+  protector_service_->ApplyChange(mock_change_, browser());
+  ui_test_utils::RunAllPendingInMessageLoop();
+  EXPECT_FALSE(IsGlobalErrorActive(mock_change_));
+  EXPECT_TRUE(IsGlobalErrorActive(mock_change2));
+
+  // Finally apply the second change.
+  EXPECT_CALL(*mock_change2, Apply(browser()));
+  protector_service_->ApplyChange(mock_change2, browser());
+  ui_test_utils::RunAllPendingInMessageLoop();
+  EXPECT_FALSE(IsGlobalErrorActive(mock_change_));
+  EXPECT_FALSE(IsGlobalErrorActive(mock_change2));
+}
+
+IN_PROC_BROWSER_TEST_F(ProtectorServiceTest,
+                       ShowMultipleChangesDismissAndApply) {
+  // Show the first change.
+  EXPECT_CALL(*mock_change_, MockInit(browser()->profile())).
+      WillOnce(Return(true));
+  protector_service_->ShowChange(mock_change_);
+  ui_test_utils::RunAllPendingInMessageLoop();
+  EXPECT_TRUE(IsGlobalErrorActive(mock_change_));
+
+  // ProtectService will own this change instance as well.
+  MockSettingChange* mock_change2 = new NiceMock<MockSettingChange>();
+  // Show the second change.
+  EXPECT_CALL(*mock_change2, MockInit(browser()->profile())).
+      WillOnce(Return(true));
+  protector_service_->ShowChange(mock_change2);
+  ui_test_utils::RunAllPendingInMessageLoop();
+  EXPECT_TRUE(IsGlobalErrorActive(mock_change_));
+  EXPECT_TRUE(IsGlobalErrorActive(mock_change2));
+
+  // Dismiss the first change, the second should still be active.
+  protector_service_->DismissChange(mock_change_);
+  ui_test_utils::RunAllPendingInMessageLoop();
+  EXPECT_FALSE(IsGlobalErrorActive(mock_change_));
+  EXPECT_TRUE(IsGlobalErrorActive(mock_change2));
+
+  // Finally apply the second change.
+  EXPECT_CALL(*mock_change2, Apply(browser()));
+  protector_service_->ApplyChange(mock_change2, browser());
+  ui_test_utils::RunAllPendingInMessageLoop();
+  EXPECT_FALSE(IsGlobalErrorActive(mock_change_));
+  EXPECT_FALSE(IsGlobalErrorActive(mock_change2));
+}
+
+IN_PROC_BROWSER_TEST_F(ProtectorServiceTest,
+                       ShowMultipleChangesAndApplyManually) {
+  // Show the first change.
+  EXPECT_CALL(*mock_change_, MockInit(browser()->profile())).
+      WillOnce(Return(true));
+  protector_service_->ShowChange(mock_change_);
+  ui_test_utils::RunAllPendingInMessageLoop();
+  EXPECT_TRUE(IsGlobalErrorActive(mock_change_));
+
+  // ProtectService will own this change instance as well.
+  MockSettingChange* mock_change2 = new NiceMock<MockSettingChange>();
+  // Show the second change.
+  EXPECT_CALL(*mock_change2, MockInit(browser()->profile())).
+      WillOnce(Return(true));
+  protector_service_->ShowChange(mock_change2);
+  ui_test_utils::RunAllPendingInMessageLoop();
+  EXPECT_TRUE(IsGlobalErrorActive(mock_change_));
+  EXPECT_TRUE(IsGlobalErrorActive(mock_change2));
+
+  // Apply the first change, mimicking a button click; the second should still
+  // be active.
+  EXPECT_CALL(*mock_change_, Apply(browser()));
+  GlobalError* error = GetGlobalError(mock_change_);
+  ASSERT_TRUE(error);
+  error->ShowBubbleView(browser());
+  error->BubbleViewCancelButtonPressed(browser());
+  error->GetBubbleView()->CloseBubbleView();
+  ui_test_utils::RunAllPendingInMessageLoop();
+  EXPECT_FALSE(IsGlobalErrorActive(mock_change_));
+  EXPECT_TRUE(IsGlobalErrorActive(mock_change2));
+
+  // Finally apply the second change.
+  EXPECT_CALL(*mock_change2, Apply(browser()));
+  GlobalError* error2 = GetGlobalError(mock_change2);
+  ASSERT_TRUE(error);
+  error2->ShowBubbleView(browser());
+  error2->BubbleViewCancelButtonPressed(browser());
+  error2->GetBubbleView()->CloseBubbleView();
+  ui_test_utils::RunAllPendingInMessageLoop();
+  EXPECT_FALSE(IsGlobalErrorActive(mock_change_));
+  EXPECT_FALSE(IsGlobalErrorActive(mock_change2));
 }
 
 // TODO(ivankr): Timeout test.
 
 }  // namespace protector