Cleanup: Remove deprecated base::Value methods from chrome/common. Use base::Value too.

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 361 matching lines @@
     base::FilePath actual_path =
         extension_file_util::ExtensionResourceURLToFilePath(url, root_path);
     EXPECT_EQ(expected_path.value(), actual_path.value()) <<
       " For the path " << url;
   }
   // Remove temp files.
   ASSERT_TRUE(file_util::Delete(root_path, true));
 }
 
 static scoped_refptr<Extension> LoadExtensionManifest(
-    DictionaryValue* manifest,
+    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);
   return extension;
 }
 
 static scoped_refptr<Extension> LoadExtensionManifest(
     const std::string& manifest_value,
     const base::FilePath& manifest_dir,
     Manifest::Location location,
     int extra_flags,
     std::string* error) {
   JSONStringValueSerializer serializer(manifest_value);
-  scoped_ptr<Value> result(serializer.Deserialize(NULL, error));
+  scoped_ptr<base::Value> result(serializer.Deserialize(NULL, error));
   if (!result.get())
     return NULL;
-  CHECK_EQ(Value::TYPE_DICTIONARY, result->GetType());
-  return LoadExtensionManifest(static_cast<DictionaryValue*>(result.get()),
-                               manifest_dir,
-                               location,
-                               extra_flags,
-                               error);
+  CHECK_EQ(base::Value::TYPE_DICTIONARY, result->GetType());
+  return LoadExtensionManifest(
+      static_cast<base::DictionaryValue*>(result.get()),
+      manifest_dir,
+      location,
+      extra_flags,
+      error);
 }
 
 #if defined(OS_WIN)
 // http://crbug.com/108279
 #define ValidateThemeUTF8 DISABLED_ValidateThemeUTF8
 #endif
 TEST_F(ExtensionFileUtilTest, ValidateThemeUTF8) {
   base::ScopedTempDir temp;
   ASSERT_TRUE(temp.CreateUniqueTempDir());
 
@@ skipping 23 matching lines @@
 #if defined(OS_WIN)
 // This test hangs on Windows sometimes. http://crbug.com/110279
 #define MAYBE_BackgroundScriptsMustExist DISABLED_BackgroundScriptsMustExist
 #else
 #define MAYBE_BackgroundScriptsMustExist BackgroundScriptsMustExist
 #endif
 TEST_F(ExtensionFileUtilTest, MAYBE_BackgroundScriptsMustExist) {
   base::ScopedTempDir temp;
   ASSERT_TRUE(temp.CreateUniqueTempDir());
 
-  scoped_ptr<DictionaryValue> value(new DictionaryValue());
+  scoped_ptr<base::DictionaryValue> value(new base::DictionaryValue());
   value->SetString("name", "test");
   value->SetString("version", "1");
   value->SetInteger("manifest_version", 1);
 
-  ListValue* scripts = new ListValue();
-  scripts->Append(Value::CreateStringValue("foo.js"));
+  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::LOAD, 0, &error);
   ASSERT_TRUE(extension.get()) << error;
 
   EXPECT_FALSE(extension_file_util::ValidateExtension(extension,
                                                       &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(Value::CreateStringValue("http://google.com/foo.js"));
+  scripts->Append(new base::StringValue("http://google.com/foo.js"));
 
   extension = LoadExtensionManifest(value.get(), temp.path(), Manifest::LOAD,
                                     0, &error);
   ASSERT_TRUE(extension.get()) << error;
 
   warnings.clear();
   EXPECT_FALSE(extension_file_util::ValidateExtension(extension,
                                                       &error, &warnings));
   EXPECT_EQ(l10n_util::GetStringFUTF8(
       IDS_EXTENSION_LOAD_BACKGROUND_SCRIPT_FAILED,
@@ skipping 129 matching lines @@
   scoped_refptr<Extension> extension3(extension_file_util::LoadExtension(
       ext_dir, Manifest::LOAD, Extension::NO_FLAGS, &error));
   ASSERT_TRUE(extension3 == NULL);
   ASSERT_STREQ("Could not load icon 'icon.png' for page action.",
       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.