| Index: chrome/browser/extensions/extension_action_manager_unittest.cc
|
| diff --git a/chrome/browser/extensions/extension_action_manager_unittest.cc b/chrome/browser/extensions/extension_action_manager_unittest.cc
|
| index d77ca8d59d88d23a6b2524656c1e541581389fad..224012504e508064c88cc9595928df4cbbf51649 100644
|
| --- a/chrome/browser/extensions/extension_action_manager_unittest.cc
|
| +++ b/chrome/browser/extensions/extension_action_manager_unittest.cc
|
| @@ -121,11 +121,11 @@ void ExtensionActionManagerTest::TestPopulateMissingValues(
|
| action_type);
|
|
|
| ASSERT_TRUE(extension.get());
|
| - const ExtensionAction* action = GetAction(action_type, *extension);
|
| + const ExtensionAction* action = GetAction(action_type, *extension.get());
|
| ASSERT_TRUE(action);
|
|
|
| - ASSERT_TRUE(TitlesMatch(*extension, *action));
|
| - ASSERT_TRUE(IconsMatch(*extension, 128, *action, 38));
|
| + ASSERT_TRUE(TitlesMatch(*extension.get(), *action));
|
| + ASSERT_TRUE(IconsMatch(*extension.get(), 128, *action, 38));
|
|
|
| // Test that the action's missing default_icons are not replaced with smaller
|
| // icons.
|
| @@ -135,11 +135,11 @@ void ExtensionActionManagerTest::TestPopulateMissingValues(
|
| action_type);
|
|
|
| ASSERT_TRUE(extension.get());
|
| - action = GetAction(action_type, *extension);
|
| + action = GetAction(action_type, *extension.get());
|
| ASSERT_TRUE(action);
|
|
|
| - ASSERT_TRUE(IconsMatch(*extension, 24, *action, 19));
|
| - ASSERT_FALSE(IconsMatch(*extension, 24, *action, 38));
|
| + ASSERT_TRUE(IconsMatch(*extension.get(), 24, *action, 19));
|
| + ASSERT_FALSE(IconsMatch(*extension.get(), 24, *action, 38));
|
|
|
| // Test that an action's 19px icon is not replaced if a 38px action icon
|
| // exists.
|
| @@ -150,10 +150,10 @@ void ExtensionActionManagerTest::TestPopulateMissingValues(
|
| action_type);
|
|
|
| ASSERT_TRUE(extension.get());
|
| - action = GetAction(action_type, *extension);
|
| + action = GetAction(action_type, *extension.get());
|
| ASSERT_TRUE(action);
|
|
|
| - ASSERT_FALSE(IconsMatch(*extension, 128, *action, 19));
|
| + ASSERT_FALSE(IconsMatch(*extension.get(), 128, *action, 19));
|
|
|
| // Test that existing default_icons and default_title are not replaced.
|
| extension = BuildExtension(
|
| @@ -165,12 +165,12 @@ void ExtensionActionManagerTest::TestPopulateMissingValues(
|
| action_type);
|
|
|
| ASSERT_TRUE(extension.get());
|
| - action = GetAction(action_type, *extension);
|
| + action = GetAction(action_type, *extension.get());
|
| ASSERT_TRUE(action);
|
|
|
| - ASSERT_FALSE(TitlesMatch(*extension, *action));
|
| - ASSERT_FALSE(IconsMatch(*extension, 128, *action, 19));
|
| - ASSERT_FALSE(IconsMatch(*extension, 128, *action, 38));
|
| + ASSERT_FALSE(TitlesMatch(*extension.get(), *action));
|
| + ASSERT_FALSE(IconsMatch(*extension.get(), 128, *action, 19));
|
| + ASSERT_FALSE(IconsMatch(*extension.get(), 128, *action, 38));
|
| }
|
|
|
| namespace {
|
| @@ -195,7 +195,7 @@ TEST_F(ExtensionActionManagerTest, GetBestFitActionTest) {
|
|
|
| // Get a "best fit" browser action for |extension|.
|
| scoped_ptr<ExtensionAction> action =
|
| - manager()->GetBestFitAction(*extension, ActionInfo::TYPE_BROWSER);
|
| + manager()->GetBestFitAction(*extension.get(), ActionInfo::TYPE_BROWSER);
|
| ASSERT_TRUE(action.get());
|
| ASSERT_EQ(action->action_type(), ActionInfo::TYPE_BROWSER);
|
|
|
| @@ -211,12 +211,13 @@ TEST_F(ExtensionActionManagerTest, GetBestFitActionTest) {
|
| kPageAction);
|
| ASSERT_TRUE(extension.get());
|
|
|
| - action = manager()->GetBestFitAction(*extension, ActionInfo::TYPE_BROWSER);
|
| + action =
|
| + manager()->GetBestFitAction(*extension.get(), ActionInfo::TYPE_BROWSER);
|
|
|
| // Now these values match because |extension| does not have page action
|
| // defaults.
|
| - ASSERT_TRUE(TitlesMatch(*extension, *action));
|
| - ASSERT_TRUE(IconsMatch(*extension, 48, *action, 38));
|
| + ASSERT_TRUE(TitlesMatch(*extension.get(), *action));
|
| + ASSERT_TRUE(IconsMatch(*extension.get(), 48, *action, 38));
|
| }
|
|
|
| } // namespace
|
|
|