Get rid of RefCounted for ActivityIconLoader.

components/arc/arc_service_manager.h

 // Copyright 2015 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.
 
 #ifndef COMPONENTS_ARC_ARC_SERVICE_MANAGER_H_
 #define COMPONENTS_ARC_ARC_SERVICE_MANAGER_H_
 
 #include <memory>
 #include <string>
 #include <type_traits>
 #include <unordered_map>
 #include <utility>
 #include <vector>
 
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/task_runner.h"
 #include "base/threading/thread_checker.h"
-#include "components/arc/intent_helper/activity_icon_loader.h"
+#include "components/arc/arc_service.h"

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

Note: this is needed because AddServiceInternal() is actually called in the
inline method, which requires std::unique_ptr instantiation and destruction.
Specifically, its dtor requires ArcService's dtor.

 #include "components/arc/intent_helper/local_activity_resolver.h"
 
 namespace arc {
 
 class ArcBridgeService;
-class ArcService;
 
 namespace internal {
 
 // If an ArcService is declared with a name, e.g.:
 //
 // class MyArcService : public ArcService {
 //  public:
 //   static const char kArcServiceName[];
 //   ...
 // };
@@ skipping 64 matching lines @@
   // called on the thread that this class was created on.
   static ArcServiceManager* Get();
 
   // Called to shut down all ARC services.
   void Shutdown();
 
   scoped_refptr<base::TaskRunner> blocking_task_runner() const {
     return blocking_task_runner_;
   }
 
-  // Returns the icon loader owned by ArcServiceManager and shared by services.
-  scoped_refptr<ActivityIconLoader> icon_loader() { return icon_loader_; }
-
   // Returns the activity resolver owned by ArcServiceManager.
   scoped_refptr<LocalActivityResolver> activity_resolver() {
     return activity_resolver_;
   }
 
  private:
   class IntentHelperObserverImpl;  // implemented in arc_service_manager.cc.
 
   // Helper methods for AddService and GetService.
   bool AddServiceInternal(const std::string& name,
                           std::unique_ptr<ArcService> service);
   ArcService* GetNamedServiceInternal(const std::string& name);
 
   base::ThreadChecker thread_checker_;
   scoped_refptr<base::TaskRunner> blocking_task_runner_;
 
   std::unique_ptr<ArcBridgeService> arc_bridge_service_;
   std::unordered_multimap<std::string, std::unique_ptr<ArcService>> services_;
-  scoped_refptr<ActivityIconLoader> icon_loader_;
   scoped_refptr<LocalActivityResolver> activity_resolver_;
 
   DISALLOW_COPY_AND_ASSIGN(ArcServiceManager);
 };
 
 }  // namespace arc
 
 #endif  // COMPONENTS_ARC_ARC_SERVICE_MANAGER_H_