Chromium Code Reviews| Index: chrome/browser/chromeos/arc/policy/arc_policy_bridge.cc |
| diff --git a/chrome/browser/chromeos/arc/policy/arc_policy_bridge.cc b/chrome/browser/chromeos/arc/policy/arc_policy_bridge.cc |
| index 92e582f775729e70df62d3299cff12405425bf54..9ff35814ea93629e6e18d2a9681c5f2813de86da 100644 |
| --- a/chrome/browser/chromeos/arc/policy/arc_policy_bridge.cc |
| +++ b/chrome/browser/chromeos/arc/policy/arc_policy_bridge.cc |
| @@ -284,7 +284,7 @@ void ArcPolicyBridge::OnInstanceClosed() { |
| void ArcPolicyBridge::GetPolicies(const GetPoliciesCallback& callback) { |
| VLOG(1) << "ArcPolicyBridge::GetPolicies"; |
| if (!is_managed_) { |
| - callback.Run(mojo::String("")); |
| + callback.Run(std::string()); |
| return; |
| } |
| const policy::PolicyNamespace policy_namespace(policy::POLICY_DOMAIN_CHROME, |
| @@ -292,7 +292,7 @@ void ArcPolicyBridge::GetPolicies(const GetPoliciesCallback& callback) { |
| const policy::PolicyMap& policy_map = |
| policy_service_->GetPolicies(policy_namespace); |
| const std::string json_policies = GetFilteredJSONPolicies(policy_map); |
| - callback.Run(mojo::String(json_policies)); |
| + callback.Run(std::string(json_policies)); |
|
Yusuke Sato
2016/11/11 22:42:10
remove std::string()? or merge L294 and 295?
Luis Héctor Chávez
2016/11/12 02:08:01
Done.
|
| } |
| void OnReportComplianceParseSuccess( |
| @@ -301,17 +301,17 @@ void OnReportComplianceParseSuccess( |
| // TODO(poromov@): Track the report and start ARC++ kiosk app when the report |
| // is empty, that means that CloudDpc applied all policies. |
| // Currently do nothing with the report, return 'true' if JSON is parsed. |
| - callback.Run(mojo::String("{ \"policyCompliant\": true }")); |
| + callback.Run(std::string("{ \"policyCompliant\": true }")); |
|
Yusuke Sato
2016/11/11 22:42:10
same. I think Chromium code usually relies on the
Luis Héctor Chávez
2016/11/12 02:08:01
Done.
|
| } |
| void OnReportComplianceParseFailure( |
| const ArcPolicyBridge::ReportComplianceCallback& callback, |
| const std::string& error) { |
| - callback.Run(mojo::String("{ \"policyCompliant\": false }")); |
| + callback.Run(std::string("{ \"policyCompliant\": false }")); |
|
Yusuke Sato
2016/11/11 22:42:10
same
Luis Héctor Chávez
2016/11/12 02:08:01
Done.
|
| } |
| void ArcPolicyBridge::ReportCompliance( |
| - const mojo::String& request, |
| + const std::string& request, |
| const ReportComplianceCallback& callback) { |
| VLOG(1) << "ArcPolicyBridge::ReportCompliance"; |
| safe_json::SafeJsonParser::Parse( |