Move a line within the M22 branch that had been deleted from trunk before I

chrome/common/extensions/extension_action_unittest.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/file_path.h"
 #include "base/file_util.h"
 #include "base/message_loop.h"
 #include "base/path_service.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/extensions/extension_action.h"
@@ skipping 113 matching lines @@
   ASSERT_FALSE(action.GetIsVisible(100));
   action.SetAppearance(100, ExtensionAction::ACTIVE);
   ASSERT_FALSE(action.GetIsVisible(1));
   ASSERT_TRUE(action.GetIsVisible(100));
   EXPECT_FALSE(action.GetIconAnimation(100))
       << "Page actions should not animate.";
 
   action.ClearAllValuesForTab(100);
   ASSERT_FALSE(action.GetIsVisible(1));
   ASSERT_FALSE(action.GetIsVisible(100));
-
-  message_loop.RunAllPending();
 }
 
 TEST_F(ExtensionActionTest, ScriptBadgeAnimation) {
   // Supports the icon animation.
   MessageLoop message_loop;
 
   ExtensionAction script_badge("", ExtensionAction::TYPE_SCRIPT_BADGE);
   EXPECT_FALSE(script_badge.GetIconAnimation(ExtensionAction::kDefaultTabId));
   script_badge.SetAppearance(ExtensionAction::kDefaultTabId,
                              ExtensionAction::ACTIVE);
   EXPECT_FALSE(script_badge.GetIconAnimation(ExtensionAction::kDefaultTabId))
       << "Showing the default tab should not animate script badges.";
 
   script_badge.SetAppearance(ExtensionAction::kDefaultTabId,
                              ExtensionAction::INVISIBLE);
   EXPECT_FALSE(script_badge.GetIconAnimation(1))
       << "Making a script badge invisible should not show its animation.";
   script_badge.SetAppearance(1, ExtensionAction::ACTIVE);
   EXPECT_TRUE(script_badge.GetIconAnimation(1))
       << "Making a script badge visible should show its animation.";
 
   script_badge.ClearAllValuesForTab(1);
   EXPECT_FALSE(script_badge.GetIconAnimation(100));
+
+  message_loop.RunAllPending();
 }
 
 TEST_F(ExtensionActionTest, GetAttention) {
   // Supports the icon animation.
   MessageLoop message_loop;
 
   ExtensionAction script_badge("", ExtensionAction::TYPE_SCRIPT_BADGE);
   EXPECT_FALSE(script_badge.GetIsVisible(1));
   EXPECT_FALSE(script_badge.GetIconAnimation(1));
   script_badge.SetAppearance(1, ExtensionAction::WANTS_ATTENTION);
@@ skipping 77 matching lines @@
   action.SetPopupUrl(ExtensionAction::kDefaultTabId, url_baz);
   ASSERT_EQ(url_baz, action.GetPopupUrl(1));
   ASSERT_EQ(url_bar, action.GetPopupUrl(100));
 
   action.ClearAllValuesForTab(100);
   ASSERT_EQ(url_baz, action.GetPopupUrl(1));
   ASSERT_EQ(url_baz, action.GetPopupUrl(100));
 }
 
 }  // namespace