Get rid of RefCounted for ActivityIconLoader.

components/arc/intent_helper/activity_icon_loader.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/activity_icon_loader.h"
 
 #include <string.h>
 
 #include <tuple>
 #include <utility>
 
 #include "base/base64.h"
 #include "base/bind.h"
 #include "base/memory/ptr_util.h"
+#include "base/memory/ref_counted.h"
 #include "base/task_runner_util.h"
 #include "components/arc/arc_bridge_service.h"
 #include "components/arc/arc_service_manager.h"
+#include "components/arc/intent_helper/arc_intent_helper_bridge.h"
 #include "ui/base/layout.h"
 #include "ui/gfx/image/image_skia.h"
 #include "ui/gfx/image/image_skia_operations.h"
 
 namespace arc {
 
 namespace {
 
 constexpr size_t kSmallIconSizeInDip = 16;
 constexpr size_t kLargeIconSizeInDip = 20;
@@ skipping 14 matching lines @@
   auto* instance = ARC_GET_INSTANCE_FOR_METHOD(
       ArcServiceManager::Get()->arc_bridge_service()->intent_helper(),
       RequestActivityIcons);
   if (!instance && out_error_code) {
     *out_error_code =
         ArcIntentHelperBridge::GetResult::FAILED_ARC_NOT_SUPPORTED;
   }
   return instance;
 }
 
+// static

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

remove

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

Done.

+std::unique_ptr<ActivityIconLoader::ActivityToIconsMap> ResizeAndEncodeIcons(
+    std::vector<mojom::ActivityIconPtr> icons) {
+  auto result = base::MakeUnique<ActivityIconLoader::ActivityToIconsMap>();
+  for (size_t i = 0; i < icons.size(); ++i) {
+    static const size_t kBytesPerPixel = 4;
+    const mojom::ActivityIconPtr& icon = icons.at(i);
+    if (icon->width > kMaxIconSizeInPx || icon->height > kMaxIconSizeInPx ||
+        icon->width == 0 || icon->height == 0 ||
+        icon->icon.size() != (icon->width * icon->height * kBytesPerPixel)) {
+      continue;
+    }
+
+    SkBitmap bitmap;
+    bitmap.allocPixels(SkImageInfo::MakeN32Premul(icon->width, icon->height));
+    if (!bitmap.getPixels())
+      continue;
+    DCHECK_GE(bitmap.getSafeSize(), icon->icon.size());
+    memcpy(bitmap.getPixels(), &icon->icon.front(), icon->icon.size());
+
+    gfx::ImageSkia original(gfx::ImageSkia::CreateFrom1xBitmap(bitmap));
+
+    // Resize the original icon to the sizes intent_helper needs.
+    gfx::ImageSkia icon_large(gfx::ImageSkiaOperations::CreateResizedImage(
+        original, skia::ImageOperations::RESIZE_BEST,
+        gfx::Size(kLargeIconSizeInDip, kLargeIconSizeInDip)));
+    gfx::ImageSkia icon_small(gfx::ImageSkiaOperations::CreateResizedImage(
+        original, skia::ImageOperations::RESIZE_BEST,
+        gfx::Size(kSmallIconSizeInDip, kSmallIconSizeInDip)));
+    gfx::Image icon16(icon_small);
+    gfx::Image icon20(icon_large);
+
+    // Encode the icon as PNG data, and then as data: URL.
+    scoped_refptr<base::RefCountedMemory> img = icon16.As1xPNGBytes();
+    if (!img)
+      continue;
+    std::string encoded;
+    base::Base64Encode(base::StringPiece(img->front_as<char>(), img->size()),
+                       &encoded);
+    scoped_refptr<base::RefCountedData<GURL>> dataurl(
+        new base::RefCountedData<GURL>(GURL(kPngDataUrlPrefix + encoded)));
+
+    const std::string activity_name = icon->activity->activity_name.has_value()
+                                          ? (*icon->activity->activity_name)
+                                          : std::string();
+    result->insert(
+        std::make_pair(ActivityIconLoader::ActivityName(
+                           icon->activity->package_name, activity_name),
+                       ActivityIconLoader::Icons(icon16, icon20, dataurl)));
+  }
+
+  return result;
+}
+
 }  // namespace
 
 ActivityIconLoader::Icons::Icons(
     const gfx::Image& icon16,
     const gfx::Image& icon20,
     const scoped_refptr<base::RefCountedData<GURL>>& icon16_dataurl)
     : icon16(icon16), icon20(icon20), icon16_dataurl(icon16_dataurl) {}
 
 ActivityIconLoader::Icons::Icons(const Icons& other) = default;
 
 ActivityIconLoader::Icons::~Icons() = default;
 
 ActivityIconLoader::ActivityName::ActivityName(const std::string& package_name,
                                                const std::string& activity_name)
     : package_name(package_name), activity_name(activity_name) {}
 
 bool ActivityIconLoader::ActivityName::operator<(
     const ActivityName& other) const {
   return std::tie(package_name, activity_name) <
          std::tie(other.package_name, other.activity_name);
 }
 
 ActivityIconLoader::ActivityIconLoader()
-    : scale_factor_(GetSupportedScaleFactor()) {}
+    : scale_factor_(GetSupportedScaleFactor()), weak_ptr_factory_(this) {}
 
-ActivityIconLoader::~ActivityIconLoader() {}
+ActivityIconLoader::~ActivityIconLoader() = default;
 
 void ActivityIconLoader::InvalidateIcons(const std::string& package_name) {
   DCHECK(thread_checker_.CalledOnValidThread());
   for (auto it = cached_icons_.begin(); it != cached_icons_.end();) {
     if (it->first.package_name == package_name)
       it = cached_icons_.erase(it);
     else
       ++it;
   }
 }
@@ skipping 34 matching lines @@
         return GetResult(GetResult::FAILED_ARC_NOT_READY);
       case ArcIntentHelperBridge::GetResult::FAILED_ARC_NOT_SUPPORTED:
         return GetResult(GetResult::FAILED_ARC_NOT_SUPPORTED);
     }
     NOTREACHED();
   }
 
   // Fetch icons from ARC.
   instance->RequestActivityIcons(
       std::move(activities_to_fetch), mojom::ScaleFactor(scale_factor_),
-      base::Bind(&ActivityIconLoader::OnIconsReady, this, base::Passed(&result),
-                 cb));
+      base::Bind(&ActivityIconLoader::OnIconsReady,
+                 weak_ptr_factory_.GetWeakPtr(), base::Passed(&result), cb));
   return GetResult::SUCCEEDED_ASYNC;
 }
 
 void ActivityIconLoader::OnIconsResizedForTesting(
     const OnIconsReadyCallback& cb,
     std::unique_ptr<ActivityToIconsMap> result) {
   OnIconsResized(base::MakeUnique<ActivityToIconsMap>(), cb, std::move(result));
 }
 
 void ActivityIconLoader::AddCacheEntryForTesting(const ActivityName& activity) {
@@ skipping 15 matching lines @@
 }
 
 void ActivityIconLoader::OnIconsReady(
     std::unique_ptr<ActivityToIconsMap> cached_result,
     const OnIconsReadyCallback& cb,
     std::vector<mojom::ActivityIconPtr> icons) {
   DCHECK(thread_checker_.CalledOnValidThread());
   ArcServiceManager* manager = ArcServiceManager::Get();
   base::PostTaskAndReplyWithResult(
       manager->blocking_task_runner().get(), FROM_HERE,
-      base::Bind(&ActivityIconLoader::ResizeAndEncodeIcons,
-                 base::Passed(&icons)),
-      base::Bind(&ActivityIconLoader::OnIconsResized, this,
-                 base::Passed(&cached_result), cb));
-}
-
-// static
-std::unique_ptr<ActivityIconLoader::ActivityToIconsMap>
-ActivityIconLoader::ResizeAndEncodeIcons(
-    std::vector<mojom::ActivityIconPtr> icons) {
-  std::unique_ptr<ActivityToIconsMap> result(new ActivityToIconsMap);
-
-  for (size_t i = 0; i < icons.size(); ++i) {
-    static const size_t kBytesPerPixel = 4;
-    const mojom::ActivityIconPtr& icon = icons.at(i);
-    if (icon->width > kMaxIconSizeInPx || icon->height > kMaxIconSizeInPx ||
-        icon->width == 0 || icon->height == 0 ||
-        icon->icon.size() != (icon->width * icon->height * kBytesPerPixel)) {
-      continue;
-    }
-
-    SkBitmap bitmap;
-    bitmap.allocPixels(SkImageInfo::MakeN32Premul(icon->width, icon->height));
-    if (!bitmap.getPixels())
-      continue;
-    DCHECK_GE(bitmap.getSafeSize(), icon->icon.size());
-    memcpy(bitmap.getPixels(), &icon->icon.front(), icon->icon.size());
-
-    gfx::ImageSkia original(gfx::ImageSkia::CreateFrom1xBitmap(bitmap));
-
-    // Resize the original icon to the sizes intent_helper needs.
-    gfx::ImageSkia icon_large(gfx::ImageSkiaOperations::CreateResizedImage(
-        original, skia::ImageOperations::RESIZE_BEST,
-        gfx::Size(kLargeIconSizeInDip, kLargeIconSizeInDip)));
-    gfx::ImageSkia icon_small(gfx::ImageSkiaOperations::CreateResizedImage(
-        original, skia::ImageOperations::RESIZE_BEST,
-        gfx::Size(kSmallIconSizeInDip, kSmallIconSizeInDip)));
-    gfx::Image icon16(icon_small);
-    gfx::Image icon20(icon_large);
-
-    // Encode the icon as PNG data, and then as data: URL.
-    scoped_refptr<base::RefCountedMemory> img = icon16.As1xPNGBytes();
-    if (!img)
-      continue;
-    std::string encoded;
-    base::Base64Encode(base::StringPiece(img->front_as<char>(), img->size()),
-                       &encoded);
-    scoped_refptr<base::RefCountedData<GURL>> dataurl(
-        new base::RefCountedData<GURL>(GURL(kPngDataUrlPrefix + encoded)));
-
-    const std::string activity_name = icon->activity->activity_name.has_value()
-                                          ? (*icon->activity->activity_name)
-                                          : std::string();
-    result->insert(std::make_pair(
-        ActivityName(icon->activity->package_name, activity_name),
-        Icons(icon16, icon20, dataurl)));
-  }
-
-  return result;
+      base::Bind(&ResizeAndEncodeIcons, base::Passed(&icons)),
+      base::Bind(&ActivityIconLoader::OnIconsResized,
+                 weak_ptr_factory_.GetWeakPtr(), base::Passed(&cached_result),
+                 cb));
 }
 
 void ActivityIconLoader::OnIconsResized(
     std::unique_ptr<ActivityToIconsMap> cached_result,
     const OnIconsReadyCallback& cb,
     std::unique_ptr<ActivityToIconsMap> result) {
   DCHECK(thread_checker_.CalledOnValidThread());
   // Update |cached_icons_|.
   for (const auto& kv : *result) {
     cached_icons_.erase(kv.first);
     cached_icons_.insert(std::make_pair(kv.first, kv.second));
   }
 
   // Merge the results that were obtained from cache before doing IPC.
   result->insert(cached_result->begin(), cached_result->end());
   cb.Run(std::move(result));
 }
 
 }  // namespace arc