Reduce FakeArcBridgeService usage.

components/arc/intent_helper/arc_intent_helper_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 "components/arc/intent_helper/arc_intent_helper_bridge.h"
 
 #include <utility>
 
+#include "base/memory/ptr_util.h"
+#include "components/arc/arc_bridge_service.h"
 #include "components/arc/common/intent_helper.mojom.h"
 #include "components/arc/intent_helper/activity_icon_loader.h"
 #include "components/arc/intent_helper/local_activity_resolver.h"
-#include "components/arc/test/fake_arc_bridge_service.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace arc {
 
 namespace {
 
 class ArcIntentHelperTest : public testing::Test {
  public:
   ArcIntentHelperTest() = default;
 
  protected:
-  std::unique_ptr<FakeArcBridgeService> fake_arc_bridge_service_;
+  std::unique_ptr<ArcBridgeService> arc_bridge_service_;
   scoped_refptr<ActivityIconLoader> icon_loader_;
   scoped_refptr<LocalActivityResolver> activity_resolver_;
   std::unique_ptr<ArcIntentHelperBridge> instance_;
 
  private:
   void SetUp() override {
-    fake_arc_bridge_service_.reset(new FakeArcBridgeService());
+    arc_bridge_service_ = base::MakeUnique<ArcBridgeService>();
     icon_loader_ = new ActivityIconLoader();
     activity_resolver_ = new LocalActivityResolver();
-    instance_.reset(new ArcIntentHelperBridge(
-        fake_arc_bridge_service_.get(), icon_loader_, activity_resolver_));
+    instance_ = base::MakeUnique<ArcIntentHelperBridge>(
+        arc_bridge_service_.get(), icon_loader_, activity_resolver_);
   }
 
   void TearDown() override {
     instance_.reset();
     activity_resolver_ = nullptr;
     icon_loader_ = nullptr;
-    fake_arc_bridge_service_.reset();
+    arc_bridge_service_.reset();
   }
 
   DISALLOW_COPY_AND_ASSIGN(ArcIntentHelperTest);
 };
 
 }  // namespace
 
 // Tests if IsIntentHelperPackage works as expected. Probably too trivial
 // to test but just in case.
 TEST_F(ArcIntentHelperTest, TestIsIntentHelperPackage) {
@@ skipping 105 matching lines @@
   EXPECT_TRUE(observer->IsUpdated());
 
   // Observer should not be called after it's removed.
   observer->Reset();
   instance_->RemoveObserver(observer.get());
   instance_->OnIntentFiltersUpdated(std::vector<mojom::IntentFilterPtr>());
   EXPECT_FALSE(observer->IsUpdated());
 }
 
 }  // namespace arc