Reduce FakeArcBridgeService usage.

chrome/browser/chromeos/arc/policy/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"
 #include "base/values.h"
 #include "chrome/browser/chromeos/arc/policy/arc_policy_bridge.h"
-#include "components/arc/test/fake_arc_bridge_service.h"
+#include "components/arc/arc_bridge_service.h"
 #include "components/arc/test/fake_policy_instance.h"
 #include "components/policy/core/common/mock_policy_service.h"
 #include "components/policy/core/common/policy_map.h"
 #include "components/policy/core/common/policy_namespace.h"
 #include "components/policy/core/common/policy_types.h"
 #include "components/policy/policy_constants.h"
 #include "mojo/public/cpp/bindings/string.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ skipping 70 matching lines @@
 using testing::_;
 using testing::ReturnRef;
 
 namespace arc {
 
 class ArcPolicyBridgeTest : public testing::Test {
  public:
   ArcPolicyBridgeTest() {}
 
   void SetUp() override {
-    bridge_service_.reset(new FakeArcBridgeService());
-    policy_bridge_.reset(
-        new ArcPolicyBridge(bridge_service_.get(), &policy_service_));
+    bridge_service_ = base::MakeUnique<ArcBridgeService>();
+    policy_bridge_ = base::MakeUnique<ArcPolicyBridge>(bridge_service_.get(),
+                                                       &policy_service_);
     policy_bridge_->OverrideIsManagedForTesting(true);
 
     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);
 
-    policy_instance_.reset(new FakePolicyInstance);
+    policy_instance_ = base::MakeUnique<FakePolicyInstance>();
     bridge_service_->policy()->SetInstance(policy_instance_.get());
   }
 
  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
   // and mojo needs a message loop for communication.
   base::MessageLoop loop_;
-  std::unique_ptr<FakeArcBridgeService> bridge_service_;
+  std::unique_ptr<ArcBridgeService> bridge_service_;
   std::unique_ptr<ArcPolicyBridge> policy_bridge_;
   // Always keep policy_instance_ below bridge_service_, so that
   // policy_instance_ is destructed first. It needs to remove itself as
   // observer.
   std::unique_ptr<FakePolicyInstance> policy_instance_;
   policy::PolicyMap policy_map_;
   policy::MockPolicyService policy_service_;
 
   DISALLOW_COPY_AND_ASSIGN(ArcPolicyBridgeTest);
 };
@@ skipping 229 matching lines @@
 TEST_F(ArcPolicyBridgeTest, PolicyInstanceUnmanagedTest) {
   policy_bridge()->OverrideIsManagedForTesting(false);
   policy_instance()->CallGetPolicies(PolicyStringCallback(""));
 }
 
 TEST_F(ArcPolicyBridgeTest, PolicyInstanceManagedTest) {
   policy_instance()->CallGetPolicies(PolicyStringCallback("{}"));
 }
 
 }  // namespace arc