Extensions-related fixups for scoped_refptr conversion operator removal.

chrome/browser/extensions/extension_toolbar_model_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 "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/extensions/api/extension_action/extension_action_api.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_service_test_base.h"
@@ skipping 101 matching lines @@
 }  // namespace
 
 class ExtensionToolbarModelUnitTest : public ExtensionServiceTestBase {
  protected:
   // Initialize the ExtensionService, ExtensionToolbarModel, and
   // ExtensionSystem.
   void Init();
 
   // Adds or removes the given |extension| and verify success.
   testing::AssertionResult AddExtension(
-      scoped_refptr<const Extension> extension) WARN_UNUSED_RESULT;
+      const scoped_refptr<const Extension>& extension) WARN_UNUSED_RESULT;
   testing::AssertionResult RemoveExtension(
-      scoped_refptr<const Extension> extension) WARN_UNUSED_RESULT;
+      const scoped_refptr<const Extension>& extension) WARN_UNUSED_RESULT;
 
   // Adds three extensions, all with browser actions.
   testing::AssertionResult AddBrowserActionExtensions() WARN_UNUSED_RESULT;
 
   // Adds three extensions, one each for browser action, page action, and no
   // action, and are added in that order.
   testing::AssertionResult AddActionExtensions() WARN_UNUSED_RESULT;
 
   // Returns the extension at the given index in the toolbar model, or NULL
   // if one does not exist.
   const Extension* GetExtensionAtIndex(size_t index) const;
 
   ExtensionToolbarModel* toolbar_model() { return toolbar_model_.get(); }
 
   const ExtensionToolbarModelTestObserver* observer() const {
     return model_observer_.get();
   }
   size_t num_toolbar_items() const {
     return toolbar_model_->toolbar_items().size();
   }
-  const Extension* browser_action_a() const {
-    return browser_action_a_;
-  }
-  const Extension* browser_action_b() const {
-    return browser_action_b_;
-  }
-  const Extension* browser_action_c() const {
-    return browser_action_c_;
-  }
+  const Extension* browser_action_a() const { return browser_action_a_.get(); }
+  const Extension* browser_action_b() const { return browser_action_b_.get(); }
+  const Extension* browser_action_c() const { return browser_action_c_.get(); }
   const Extension* browser_action() const {
     return browser_action_extension_.get();
   }
   const Extension* page_action() const { return page_action_extension_.get(); }
   const Extension* no_action() const { return no_action_extension_.get(); }
 
  private:
   // Verifies that all extensions in |extensions| are added successfully.
   testing::AssertionResult AddAndVerifyExtensions(
       const ExtensionList& extensions);
@@ skipping 22 matching lines @@
       new ExtensionToolbarModel(profile(), ExtensionPrefs::Get(profile())));
   model_observer_.reset(
       new ExtensionToolbarModelTestObserver(toolbar_model_.get()));
   static_cast<TestExtensionSystem*>(ExtensionSystem::Get(profile()))->
       SetReady();
   // Run tasks posted to TestExtensionSystem.
   base::RunLoop().RunUntilIdle();
 }
 
 testing::AssertionResult ExtensionToolbarModelUnitTest::AddExtension(
-    scoped_refptr<const Extension> extension) {
+    const scoped_refptr<const Extension>& extension) {
   if (registry()->enabled_extensions().GetByID(extension->id())) {
     return testing::AssertionFailure() << "Extension " << extension->name() <<
         " already installed!";
   }
-  service()->AddExtension(extension);
+  service()->AddExtension(extension.get());
   if (!registry()->enabled_extensions().GetByID(extension->id())) {
     return testing::AssertionFailure() << "Failed to install extension: " <<
         extension->name();
   }
   return testing::AssertionSuccess();
 }
 
 testing::AssertionResult ExtensionToolbarModelUnitTest::RemoveExtension(
-    scoped_refptr<const Extension> extension) {
+    const scoped_refptr<const Extension>& extension) {
   if (!registry()->enabled_extensions().GetByID(extension->id())) {
     return testing::AssertionFailure() << "Extension " << extension->name() <<
         " not installed!";
   }
   service()->UnloadExtension(extension->id(),
                              UnloadedExtensionInfo::REASON_DISABLE);
   if (registry()->enabled_extensions().GetByID(extension->id())) {
     return testing::AssertionFailure() << "Failed to unload extension: " <<
         extension->name();
   }
@@ skipping 27 matching lines @@
   ExtensionList extensions;
   extensions.push_back(browser_action_a_);
   extensions.push_back(browser_action_b_);
   extensions.push_back(browser_action_c_);
 
   return AddAndVerifyExtensions(extensions);
 }
 
 const Extension* ExtensionToolbarModelUnitTest::GetExtensionAtIndex(
     size_t index) const {
-  return index < toolbar_model_->toolbar_items().size() ?
-      toolbar_model_->toolbar_items()[index] : NULL;
+  return index < toolbar_model_->toolbar_items().size()
+             ? toolbar_model_->toolbar_items()[index].get()
+             : NULL;
 }
 
 testing::AssertionResult ExtensionToolbarModelUnitTest::AddAndVerifyExtensions(
     const ExtensionList& extensions) {
   for (ExtensionList::const_iterator iter = extensions.begin();
        iter != extensions.end(); ++iter) {
     if (!AddExtension(*iter)) {
       return testing::AssertionFailure() << "Failed to install extension: " <<
           (*iter)->name();
     }
@@ skipping 19 matching lines @@
   scoped_refptr<const Extension> extension2 =
       GetActionExtension("browser_action", manifest_keys::kBrowserAction);
   ASSERT_TRUE(AddExtension(extension2));
 
   // We should now find our extension in the model.
   EXPECT_EQ(1u, observer()->inserted_count());
   EXPECT_EQ(1u, num_toolbar_items());
   EXPECT_EQ(extension2, GetExtensionAtIndex(0u));
 
   // Should be a no-op, but still fires the events.
-  toolbar_model()->MoveExtensionIcon(extension2, 0);
+  toolbar_model()->MoveExtensionIcon(extension2.get(), 0);
   EXPECT_EQ(1u, observer()->moved_count());
   EXPECT_EQ(1u, num_toolbar_items());
   EXPECT_EQ(extension2, GetExtensionAtIndex(0u));
 
   // Remove the extension and verify.
   ASSERT_TRUE(RemoveExtension(extension2));
   EXPECT_EQ(1u, observer()->removed_count());
   EXPECT_EQ(0u, num_toolbar_items());
   EXPECT_EQ(NULL, GetExtensionAtIndex(0u));
 }
@@ skipping 501 matching lines @@
   ExtensionActionAPI::SetBrowserActionVisibility(
       prefs, extension_b->id(), true);
   EXPECT_EQ(3u, num_toolbar_items());
   EXPECT_EQ(-1, toolbar_model()->GetVisibleIconCount());  // -1 = 'all'
   EXPECT_EQ(extension_c, GetExtensionAtIndex(0u));
   EXPECT_EQ(extension_a, GetExtensionAtIndex(1u));
   EXPECT_EQ(extension_b, GetExtensionAtIndex(2u));
 }
 
 }  // namespace extensions