Random fixes through Chrome for scoped_reftpr T* 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 275 matching lines @@
   EXPECT_EQ(NULL, GetExtensionAtIndex(0u));
 
   // Load an extension with a browser action.
   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));
+  EXPECT_EQ(extension2.get(), GetExtensionAtIndex(0u));
 
   // Should be a no-op, but still fires the events.
   toolbar_model()->MoveExtensionIcon(extension2.get(), 0);
   EXPECT_EQ(1u, observer()->moved_count());
   EXPECT_EQ(1u, num_toolbar_items());
-  EXPECT_EQ(extension2, GetExtensionAtIndex(0u));
+  EXPECT_EQ(extension2.get(), 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));
 }
 
 // Test various different reorderings, removals, and reinsertions.
 TEST_F(ExtensionToolbarModelUnitTest, ExtensionToolbarReorderAndReinsert) {
@@ skipping 498 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