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

chrome/common/extensions/features/base_feature_provider_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/features/base_feature_provider.h"
 
 #include "chrome/common/extensions/value_builder.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using chrome::VersionInfo;
@@ skipping 13 matching lines @@
   ASSERT_TRUE(feature);
   EXPECT_EQ(5u, feature->extension_types()->size());
   EXPECT_EQ(1u, feature->extension_types()->count(Manifest::TYPE_EXTENSION));
   EXPECT_EQ(1u,
       feature->extension_types()->count(Manifest::TYPE_LEGACY_PACKAGED_APP));
   EXPECT_EQ(1u,
             feature->extension_types()->count(Manifest::TYPE_PLATFORM_APP));
   EXPECT_EQ(1u, feature->extension_types()->count(Manifest::TYPE_HOSTED_APP));
   EXPECT_EQ(1u, feature->extension_types()->count(Manifest::TYPE_THEME));
 
-  DictionaryValue manifest;
+  base::DictionaryValue manifest;
   manifest.SetString("name", "test extension");
   manifest.SetString("version", "1");
   manifest.SetString("description", "hello there");
 
   std::string error;
   scoped_refptr<const Extension> extension(Extension::Create(
       base::FilePath(), Manifest::INTERNAL, manifest, Extension::NO_FLAGS,
       &error));
 
   ASSERT_TRUE(extension.get());
@@ skipping 19 matching lines @@
   SimpleFeature* feature =
       static_cast<SimpleFeature*>(provider->GetFeature("contextMenus"));
   ASSERT_TRUE(feature);
   EXPECT_EQ(3u, feature->extension_types()->size());
   EXPECT_EQ(1u, feature->extension_types()->count(Manifest::TYPE_EXTENSION));
   EXPECT_EQ(1u,
       feature->extension_types()->count(Manifest::TYPE_LEGACY_PACKAGED_APP));
   EXPECT_EQ(1u,
             feature->extension_types()->count(Manifest::TYPE_PLATFORM_APP));
 
-  DictionaryValue manifest;
+  base::DictionaryValue manifest;
   manifest.SetString("name", "test extension");
   manifest.SetString("version", "1");
-  ListValue* permissions = new ListValue();
+  base::ListValue* permissions = new base::ListValue();
   manifest.Set("permissions", permissions);
-  permissions->Append(Value::CreateStringValue("contextMenus"));
+  permissions->Append(new base::StringValue("contextMenus"));
 
   std::string error;
   scoped_refptr<const Extension> extension(Extension::Create(
       base::FilePath(), Manifest::INTERNAL, manifest, Extension::NO_FLAGS,
       &error));
 
   ASSERT_TRUE(extension.get());
   EXPECT_EQ(Feature::IS_AVAILABLE, feature->IsAvailableToContext(
       extension.get(), Feature::UNSPECIFIED_CONTEXT).result());
 
   feature =
     static_cast<SimpleFeature*>(provider->GetFeature("chromePrivate"));
   ASSERT_TRUE(feature);
   EXPECT_EQ(Feature::NOT_FOUND_IN_WHITELIST, feature->IsAvailableToContext(
       extension.get(), Feature::UNSPECIFIED_CONTEXT).result());
 
   feature =
     static_cast<SimpleFeature*>(provider->GetFeature("clipboardWrite"));
   ASSERT_TRUE(feature);
   EXPECT_EQ(Feature::NOT_PRESENT, feature->IsAvailableToContext(
       extension.get(), Feature::UNSPECIFIED_CONTEXT).result());
 }
 
 TEST(BaseFeatureProvider, Validation) {
-  scoped_ptr<DictionaryValue> value(new DictionaryValue());
+  scoped_ptr<base::DictionaryValue> value(new base::DictionaryValue());
 
-  DictionaryValue* feature1 = new DictionaryValue();
+  base::DictionaryValue* feature1 = new base::DictionaryValue();
   value->Set("feature1", feature1);
 
-  DictionaryValue* feature2 = new DictionaryValue();
-  ListValue* extension_types = new ListValue();
-  extension_types->Append(Value::CreateStringValue("extension"));
+  base::DictionaryValue* feature2 = new base::DictionaryValue();
+  base::ListValue* extension_types = new base::ListValue();
+  extension_types->Append(new base::StringValue("extension"));
   feature2->Set("extension_types", extension_types);
-  ListValue* contexts = new ListValue();
-  contexts->Append(Value::CreateStringValue("blessed_extension"));
+  base::ListValue* contexts = new base::ListValue();
+  contexts->Append(new base::StringValue("blessed_extension"));
   feature2->Set("contexts", contexts);
   value->Set("feature2", feature2);
 
   scoped_ptr<BaseFeatureProvider> provider(
       new BaseFeatureProvider(*value, NULL));
 
   // feature1 won't validate because it lacks an extension type.
   EXPECT_FALSE(provider->GetFeature("feature1"));
 
   // If we add one, it works.
   feature1->Set("extension_types", extension_types->DeepCopy());
   provider.reset(new BaseFeatureProvider(*value, NULL));
   EXPECT_TRUE(provider->GetFeature("feature1"));
 
   // feature2 won't validate because of the presence of "contexts".
   EXPECT_FALSE(provider->GetFeature("feature2"));
 
   // If we remove it, it works.
   feature2->Remove("contexts", NULL);
   provider.reset(new BaseFeatureProvider(*value, NULL));
   EXPECT_TRUE(provider->GetFeature("feature2"));
 }
 
 TEST(BaseFeatureProvider, ComplexFeatures) {
-  scoped_ptr<DictionaryValue> rule(
+  scoped_ptr<base::DictionaryValue> rule(
       DictionaryBuilder()
       .Set("feature1",
            ListBuilder().Append(DictionaryBuilder()
                                 .Set("channel", "beta")
                                 .Set("extension_types",
                                      ListBuilder().Append("extension")))
                         .Append(DictionaryBuilder()
                                 .Set("channel", "beta")
                                 .Set("extension_types",
                                      ListBuilder().Append("packaged_app"))))
       .Build());
 
   scoped_ptr<BaseFeatureProvider> provider(
       new BaseFeatureProvider(*rule, NULL));
 
-  Feature *feature = provider->GetFeature("feature1");
+  Feature* feature = provider->GetFeature("feature1");
   EXPECT_TRUE(feature);
 
   // Make sure both rules are applied correctly.
   {
     Feature::ScopedCurrentChannel current_channel(VersionInfo::CHANNEL_BETA);
     EXPECT_EQ(Feature::IS_AVAILABLE, feature->IsAvailableToManifest(
         "1",
         Manifest::TYPE_EXTENSION,
         Feature::UNSPECIFIED_LOCATION,
         Feature::UNSPECIFIED_PLATFORM).result());
@@ skipping 10 matching lines @@
         Manifest::TYPE_EXTENSION,
         Feature::UNSPECIFIED_LOCATION,
         Feature::UNSPECIFIED_PLATFORM).result());
     EXPECT_NE(Feature::IS_AVAILABLE, feature->IsAvailableToManifest(
         "2",
         Manifest::TYPE_LEGACY_PACKAGED_APP,
         Feature::UNSPECIFIED_LOCATION,
         Feature::UNSPECIFIED_PLATFORM).result());
   }
 }