Refactor ProfileInfoCache in c/b/profiles

chrome/browser/media/tab_desktop_media_list.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 "chrome/browser/media/tab_desktop_media_list.h"
 
 #include "base/hash.h"
 #include "base/threading/sequenced_worker_pool.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/grit/generated_resources.h"
 #include "components/favicon/content/content_favicon_driver.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/render_process_host.h"
 #include "media/base/video_util.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "third_party/skia/include/core/SkImage.h"
 #include "ui/base/l10n/l10n_util.h"
+#include "ui/gfx/image/image.h"
 
 using content::BrowserThread;
 using content::DesktopMediaID;
 
 namespace {
 
 gfx::ImageSkia CreateEnclosedFaviconImage(gfx::Size size,

[Mike Lerman, 2016/03/30 01:18:10]

Did these changes come from a rebase?

THis is why you always do rebases in their own patch ;)

[lwchkg, 2016/03/31 19:32:26]

Yes. The only thing I've done to this file is to add a #include.

                                           const gfx::ImageSkia& favicon) {
   DCHECK_GE(size.width(), 20);
   DCHECK_GE(size.height(), 20);
 
   // Create a bitmap.
   SkBitmap result;
   result.allocN32Pixels(size.width(), size.height(), true);
   SkCanvas canvas(result);
 
   // White background.
@@ skipping 129 matching lines @@
 
   // ScheduleNextRefresh() needs to be called after all calls for
   // UpdateSourceThumbnail() have done. Therefore, a DoNothing task is posted
   // to the same sequenced task runner that CreateEnlargedFaviconImag()
   // is posted.
   thumbnail_task_runner_.get()->PostTaskAndReply(
       FROM_HERE, base::Bind(&base::DoNothing),
       base::Bind(&TabDesktopMediaList::ScheduleNextRefresh,
                  weak_factory_.GetWeakPtr()));
 }