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

chrome/common/extensions/extension_file_util_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 "chrome/common/extensions/extension_file_util.h"
 
 #include "base/file_util.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/json/json_string_value_serializer.h"
 #include "base/path_service.h"
@@ skipping 96 matching lines @@
   ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &install_dir));
   install_dir = install_dir.AppendASCII("extensions")
       .AppendASCII("good")
       .AppendASCII("Extensions")
       .AppendASCII("behllobkkfkfnphdnhnkndlbkcpglgmj")
       .AppendASCII("1.0.0.0");
 
   std::string error;
   scoped_refptr<Extension> extension(extension_file_util::LoadExtension(
       install_dir, Manifest::UNPACKED, Extension::NO_FLAGS, &error));
-  ASSERT_TRUE(extension != NULL);
+  ASSERT_TRUE(extension.get() != NULL);
   EXPECT_EQ("The first extension that I made.", extension->description());
 }
 
 TEST_F(ExtensionFileUtilTest, LoadExtensionWithoutLocalesFolder) {
   base::FilePath install_dir;
   ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &install_dir));
   install_dir = install_dir.AppendASCII("extensions")
       .AppendASCII("good")
       .AppendASCII("Extensions")
       .AppendASCII("bjafgdebaacbbbecmhlhpofkepfkgcpa")
       .AppendASCII("1.0");
 
   std::string error;
   scoped_refptr<Extension> extension(extension_file_util::LoadExtension(
       install_dir, Manifest::UNPACKED, Extension::NO_FLAGS, &error));
-  ASSERT_FALSE(extension == NULL);
+  ASSERT_FALSE(extension.get() == NULL);
   EXPECT_TRUE(error.empty());
 }
 
 TEST_F(ExtensionFileUtilTest, CheckIllegalFilenamesNoUnderscores) {
   base::ScopedTempDir temp;
   ASSERT_TRUE(temp.CreateUniqueTempDir());
 
   base::FilePath src_path = temp.path().AppendASCII("some_dir");
   ASSERT_TRUE(file_util::CreateDirectory(src_path));
 
@@ skipping 43 matching lines @@
   ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &install_dir));
   install_dir = install_dir.AppendASCII("extensions")
       .AppendASCII("bad")
       .AppendASCII("Extensions")
       .AppendASCII("dddddddddddddddddddddddddddddddd")
       .AppendASCII("1.0");
 
   std::string error;
   scoped_refptr<Extension> extension(extension_file_util::LoadExtension(
       install_dir, Manifest::UNPACKED, Extension::NO_FLAGS, &error));
-  ASSERT_TRUE(extension == NULL);
+  ASSERT_TRUE(extension.get() == NULL);
   ASSERT_FALSE(error.empty());
   ASSERT_STREQ("Manifest file is missing or unreadable.", error.c_str());
 }
 
 TEST_F(ExtensionFileUtilTest, LoadExtensionGivesHelpfullErrorOnBadManifest) {
   base::FilePath install_dir;
   ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &install_dir));
   install_dir = install_dir.AppendASCII("extensions")
       .AppendASCII("bad")
       .AppendASCII("Extensions")
       .AppendASCII("eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee")
       .AppendASCII("1.0");
 
   std::string error;
   scoped_refptr<Extension> extension(extension_file_util::LoadExtension(
       install_dir, Manifest::UNPACKED, Extension::NO_FLAGS, &error));
-  ASSERT_TRUE(extension == NULL);
+  ASSERT_TRUE(extension.get() == NULL);
   ASSERT_FALSE(error.empty());
   ASSERT_STREQ("Manifest is not valid JSON.  "
                "Line: 2, column: 16, Syntax error.", error.c_str());
 }
 
 TEST_F(ExtensionFileUtilTest, FailLoadingNonUTF8Scripts) {
   base::FilePath install_dir;
   ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &install_dir));
   install_dir = install_dir.AppendASCII("extensions")
       .AppendASCII("bad")
       .AppendASCII("bad_encoding");
 
   std::string error;
   scoped_refptr<Extension> extension(extension_file_util::LoadExtension(
       install_dir, Manifest::UNPACKED, Extension::NO_FLAGS, &error));
-  ASSERT_TRUE(extension == NULL);
+  ASSERT_TRUE(extension.get() == NULL);
   ASSERT_STREQ("Could not load file 'bad_encoding.js' for content script. "
-               "It isn't UTF-8 encoded.", error.c_str());
+               "It isn't UTF-8 encoded.",
+               error.c_str());
 }
 
 TEST_F(ExtensionFileUtilTest, ExtensionURLToRelativeFilePath) {
 #define URL_PREFIX "chrome-extension://extension-id/"
   struct TestCase {
     const char* url;
     const char* expected_relative_path;
   } test_cases[] = {
     { URL_PREFIX "simple.html",
       "simple.html" },
@@ skipping 142 matching lines @@
       base::StringPrintf(
           "{ \"name\": \"Test\", \"version\": \"1.0\", "
           "  \"theme\": { \"images\": { \"theme_frame\": \"%s\" } }"
           "}", non_ascii_file.c_str());
   std::string error;
   scoped_refptr<Extension> extension = LoadExtensionManifest(
       kManifest, temp.path(), Manifest::UNPACKED, 0, &error);
   ASSERT_TRUE(extension.get()) << error;
 
   std::vector<extensions::InstallWarning> warnings;
-  EXPECT_TRUE(extension_file_util::ValidateExtension(extension,
-                                                     &error, &warnings)) <<
-      error;
+  EXPECT_TRUE(extension_file_util::ValidateExtension(
+      extension.get(), &error, &warnings)) << error;
   EXPECT_EQ(0U, warnings.size());
 }
 
 TEST_F(ExtensionFileUtilTest, BackgroundScriptsMustExist) {
   base::ScopedTempDir temp;
   ASSERT_TRUE(temp.CreateUniqueTempDir());
 
   scoped_ptr<base::DictionaryValue> value(new base::DictionaryValue());
   value->SetString("name", "test");
   value->SetString("version", "1");
   value->SetInteger("manifest_version", 1);
 
   base::ListValue* scripts = new base::ListValue();
   scripts->Append(new base::StringValue("foo.js"));
   value->Set("background.scripts", scripts);
 
   std::string error;
   std::vector<extensions::InstallWarning> warnings;
   scoped_refptr<Extension> extension = LoadExtensionManifest(
       value.get(), temp.path(), Manifest::UNPACKED, 0, &error);
   ASSERT_TRUE(extension.get()) << error;
 
-  EXPECT_FALSE(extension_file_util::ValidateExtension(extension,
-                                                      &error, &warnings));
+  EXPECT_FALSE(extension_file_util::ValidateExtension(
+      extension.get(), &error, &warnings));
   EXPECT_EQ(l10n_util::GetStringFUTF8(
       IDS_EXTENSION_LOAD_BACKGROUND_SCRIPT_FAILED, ASCIIToUTF16("foo.js")),
            error);
   EXPECT_EQ(0U, warnings.size());
 
   scripts->Clear();
   scripts->Append(new base::StringValue("http://google.com/foo.js"));
 
   extension = LoadExtensionManifest(value.get(), temp.path(),
                                     Manifest::UNPACKED, 0, &error);
   ASSERT_TRUE(extension.get()) << error;
 
   warnings.clear();
-  EXPECT_FALSE(extension_file_util::ValidateExtension(extension,
-                                                      &error, &warnings));
+  EXPECT_FALSE(extension_file_util::ValidateExtension(
+      extension.get(), &error, &warnings));
   EXPECT_EQ(l10n_util::GetStringFUTF8(
       IDS_EXTENSION_LOAD_BACKGROUND_SCRIPT_FAILED,
       ASCIIToUTF16("http://google.com/foo.js")),
            error);
   EXPECT_EQ(0U, warnings.size());
 }
 
 // Private key, generated by Chrome specifically for this test, and
 // never used elsewhere.
 const char private_key[] =
@@ skipping 89 matching lines @@
 
   // Try to install an extension with a zero-length icon file.
   base::FilePath ext_dir = install_dir.AppendASCII("extensions")
       .AppendASCII("bad")
       .AppendASCII("Extensions")
       .AppendASCII("ffffffffffffffffffffffffffffffff");
 
   std::string error;
   scoped_refptr<Extension> extension(extension_file_util::LoadExtension(
       ext_dir, Manifest::UNPACKED, Extension::NO_FLAGS, &error));
-  EXPECT_TRUE(extension == NULL);
-  EXPECT_STREQ("Could not load extension icon 'icon.png'.",
-      error.c_str());
+  EXPECT_TRUE(extension.get() == NULL);
+  EXPECT_STREQ("Could not load extension icon 'icon.png'.", error.c_str());
 
   // Try to install an extension with a zero-length browser action icon file.
   ext_dir = install_dir.AppendASCII("extensions")
       .AppendASCII("bad")
       .AppendASCII("Extensions")
       .AppendASCII("gggggggggggggggggggggggggggggggg");
 
   scoped_refptr<Extension> extension2(extension_file_util::LoadExtension(
       ext_dir, Manifest::UNPACKED, Extension::NO_FLAGS, &error));
-  EXPECT_TRUE(extension2 == NULL);
+  EXPECT_TRUE(extension2.get() == NULL);
   EXPECT_STREQ("Could not load icon 'icon.png' for browser action.",
-      error.c_str());
+               error.c_str());
 
   // Try to install an extension with a zero-length page action icon file.
   ext_dir = install_dir.AppendASCII("extensions")
       .AppendASCII("bad")
       .AppendASCII("Extensions")
       .AppendASCII("hhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhh");
 
   scoped_refptr<Extension> extension3(extension_file_util::LoadExtension(
       ext_dir, Manifest::UNPACKED, Extension::NO_FLAGS, &error));
-  EXPECT_TRUE(extension3 == NULL);
+  EXPECT_TRUE(extension3.get() == NULL);
   EXPECT_STREQ("Could not load icon 'icon.png' for page action.",
-      error.c_str());
+               error.c_str());
 }
 
 // TODO(aa): More tests as motivation allows. Maybe steal some from
 // ExtensionService? Many of them could probably be tested here without the
 // MessageLoop shenanigans.