Add scoped_ptr-safe base::Value to Dictionary/List conversion functions.

extensions/common/file_util_unittest.cc

 // Copyright 2013 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 "extensions/common/file_util.h"
 
 #include "base/basictypes.h"
 #include "base/files/file_util.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/json/json_string_value_serializer.h"
 #include "base/path_service.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "extensions/common/constants.h"
 #include "extensions/common/extension.h"
 #include "extensions/common/extension_paths.h"
 #include "extensions/common/manifest.h"
 #include "extensions/common/manifest_constants.h"
 #include "grit/extensions_strings.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "url/gurl.h"
 
 namespace extensions {
 
 namespace {
 
 scoped_refptr<Extension> LoadExtensionManifest(
-    base::DictionaryValue* manifest,
+    const base::DictionaryValue& manifest,
     const base::FilePath& manifest_dir,
     Manifest::Location location,
     int extra_flags,
     std::string* error) {
   scoped_refptr<Extension> extension =
-      Extension::Create(manifest_dir, location, *manifest, extra_flags, error);
+      Extension::Create(manifest_dir, location, manifest, extra_flags, error);
   return extension;
 }
 
 scoped_refptr<Extension> LoadExtensionManifest(
     const std::string& manifest_value,
     const base::FilePath& manifest_dir,
     Manifest::Location location,
     int extra_flags,
     std::string* error) {
   JSONStringValueDeserializer deserializer(manifest_value);
   scoped_ptr<base::Value> result(deserializer.Deserialize(NULL, error));
   if (!result.get())
     return NULL;
   CHECK_EQ(base::Value::TYPE_DICTIONARY, result->GetType());
   return LoadExtensionManifest(
-      static_cast<base::DictionaryValue*>(result.get()),
-      manifest_dir,
-      location,
-      extra_flags,
-      error);
+      *base::DictionaryValue::From(result.Pass()).get(), manifest_dir, location,
+      extra_flags, error);
 }
 
 }  // namespace
 
 typedef testing::Test FileUtilTest;
 
 TEST_F(FileUtilTest, InstallUninstallGarbageCollect) {
   base::ScopedTempDir temp;
   ASSERT_TRUE(temp.CreateUniqueTempDir());
 
@@ skipping 220 matching lines @@
   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);
+      *value.get(), temp.path(), Manifest::UNPACKED, 0, &error);
   ASSERT_TRUE(extension.get()) << error;
 
   EXPECT_FALSE(
       file_util::ValidateExtension(extension.get(), &error, &warnings));
   EXPECT_EQ(
       l10n_util::GetStringFUTF8(IDS_EXTENSION_LOAD_BACKGROUND_SCRIPT_FAILED,
                                 base::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);
+  extension = LoadExtensionManifest(*value.get(), temp.path(),
+                                    Manifest::UNPACKED, 0, &error);
   ASSERT_TRUE(extension.get()) << error;
 
   warnings.clear();
   EXPECT_FALSE(
       file_util::ValidateExtension(extension.get(), &error, &warnings));
   EXPECT_EQ(
       l10n_util::GetStringFUTF8(IDS_EXTENSION_LOAD_BACKGROUND_SCRIPT_FAILED,
                                 base::ASCIIToUTF16("http://google.com/foo.js")),
       error);
   EXPECT_EQ(0U, warnings.size());
@@ skipping 212 matching lines @@
     base::FilePath actual_path =
         extensions::file_util::ExtensionResourceURLToFilePath(url, root_path);
     EXPECT_EQ(expected_path.value(), actual_path.value()) <<
       " For the path " << url;
   }
   // Remove temp files.
   ASSERT_TRUE(base::DeleteFile(root_path, true));
 }
 
 }  // namespace extensions