Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / components / policy / core / common / policy_map_unittest.cc

diff --git a/src/components/policy/core/common/policy_map_unittest.cc b/src/components/policy/core/common/policy_map_unittest.cc
index 4a0dd9f..356cabc 100644 (file)
--- a/src/components/policy/core/common/policy_map_unittest.cc
+++ b/src/components/policy/core/common/policy_map_unittest.cc
@@ -51,10 +51,10 @@ scoped_ptr<ExternalDataFetcher> PolicyMapTest::CreateExternalDataFetcher(
 
 TEST_F(PolicyMapTest, SetAndGet) {
   PolicyMap map;
-  SetPolicy(&map, kTestPolicyName1, base::Value::CreateStringValue("aaa"));
+  SetPolicy(&map, kTestPolicyName1, new base::StringValue("aaa"));
   base::StringValue expected("aaa");
   EXPECT_TRUE(expected.Equals(map.GetValue(kTestPolicyName1)));
-  SetPolicy(&map, kTestPolicyName1, base::Value::CreateStringValue("bbb"));
+  SetPolicy(&map, kTestPolicyName1, new base::StringValue("bbb"));
   base::StringValue expected_b("bbb");
   EXPECT_TRUE(expected_b.Equals(map.GetValue(kTestPolicyName1)));
   SetPolicy(&map, kTestPolicyName1,
@@ -78,14 +78,14 @@ TEST_F(PolicyMapTest, SetAndGet) {
 
 TEST_F(PolicyMapTest, Equals) {
   PolicyMap a;
-  SetPolicy(&a, kTestPolicyName1, base::Value::CreateStringValue("aaa"));
+  SetPolicy(&a, kTestPolicyName1, new base::StringValue("aaa"));
   PolicyMap a2;
-  SetPolicy(&a2, kTestPolicyName1, base::Value::CreateStringValue("aaa"));
+  SetPolicy(&a2, kTestPolicyName1, new base::StringValue("aaa"));
   PolicyMap b;
-  SetPolicy(&b, kTestPolicyName1, base::Value::CreateStringValue("bbb"));
+  SetPolicy(&b, kTestPolicyName1, new base::StringValue("bbb"));
   PolicyMap c;
-  SetPolicy(&c, kTestPolicyName1, base::Value::CreateStringValue("aaa"));
-  SetPolicy(&c, kTestPolicyName2, base::Value::CreateBooleanValue(true));
+  SetPolicy(&c, kTestPolicyName1, new base::StringValue("aaa"));
+  SetPolicy(&c, kTestPolicyName2, new base::FundamentalValue(true));
   PolicyMap d;
   SetPolicy(&d, kTestPolicyName1,
             CreateExternalDataFetcher("ddd").release());
@@ -129,12 +129,12 @@ TEST_F(PolicyMapTest, Equals) {
 
 TEST_F(PolicyMapTest, Swap) {
   PolicyMap a;
-  SetPolicy(&a, kTestPolicyName1, base::Value::CreateStringValue("aaa"));
+  SetPolicy(&a, kTestPolicyName1, new base::StringValue("aaa"));
   SetPolicy(&a, kTestPolicyName2,
             CreateExternalDataFetcher("dummy").release());
   PolicyMap b;
-  SetPolicy(&b, kTestPolicyName1, base::Value::CreateStringValue("bbb"));
-  SetPolicy(&b, kTestPolicyName3, base::Value::CreateBooleanValue(true));
+  SetPolicy(&b, kTestPolicyName1, new base::StringValue("bbb"));
+  SetPolicy(&b, kTestPolicyName3, new base::FundamentalValue(true));
 
   a.Swap(&b);
   base::StringValue expected("bbb");
@@ -161,106 +161,166 @@ TEST_F(PolicyMapTest, Swap) {
 
 TEST_F(PolicyMapTest, MergeFrom) {
   PolicyMap a;
-  a.Set(kTestPolicyName1, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
-        base::Value::CreateStringValue("google.com"), NULL);
-  a.Set(kTestPolicyName2, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE,
-        base::Value::CreateBooleanValue(true), NULL);
+  a.Set(kTestPolicyName1,
+        POLICY_LEVEL_MANDATORY,
+        POLICY_SCOPE_USER,
+        new base::StringValue("google.com"),
+        NULL);
+  a.Set(kTestPolicyName2,
+        POLICY_LEVEL_MANDATORY,
+        POLICY_SCOPE_MACHINE,
+        new base::FundamentalValue(true),
+        NULL);
   a.Set(kTestPolicyName3,
         POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE,
         NULL, CreateExternalDataFetcher("a").release());
-  a.Set(kTestPolicyName4, POLICY_LEVEL_RECOMMENDED, POLICY_SCOPE_USER,
-        base::Value::CreateBooleanValue(false), NULL);
+  a.Set(kTestPolicyName4,
+        POLICY_LEVEL_RECOMMENDED,
+        POLICY_SCOPE_USER,
+        new base::FundamentalValue(false),
+        NULL);
   a.Set(kTestPolicyName5,
-        POLICY_LEVEL_RECOMMENDED, POLICY_SCOPE_MACHINE,
-        base::Value::CreateStringValue("google.com/q={x}"), NULL);
+        POLICY_LEVEL_RECOMMENDED,
+        POLICY_SCOPE_MACHINE,
+        new base::StringValue("google.com/q={x}"),
+        NULL);
 
   PolicyMap b;
-  b.Set(kTestPolicyName1, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE,
-        base::Value::CreateStringValue("chromium.org"), NULL);
-  b.Set(kTestPolicyName2, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE,
-        base::Value::CreateBooleanValue(false), NULL);
+  b.Set(kTestPolicyName1,
+        POLICY_LEVEL_MANDATORY,
+        POLICY_SCOPE_MACHINE,
+        new base::StringValue("chromium.org"),
+        NULL);
+  b.Set(kTestPolicyName2,
+        POLICY_LEVEL_MANDATORY,
+        POLICY_SCOPE_MACHINE,
+        new base::FundamentalValue(false),
+        NULL);
   b.Set(kTestPolicyName3,
         POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE,
         NULL, CreateExternalDataFetcher("b").release());
-  b.Set(kTestPolicyName4, POLICY_LEVEL_RECOMMENDED,
-        POLICY_SCOPE_MACHINE, base::Value::CreateBooleanValue(true), NULL);
+  b.Set(kTestPolicyName4,
+        POLICY_LEVEL_RECOMMENDED,
+        POLICY_SCOPE_MACHINE,
+        new base::FundamentalValue(true),
+        NULL);
   b.Set(kTestPolicyName5,
         POLICY_LEVEL_MANDATORY,
         POLICY_SCOPE_MACHINE,
-        base::Value::CreateStringValue(std::string()),
+        new base::StringValue(std::string()),
         NULL);
   b.Set(kTestPolicyName6,
         POLICY_LEVEL_RECOMMENDED,
         POLICY_SCOPE_USER,
-        base::Value::CreateBooleanValue(true),
+        new base::FundamentalValue(true),
         NULL);
 
   a.MergeFrom(b);
 
   PolicyMap c;
   // POLICY_SCOPE_MACHINE over POLICY_SCOPE_USER.
-  c.Set(kTestPolicyName1, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE,
-        base::Value::CreateStringValue("chromium.org"), NULL);
+  c.Set(kTestPolicyName1,
+        POLICY_LEVEL_MANDATORY,
+        POLICY_SCOPE_MACHINE,
+        new base::StringValue("chromium.org"),
+        NULL);
   // |a| has precedence over |b|.
-  c.Set(kTestPolicyName2, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE,
-        base::Value::CreateBooleanValue(true), NULL);
+  c.Set(kTestPolicyName2,
+        POLICY_LEVEL_MANDATORY,
+        POLICY_SCOPE_MACHINE,
+        new base::FundamentalValue(true),
+        NULL);
   c.Set(kTestPolicyName3,
         POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE,
         NULL, CreateExternalDataFetcher("a").release());
   // POLICY_SCOPE_MACHINE over POLICY_SCOPE_USER for POLICY_LEVEL_RECOMMENDED.
-  c.Set(kTestPolicyName4, POLICY_LEVEL_RECOMMENDED,
-        POLICY_SCOPE_MACHINE, base::Value::CreateBooleanValue(true), NULL);
+  c.Set(kTestPolicyName4,
+        POLICY_LEVEL_RECOMMENDED,
+        POLICY_SCOPE_MACHINE,
+        new base::FundamentalValue(true),
+        NULL);
   // POLICY_LEVEL_MANDATORY over POLICY_LEVEL_RECOMMENDED.
   c.Set(kTestPolicyName5,
         POLICY_LEVEL_MANDATORY,
         POLICY_SCOPE_MACHINE,
-        base::Value::CreateStringValue(std::string()),
+        new base::StringValue(std::string()),
         NULL);
   // Merge new ones.
-  c.Set(kTestPolicyName6, POLICY_LEVEL_RECOMMENDED, POLICY_SCOPE_USER,
-        base::Value::CreateBooleanValue(true), NULL);
+  c.Set(kTestPolicyName6,
+        POLICY_LEVEL_RECOMMENDED,
+        POLICY_SCOPE_USER,
+        new base::FundamentalValue(true),
+        NULL);
 
   EXPECT_TRUE(a.Equals(c));
 }
 
 TEST_F(PolicyMapTest, GetDifferingKeys) {
   PolicyMap a;
-  a.Set(kTestPolicyName1, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
-        base::Value::CreateStringValue("google.com"), NULL);
+  a.Set(kTestPolicyName1,
+        POLICY_LEVEL_MANDATORY,
+        POLICY_SCOPE_USER,
+        new base::StringValue("google.com"),
+        NULL);
   a.Set(kTestPolicyName2,
         POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE,
         NULL, CreateExternalDataFetcher("dummy").release());
-  a.Set(kTestPolicyName3, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE,
-        base::Value::CreateBooleanValue(true), NULL);
+  a.Set(kTestPolicyName3,
+        POLICY_LEVEL_MANDATORY,
+        POLICY_SCOPE_MACHINE,
+        new base::FundamentalValue(true),
+        NULL);
   a.Set(kTestPolicyName4,
         POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE,
         NULL, CreateExternalDataFetcher("a").release());
-  a.Set(kTestPolicyName5, POLICY_LEVEL_RECOMMENDED, POLICY_SCOPE_USER,
-        base::Value::CreateBooleanValue(false), NULL);
+  a.Set(kTestPolicyName5,
+        POLICY_LEVEL_RECOMMENDED,
+        POLICY_SCOPE_USER,
+        new base::FundamentalValue(false),
+        NULL);
   a.Set(kTestPolicyName6,
-        POLICY_LEVEL_RECOMMENDED, POLICY_SCOPE_MACHINE,
-        base::Value::CreateStringValue("google.com/q={x}"), NULL);
-  a.Set(kTestPolicyName7, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
-        base::Value::CreateBooleanValue(true), NULL);
+        POLICY_LEVEL_RECOMMENDED,
+        POLICY_SCOPE_MACHINE,
+        new base::StringValue("google.com/q={x}"),
+        NULL);
+  a.Set(kTestPolicyName7,
+        POLICY_LEVEL_MANDATORY,
+        POLICY_SCOPE_USER,
+        new base::FundamentalValue(true),
+        NULL);
 
   PolicyMap b;
-  b.Set(kTestPolicyName1, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
-        base::Value::CreateStringValue("google.com"), NULL);
+  b.Set(kTestPolicyName1,
+        POLICY_LEVEL_MANDATORY,
+        POLICY_SCOPE_USER,
+        new base::StringValue("google.com"),
+        NULL);
   b.Set(kTestPolicyName2,
         POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE,
         NULL, CreateExternalDataFetcher("dummy").release());
-  b.Set(kTestPolicyName3, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE,
-        base::Value::CreateBooleanValue(false), NULL);
+  b.Set(kTestPolicyName3,
+        POLICY_LEVEL_MANDATORY,
+        POLICY_SCOPE_MACHINE,
+        new base::FundamentalValue(false),
+        NULL);
   b.Set(kTestPolicyName4,
         POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE,
         NULL, CreateExternalDataFetcher("b").release());
-  b.Set(kTestPolicyName5, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
-        base::Value::CreateBooleanValue(false), NULL);
-  b.Set(kTestPolicyName6, POLICY_LEVEL_RECOMMENDED,
-        POLICY_SCOPE_USER, base::Value::CreateStringValue("google.com/q={x}"),
+  b.Set(kTestPolicyName5,
+        POLICY_LEVEL_MANDATORY,
+        POLICY_SCOPE_USER,
+        new base::FundamentalValue(false),
+        NULL);
+  b.Set(kTestPolicyName6,
+        POLICY_LEVEL_RECOMMENDED,
+        POLICY_SCOPE_USER,
+        new base::StringValue("google.com/q={x}"),
+        NULL);
+  b.Set(kTestPolicyName8,
+        POLICY_LEVEL_RECOMMENDED,
+        POLICY_SCOPE_USER,
+        new base::FundamentalValue(true),
         NULL);
-  b.Set(kTestPolicyName8, POLICY_LEVEL_RECOMMENDED, POLICY_SCOPE_USER,
-        base::Value::CreateBooleanValue(true), NULL);
 
   std::set<std::string> diff;
   std::set<std::string> diff2;