arc: Revamp the ArcBridgeService interface

chrome/browser/chromeos/arc/arc_policy_bridge_unittest.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 <memory>
 #include <string>
 
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "base/message_loop/message_loop.h"
@@ skipping 90 matching lines @@
     EXPECT_CALL(policy_service_,
                 GetPolicies(policy::PolicyNamespace(
                     policy::POLICY_DOMAIN_CHROME, std::string())))
         .WillRepeatedly(ReturnRef(policy_map_));
     EXPECT_CALL(policy_service_, AddObserver(policy::POLICY_DOMAIN_CHROME, _))
         .Times(1);
 
     mojom::PolicyInstancePtr policy_instance_ptr;
     policy_instance_ = base::MakeUnique<FakePolicyInstance>(
         GetProxy(&policy_instance_ptr), bridge_service_.get());
-    bridge_service_->OnPolicyInstanceReady(std::move(policy_instance_ptr));
+    bridge_service_->policy()->OnInstanceReady(std::move(policy_instance_ptr));
     policy_instance()->WaitForOnPolicyInstanceReady();
   }
 
  protected:
   ArcPolicyBridge* policy_bridge() { return policy_bridge_.get(); }
   FakePolicyInstance* policy_instance() { return policy_instance_.get(); }
   policy::PolicyMap& policy_map() { return policy_map_; }
 
  private:
   // Not an unused variable. Unit tests do not have a message loop by themselves
@@ skipping 30 matching lines @@
           "[{\"packageName\":\"com.google.android.apps.youtube.kids\","
           "\"installType\":\"REQUIRED\","
           "\"lockTaskAllowed\":false,"
           "\"permissionGrants\":[]"
           "}],"
           "\"defaultPermissionPolicy\":\"GRANT\""
           "}")),
       nullptr);
   policy_bridge()->GetPolicies(PolicyStringCallback(
       "{\"applications\":"
-          "[{\"installType\":\"REQUIRED\","
-            "\"lockTaskAllowed\":false,"
-            "\"packageName\":\"com.google.android.apps.youtube.kids\","
-            "\"permissionGrants\":[]"
-          "}],"
+      "[{\"installType\":\"REQUIRED\","
+      "\"lockTaskAllowed\":false,"
+      "\"packageName\":\"com.google.android.apps.youtube.kids\","
+      "\"permissionGrants\":[]"
+      "}],"
       "\"defaultPermissionPolicy\":\"GRANT\""
       "}"));
 }
 
 TEST_F(ArcPolicyBridgeTest, HompageLocationTest) {
   // This policy will not be passed on, result should be empty.
   policy_map().Set(
       policy::key::kHomepageLocation, policy::POLICY_LEVEL_MANDATORY,
       policy::POLICY_SCOPE_USER, policy::POLICY_SOURCE_CLOUD,
       base::WrapUnique(new base::StringValue("http://chromium.org")), nullptr);
@@ skipping 135 matching lines @@
   policy_map().Set(
       policy::key::kHomepageLocation, policy::POLICY_LEVEL_MANDATORY,
       policy::POLICY_SCOPE_USER, policy::POLICY_SOURCE_CLOUD,
       base::WrapUnique(new base::StringValue("http://chromium.org")), nullptr);
   policy_map().Set(
       policy::key::kVideoCaptureAllowed, policy::POLICY_LEVEL_MANDATORY,
       policy::POLICY_SCOPE_USER, policy::POLICY_SOURCE_CLOUD,
       base::WrapUnique(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\""
+      "[{\"installType\":\"REQUIRED\","
+      "\"lockTaskAllowed\":false,"
+      "\"packageName\":\"com.google.android.apps.youtube.kids\","
+      "\"permissionGrants\":[]"
+      "}],"
+      "\"cameraDisabled\":true,"
+      "\"defaultPermissionPolicy\":\"GRANT\""
       "}"));
 }
 
 // This and the following test send the policies through a mojo connection
 // between a PolicyInstance and the PolicyBridge.
 TEST_F(ArcPolicyBridgeTest, PolicyInstanceUnmanagedTest) {
   policy_bridge()->OverrideIsManagedForTesting(false);
   policy_instance()->CallGetPolicies(PolicyStringCallback(""));
 }
 
 TEST_F(ArcPolicyBridgeTest, PolicyInstanceManagedTest) {
   policy_instance()->CallGetPolicies(PolicyStringCallback("{}"));
 }
 
 }  // namespace arc