Task manager's apps and extensions should show the correct favicon

extensions/browser/test_image_loader.h

Index: extensions/browser/test_image_loader.h
diff --git a/extensions/browser/test_image_loader.h b/extensions/browser/test_image_loader.h
new file mode 100644
index 0000000000000000000000000000000000000000..89003286514ed55740d1e996c59a16ae4d2d7d2a
--- /dev/null
+++ b/extensions/browser/test_image_loader.h
@@ -0,0 +1,44 @@
+// 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 EXTENSIONS_BROWSER_TEST_IMAGE_LOADER_H_
+#define EXTENSIONS_BROWSER_TEST_IMAGE_LOADER_H_
+
+#include "base/run_loop.h"
+#include "ui/gfx/image/image.h"
+
+namespace extensions {
+
+class Extension;
+
+// Helper class for synchronously loading an extension image resource.
+class TestImageLoader {
+ public:
+  TestImageLoader();
+  ~TestImageLoader();
+
+  // Loads an image to be used in test from |extension|.
+  // The image will be loaded from the relative path |image_path|.
+  static SkBitmap LoadAndGetExtensionBitmap(const Extension* extension,
+                                            const std::string& image_path,
+                                            int size);
+
+ private:
+  void OnImageLoaded(const gfx::Image& image);
+
+  SkBitmap LoadAndGetBitmap(const Extension* extension,
+                            const std::string& path,
+                            int size);
+
+  gfx::Image image_;
+  base::Closure loader_message_loop_quit_;
+  bool waiting_;
+  bool image_loaded_;
+
+  DISALLOW_COPY_AND_ASSIGN(TestImageLoader);
+};
+
+}  // namespace extensions
+
+#endif  // EXTENSIONS_BROWSER_TEST_IMAGE_LOADER_H_