Rename ArcApplicationPolicy to ArcPolicy

chrome/browser/chromeos/arc/arc_policy_bridge.cc

 // Copyright 2016 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/browser/chromeos/arc/arc_policy_bridge.h"
 
 #include <memory>
 #include <string>
 
 #include "base/json/json_reader.h"
@@ skipping 29 matching lines @@
       filtered_policies.SetBoolean(arc_policy_name, !bool_value);
     } else {
       filtered_policies.Set(arc_policy_name,
                             policy_value->CreateDeepCopy().release());
     }
   }
 }
 
 std::string GetFilteredJSONPolicies(const policy::PolicyMap& policy_map) {
   base::DictionaryValue filtered_policies;
-  // Parse ArcApplicationPolicy as JSON string before adding other policies to
-  // the dictionary.
+  // Parse ArcPolicy as JSON string before adding other policies to the
+  // dictionary.
   const base::Value* const app_policy_value =
-      policy_map.GetValue(policy::key::kArcApplicationPolicy);
+      policy_map.GetValue(policy::key::kArcPolicy);
   if (app_policy_value) {
     std::string app_policy_string;
     app_policy_value->GetAsString(&app_policy_string);
     std::unique_ptr<base::DictionaryValue> app_policy_dict =
         base::DictionaryValue::From(base::JSONReader::Read(app_policy_string));
     if (app_policy_dict) {
       // Need a deep copy of all values here instead of doing a swap, because
       // JSONReader::Read constructs a dictionary whose StringValues are
       // JSONStringValues which are based on StringPiece instead of string.
       filtered_policies.MergeDictionary(app_policy_dict.get());
     } else {
-      LOG(ERROR) << "Value of ArcApplicationPolicy has invalid format: "
+      LOG(ERROR) << "Value of ArcPolicy has invalid format: "
                  << app_policy_string;
     }
   }
 
   // Keep them sorted by the ARC policy names.
   AddPolicy("cameraDisabled", policy::key::kVideoCaptureAllowed, policy_map,
             true, filtered_policies);
 
   std::string policy_json;
   JSONStringValueSerializer serializer(&policy_json);
@@ skipping 68 matching lines @@
   const user_manager::User* const primary_user =
       user_manager::UserManager::Get()->GetPrimaryUser();
   Profile* const profile =
       chromeos::ProfileHelper::Get()->GetProfileByUser(primary_user);
   policy_service_ =
       policy::ProfilePolicyConnectorFactory::GetForBrowserContext(profile)
           ->policy_service();
 }
 
 }  // namespace arc