Update chrome/ to use scoped_refptr<T>::get() rather than implicit "operator T*"

chrome/browser/extensions/extension_info_map_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/json/json_file_value_serializer.h"
 #include "base/message_loop.h"
 #include "base/path_service.h"
 #include "chrome/browser/extensions/extension_info_map.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/extensions/extension.h"
@@ skipping 36 matching lines @@
 #endif
 
   DictionaryValue manifest;
   manifest.SetString(keys::kVersion, "1.0.0.0");
   manifest.SetString(keys::kName, name);
 
   std::string error;
   scoped_refptr<Extension> extension = Extension::Create(
       path.AppendASCII(name), Manifest::INVALID_LOCATION, manifest,
       Extension::NO_FLAGS, &error);
-  EXPECT_TRUE(extension) << error;
+  EXPECT_TRUE(extension.get()) << error;
 
   return extension;
 }
 
 static scoped_refptr<Extension> LoadManifest(const std::string& dir,
                                              const std::string& test_file) {
   base::FilePath path;
   PathService::Get(chrome::DIR_TEST_DATA, &path);
   path = path.AppendASCII("extensions")
              .AppendASCII(dir)
              .AppendASCII(test_file);
 
   JSONFileValueSerializer serializer(path);
   scoped_ptr<Value> result(serializer.Deserialize(NULL, NULL));
   if (!result)
     return NULL;
 
   std::string error;
   scoped_refptr<Extension> extension = Extension::Create(
       path, Manifest::INVALID_LOCATION,
       *static_cast<DictionaryValue*>(result.get()),
       Extension::NO_FLAGS, &error);
-  EXPECT_TRUE(extension) << error;
+  EXPECT_TRUE(extension.get()) << error;
 
   return extension;
 }
 
 // Test that the ExtensionInfoMap handles refcounting properly.
 TEST_F(ExtensionInfoMapTest, RefCounting) {
   scoped_refptr<ExtensionInfoMap> info_map(new ExtensionInfoMap());
 
   // New extensions should have a single reference holding onto them.
   scoped_refptr<Extension> extension1(CreateExtension("extension1"));
   scoped_refptr<Extension> extension2(CreateExtension("extension2"));
   scoped_refptr<Extension> extension3(CreateExtension("extension3"));
   EXPECT_TRUE(extension1->HasOneRef());
   EXPECT_TRUE(extension2->HasOneRef());
   EXPECT_TRUE(extension3->HasOneRef());
 
   // Add a ref to each extension and give it to the info map.
-  info_map->AddExtension(extension1, base::Time(), false);
-  info_map->AddExtension(extension2, base::Time(), false);
-  info_map->AddExtension(extension3, base::Time(), false);
+  info_map->AddExtension(extension1.get(), base::Time(), false);
+  info_map->AddExtension(extension2.get(), base::Time(), false);
+  info_map->AddExtension(extension3.get(), base::Time(), false);
 
   // Release extension1, and the info map should have the only ref.
-  const Extension* weak_extension1 = extension1;
+  const Extension* weak_extension1 = extension1.get();
   extension1 = NULL;
   EXPECT_TRUE(weak_extension1->HasOneRef());
 
   // Remove extension2, and the extension2 object should have the only ref.
   info_map->RemoveExtension(
       extension2->id(), extension_misc::UNLOAD_REASON_UNINSTALL);
   EXPECT_TRUE(extension2->HasOneRef());
 
   // Delete the info map, and the extension3 object should have the only ref.
   info_map = NULL;
   EXPECT_TRUE(extension3->HasOneRef());
 }
 
 // Tests that we can query a few extension properties from the ExtensionInfoMap.
 TEST_F(ExtensionInfoMapTest, Properties) {
   scoped_refptr<ExtensionInfoMap> info_map(new ExtensionInfoMap());
 
   scoped_refptr<Extension> extension1(CreateExtension("extension1"));
   scoped_refptr<Extension> extension2(CreateExtension("extension2"));
 
-  info_map->AddExtension(extension1, base::Time(), false);
-  info_map->AddExtension(extension2, base::Time(), false);
+  info_map->AddExtension(extension1.get(), base::Time(), false);
+  info_map->AddExtension(extension2.get(), base::Time(), false);
 
   EXPECT_EQ(2u, info_map->extensions().size());
   EXPECT_EQ(extension1.get(), info_map->extensions().GetByID(extension1->id()));
   EXPECT_EQ(extension2.get(), info_map->extensions().GetByID(extension2->id()));
 }
 
 // Tests CheckURLAccessToExtensionPermission given both extension and app URLs.
 TEST_F(ExtensionInfoMapTest, CheckPermissions) {
   scoped_refptr<ExtensionInfoMap> info_map(new ExtensionInfoMap());
 
   scoped_refptr<Extension> app(LoadManifest("manifest_tests",
                                             "valid_app.json"));
   scoped_refptr<Extension> extension(LoadManifest("manifest_tests",
                                                   "tabs_extension.json"));
 
   GURL app_url("http://www.google.com/mail/foo.html");
   WebSecurityOrigin app_origin = WebSecurityOrigin::create(
       GURL("http://www.google.com/mail/foo.html"));
   ASSERT_TRUE(app->is_app());
   ASSERT_TRUE(app->web_extent().MatchesURL(app_url));
 
-  info_map->AddExtension(app, base::Time(), false);
-  info_map->AddExtension(extension, base::Time(), false);
+  info_map->AddExtension(app.get(), base::Time(), false);
+  info_map->AddExtension(extension.get(), base::Time(), false);
 
   // The app should have the notifications permission, either from a
   // chrome-extension URL or from its web extent.
   const Extension* match = info_map->extensions().GetExtensionOrAppByURL(
       ExtensionURLInfo(app_origin, app->GetResourceURL("a.html")));
   EXPECT_TRUE(match &&
       match->HasAPIPermission(APIPermission::kNotification));
   match = info_map->extensions().GetExtensionOrAppByURL(
       ExtensionURLInfo(app_origin, app_url));
   EXPECT_TRUE(match &&
@@ skipping 16 matching lines @@
   EXPECT_FALSE(match);
 
   // Sandboxed origins should not have any permissions.
   match = info_map->extensions().GetExtensionOrAppByURL(ExtensionURLInfo(
       WebSecurityOrigin::createFromString(WebString::fromUTF8("null")),
       app_url));
   EXPECT_FALSE(match);
 }
 
 }  // namespace