Fix even more remaining uses of WeakPtr<T>'s operator T* conversion

chrome/browser/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/message_loop.h"
 #include "chrome/browser/extensions/extension_action.h"
 #include "chrome/common/extensions/api/extension_action/action_info.h"
 #include "googleurl/src/gurl.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ skipping 27 matching lines @@
   ASSERT_TRUE(action.GetIsVisible(1));
   ASSERT_TRUE(action.GetIsVisible(100));
 
   action.SetAppearance(ExtensionAction::kDefaultTabId,
                        ExtensionAction::INVISIBLE);
   ASSERT_FALSE(action.GetIsVisible(1));
   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))
+  EXPECT_FALSE(action.GetIconAnimation(100).get())
       << "Page actions should not animate.";
 
   action.ClearAllValuesForTab(100);
   ASSERT_FALSE(action.GetIsVisible(1));
   ASSERT_FALSE(action.GetIsVisible(100));
 
   ExtensionAction browser_action(
       std::string(), ActionInfo::TYPE_BROWSER, ActionInfo());
   ASSERT_TRUE(browser_action.GetIsVisible(1));
 }
 
 TEST(ExtensionActionTest, ScriptBadgeAnimation) {
   // Supports the icon animation.
   base::MessageLoop message_loop;
 
   ExtensionAction script_badge(
       std::string(), ActionInfo::TYPE_SCRIPT_BADGE, ActionInfo());
-  EXPECT_FALSE(script_badge.GetIconAnimation(ExtensionAction::kDefaultTabId));
+  EXPECT_FALSE(
+      script_badge.GetIconAnimation(ExtensionAction::kDefaultTabId).get());
   script_badge.SetAppearance(ExtensionAction::kDefaultTabId,
                              ExtensionAction::ACTIVE);
-  EXPECT_FALSE(script_badge.GetIconAnimation(ExtensionAction::kDefaultTabId))
+  EXPECT_FALSE(
+      script_badge.GetIconAnimation(ExtensionAction::kDefaultTabId).get())
       << "Showing the default tab should not animate script badges.";
 
   script_badge.SetAppearance(ExtensionAction::kDefaultTabId,
                              ExtensionAction::INVISIBLE);
-  EXPECT_FALSE(script_badge.GetIconAnimation(1))
+  EXPECT_FALSE(script_badge.GetIconAnimation(1).get())
       << "Making a script badge invisible should not show its animation.";
   script_badge.SetAppearance(1, ExtensionAction::ACTIVE);
-  EXPECT_TRUE(script_badge.GetIconAnimation(1))
+  EXPECT_TRUE(script_badge.GetIconAnimation(1).get())
       << "Making a script badge visible should show its animation.";
 
   script_badge.ClearAllValuesForTab(1);
-  EXPECT_FALSE(script_badge.GetIconAnimation(100));
+  EXPECT_FALSE(script_badge.GetIconAnimation(100).get());
 }
 
 TEST(ExtensionActionTest, GetAttention) {
   // Supports the icon animation.
   scoped_ptr<base::MessageLoop> message_loop(new base::MessageLoop);
 
   ExtensionAction script_badge(
       std::string(), ActionInfo::TYPE_SCRIPT_BADGE, ActionInfo());
   EXPECT_FALSE(script_badge.GetIsVisible(1));
-  EXPECT_FALSE(script_badge.GetIconAnimation(1));
+  EXPECT_FALSE(script_badge.GetIconAnimation(1).get());
   script_badge.SetAppearance(1, ExtensionAction::WANTS_ATTENTION);
   EXPECT_TRUE(script_badge.GetIsVisible(1));
-  EXPECT_TRUE(script_badge.GetIconAnimation(1));
+  EXPECT_TRUE(script_badge.GetIconAnimation(1).get());
 
   // Simulate waiting long enough for the animation to end.
   message_loop.reset();  // Can't have 2 MessageLoops alive at once.
   message_loop.reset(new base::MessageLoop);
-  EXPECT_FALSE(script_badge.GetIconAnimation(1));  // Sanity check.
+  EXPECT_FALSE(script_badge.GetIconAnimation(1).get());  // Sanity check.
 
   script_badge.SetAppearance(1, ExtensionAction::ACTIVE);
-  EXPECT_FALSE(script_badge.GetIconAnimation(1))
+  EXPECT_FALSE(script_badge.GetIconAnimation(1).get())
       << "The animation should not play again if the icon was already visible.";
 }
 
 TEST(ExtensionActionTest, Icon) {
   ActionInfo action_info;
   action_info.default_icon.Add(16, "icon16.png");
   ExtensionAction page_action(
       std::string(), ActionInfo::TYPE_PAGE, action_info);
   ASSERT_TRUE(page_action.default_icon());
   EXPECT_EQ("icon16.png",
@@ skipping 79 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