Get rid of RefCounted for ActivityIconLoader.

components/arc/intent_helper/arc_intent_helper_bridge.h

Index: components/arc/intent_helper/arc_intent_helper_bridge.h
diff --git a/components/arc/intent_helper/arc_intent_helper_bridge.h b/components/arc/intent_helper/arc_intent_helper_bridge.h
index 2a3a5676dd699a541a8d59caabe1ae7be1bb6309..9fdf8168e5dc8ae9de0513a6963b168ce96e37da 100644
--- a/components/arc/intent_helper/arc_intent_helper_bridge.h
+++ b/components/arc/intent_helper/arc_intent_helper_bridge.h
@@ -17,6 +17,7 @@
 #include "components/arc/arc_service.h"
 #include "components/arc/common/intent_helper.mojom.h"
 #include "components/arc/instance_holder.h"
+#include "components/arc/intent_helper/activity_icon_loader.h"
 #include "components/arc/intent_helper/arc_intent_helper_observer.h"
 #include "mojo/public/cpp/bindings/binding.h"
 
@@ -28,7 +29,6 @@ class LinkHandlerModel;
 
 namespace arc {
 
-class ActivityIconLoader;
 class ArcBridgeService;
 class IntentFilter;
 class LocalActivityResolver;
@@ -51,13 +51,14 @@ class ArcIntentHelperBridge
 
   ArcIntentHelperBridge(
       ArcBridgeService* bridge_service,
-      const scoped_refptr<ActivityIconLoader>& icon_loader,
       const scoped_refptr<LocalActivityResolver>& activity_resolver);
   ~ArcIntentHelperBridge() override;
 
   void AddObserver(ArcIntentHelperObserver* observer);
   void RemoveObserver(ArcIntentHelperObserver* observer);
 
+  ActivityIconLoader* icon_loader() { return &icon_loader_; }

[hidehiko, 2017/01/27 16:04:06]

Note: or, alternatively we may want to provide GetActivityIcon() in this class,
which just proxies to ActivityIconLoader.
Then, external classes just can call ArcIntentHelperBridge::GetActivityIcon
directly, and ActivityIconLoader can be encapsulated.

The concern is, then, we would probably need many "using" to alias signatures in
ActivityIconLoader.

Yusuke, WDYT?

[Yusuke Sato, 2017/01/27 18:21:17]

Just in case, can you mention that the returned pointer shouldn't be held in the
caller's class? (another idea is to explicitly return an weakptr but it's
probably overkill.)

[hidehiko, 2017/01/30 17:04:03]

Instead, I removed this method, in the new PS.

+
   // InstanceHolder<mojom::IntentHelperInstance>::Observer
   void OnInstanceReady() override;
   void OnInstanceClosed() override;
@@ -93,7 +94,7 @@ class ArcIntentHelperBridge
 
  private:
   mojo::Binding<mojom::IntentHelperHost> binding_;
-  scoped_refptr<ActivityIconLoader> icon_loader_;
+  ActivityIconLoader icon_loader_;
   scoped_refptr<LocalActivityResolver> activity_resolver_;
 
   base::ThreadChecker thread_checker_;