arc: Convert more Mojo types to STL

chrome/browser/chromeos/arc/policy/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/policy/arc_policy_bridge.h"
 
 #include <memory>
 #include <string>

[Yusuke Sato, 2016/11/11 22:42:10]

nit: remove

[Luis Héctor Chávez, 2016/11/12 02:08:01]

Done.

 #include <utility>
 
 #include "base/json/json_reader.h"
 #include "base/json/json_string_value_serializer.h"
 #include "base/logging.h"
 #include "base/memory/ptr_util.h"
 #include "base/values.h"
 #include "chrome/browser/chromeos/profiles/profile_helper.h"
 #include "chrome/browser/policy/profile_policy_connector.h"
 #include "chrome/browser/policy/profile_policy_connector_factory.h"
@@ skipping 258 matching lines @@
 
 void ArcPolicyBridge::OnInstanceClosed() {
   VLOG(1) << "ArcPolicyBridge::OnPolicyInstanceClosed";
   policy_service_->RemoveObserver(policy::POLICY_DOMAIN_CHROME, this);
   policy_service_ = nullptr;
 }
 
 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,
                                                  std::string());
   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(
     const ArcPolicyBridge::ReportComplianceCallback& callback,
     std::unique_ptr<base::Value> parsed_json) {
   // 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 implicit constructor.

[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(
       request, base::Bind(&OnReportComplianceParseSuccess, callback),
       base::Bind(&OnReportComplianceParseFailure, callback));
 }
 
 void ArcPolicyBridge::OnPolicyUpdated(const policy::PolicyNamespace& ns,
                                       const policy::PolicyMap& previous,
                                       const policy::PolicyMap& current) {
@@ skipping 10 matching lines @@
       user_manager::UserManager::Get()->GetPrimaryUser();
   Profile* const profile =
       chromeos::ProfileHelper::Get()->GetProfileByUser(primary_user);
   auto* profile_policy_connector =
       policy::ProfilePolicyConnectorFactory::GetForBrowserContext(profile);
   policy_service_ = profile_policy_connector->policy_service();
   is_managed_ = profile_policy_connector->IsManaged();
 }
 
 }  // namespace arc