Rename ArcApplicationPolicy to ArcPolicy

chrome/browser/chromeos/arc/arc_policy_bridge_unittest.cc

Index: chrome/browser/chromeos/arc/arc_policy_bridge_unittest.cc
diff --git a/chrome/browser/chromeos/arc/arc_policy_bridge_unittest.cc b/chrome/browser/chromeos/arc/arc_policy_bridge_unittest.cc
index 7d1a04653e68b6518e187057e68fafffd608853d..7771e1c2547ff0afb481c8bdb8a210198dce065a 100644
--- a/chrome/browser/chromeos/arc/arc_policy_bridge_unittest.cc
+++ b/chrome/browser/chromeos/arc/arc_policy_bridge_unittest.cc
@@ -74,27 +74,27 @@ TEST_F(ArcPolicyBridgeTest, EmptyPolicyTest) {
   policy_bridge()->GetPolicies(PolicyStringCallback("{}"));
 }
 
-TEST_F(ArcPolicyBridgeTest, ArcApplicationPolicyTest) {
+TEST_F(ArcPolicyBridgeTest, ArcPolicyTest) {
   policy_map().Set(
-      "ArcApplicationPolicy", policy::POLICY_LEVEL_MANDATORY,
-      policy::POLICY_SCOPE_USER, policy::POLICY_SOURCE_CLOUD,
+      "ArcPolicy", policy::POLICY_LEVEL_MANDATORY, policy::POLICY_SCOPE_USER,
+      policy::POLICY_SOURCE_CLOUD,
       new base::StringValue(
-          "{\"applications\":"
-              "[{\"packageName\":\"com.google.android.apps.youtube.kids\","
-                "\"installType\":\"REQUIRED\","
-                "\"lockTaskAllowed\":false,"
-                "\"permissionGrants\":[]"
-              "}],"
+          "{\"applications\": [{"
+          "    \"packageName\":\"com.google.android.apps.youtube.kids\","
+          "    \"installType\":\"REQUIRED\","
+          "    \"lockTaskAllowed\":false,"
+          "    \"permissionGrants\":[]"
+          "}],"

[hidehiko, 2016/04/12 06:55:42]

nit: indent looks not aligned. Ditto for below.

[bartfab (slow), 2016/04/12 13:28:15]

I had tried to reformat things to make clang-format happy. However, I then
realized that I actually cannot do that as the whole concatenated string is
compared verbatim to the value returned by the policy bridge. I cannot add any
whitespace or formatting inside the strings. I reverted them back to what they
were before.

           "\"defaultPermissionPolicy\":\"GRANT\""
           "}"),
       nullptr);
   policy_bridge()->GetPolicies(PolicyStringCallback(
-      "{\"applications\":"
-          "[{\"installType\":\"REQUIRED\","
-            "\"lockTaskAllowed\":false,"
-            "\"packageName\":\"com.google.android.apps.youtube.kids\","
-            "\"permissionGrants\":[]"
-          "}],"
+      "{\"applications\": [{"
+      "    \"installType\":\"REQUIRED\","
+      "    \"lockTaskAllowed\":false,"
+      "    \"packageName\":\"com.google.android.apps.youtube.kids\","
+      "    \"permissionGrants\":[]"
+      "}],"
       "\"defaultPermissionPolicy\":\"GRANT\""
       "}"));
 }
@@ -118,14 +118,15 @@ TEST_F(ArcPolicyBridgeTest, VideoCaptureAllowedTest) {
 TEST_F(ArcPolicyBridgeTest, AllPoliciesTest) {
   // Keep them in alphabetical order.
   policy_map().Set(
-      "ArcApplicationPolicy", policy::POLICY_LEVEL_MANDATORY,
-      policy::POLICY_SCOPE_USER, policy::POLICY_SOURCE_CLOUD,
-      new base::StringValue("{\"applications\":"
-              "[{\"packageName\":\"com.google.android.apps.youtube.kids\","
-                "\"installType\":\"REQUIRED\","
-                "\"lockTaskAllowed\":false,"
-                "\"permissionGrants\":[]"
-              "}],"
+      "ArcPolicy", policy::POLICY_LEVEL_MANDATORY, policy::POLICY_SCOPE_USER,
+      policy::POLICY_SOURCE_CLOUD,
+      new base::StringValue(
+          "{\"applications\": [{"
+          "    \"packageName\":\"com.google.android.apps.youtube.kids\","
+          "    \"installType\":\"REQUIRED\","
+          "    \"lockTaskAllowed\":false,"
+          "    \"permissionGrants\":[]"
+          "}],"
           "\"defaultPermissionPolicy\":\"GRANT\"}"),
       nullptr);
   policy_map().Set("HomepageLocation", policy::POLICY_LEVEL_MANDATORY,
@@ -135,14 +136,14 @@ TEST_F(ArcPolicyBridgeTest, AllPoliciesTest) {
                    policy::POLICY_SCOPE_USER, policy::POLICY_SOURCE_CLOUD,
                    new base::FundamentalValue(false), nullptr);
   policy_bridge()->GetPolicies(PolicyStringCallback(
-      "{\"applications\":"
-          "[{\"installType\":\"REQUIRED\","
-            "\"lockTaskAllowed\":false,"
-            "\"packageName\":\"com.google.android.apps.youtube.kids\","
-            "\"permissionGrants\":[]"
-          "}],"
-        "\"cameraDisabled\":true,"
-        "\"defaultPermissionPolicy\":\"GRANT\""
+      "{\"applications\": [{"
+      "    \"installType\":\"REQUIRED\","
+      "    \"lockTaskAllowed\":false,"
+      "    \"packageName\":\"com.google.android.apps.youtube.kids\","
+      "    \"permissionGrants\":[]"
+      "}],"
+      "\"cameraDisabled\":true,"
+      "\"defaultPermissionPolicy\":\"GRANT\""
       "}"));
 }