Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(414)

Side by Side Diff: chrome/browser/extensions/extension_icon_manager_unittest.cc

Issue 6312156: Change includes of gfx/* to ui/gfx/* (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "base/message_loop.h" 5 #include "base/message_loop.h"
6 #include "base/path_service.h" 6 #include "base/path_service.h"
7 #include "base/values.h" 7 #include "base/values.h"
8 #include "chrome/browser/browser_thread.h" 8 #include "chrome/browser/browser_thread.h"
9 #include "chrome/browser/extensions/extension_icon_manager.h" 9 #include "chrome/browser/extensions/extension_icon_manager.h"
10 #include "chrome/common/chrome_paths.h" 10 #include "chrome/common/chrome_paths.h"
11 #include "chrome/common/extensions/extension.h" 11 #include "chrome/common/extensions/extension.h"
12 #include "chrome/common/extensions/extension_resource.h" 12 #include "chrome/common/extensions/extension_resource.h"
13 #include "chrome/common/json_value_serializer.h" 13 #include "chrome/common/json_value_serializer.h"
14 #include "gfx/skia_util.h"
15 #include "testing/gtest/include/gtest/gtest.h" 14 #include "testing/gtest/include/gtest/gtest.h"
15 #include "ui/gfx/skia_util.h"
16 16
17 // Our test class that takes care of managing the necessary threads for loading 17 // Our test class that takes care of managing the necessary threads for loading
18 // extension icons, and waiting for those loads to happen. 18 // extension icons, and waiting for those loads to happen.
19 class ExtensionIconManagerTest : public testing::Test { 19 class ExtensionIconManagerTest : public testing::Test {
20 public: 20 public:
21 ExtensionIconManagerTest() : 21 ExtensionIconManagerTest() :
22 unwaited_image_loads_(0), 22 unwaited_image_loads_(0),
23 waiting_(false), 23 waiting_(false),
24 ui_thread_(BrowserThread::UI, &ui_loop_), 24 ui_thread_(BrowserThread::UI, &ui_loop_),
25 file_thread_(BrowserThread::FILE), 25 file_thread_(BrowserThread::FILE),
(...skipping 100 matching lines...) Expand 10 before | Expand all | Expand 10 after
126 126
127 // Now re-load the icon - we should get the same result bitmap (and not the 127 // Now re-load the icon - we should get the same result bitmap (and not the
128 // default icon). 128 // default icon).
129 icon_manager.LoadIcon(extension.get()); 129 icon_manager.LoadIcon(extension.get());
130 WaitForImageLoad(); 130 WaitForImageLoad();
131 SkBitmap second_icon = icon_manager.GetIcon(extension->id()); 131 SkBitmap second_icon = icon_manager.GetIcon(extension->id());
132 EXPECT_FALSE(gfx::BitmapsAreEqual(second_icon, default_icon)); 132 EXPECT_FALSE(gfx::BitmapsAreEqual(second_icon, default_icon));
133 133
134 EXPECT_TRUE(gfx::BitmapsAreEqual(first_icon, second_icon)); 134 EXPECT_TRUE(gfx::BitmapsAreEqual(first_icon, second_icon));
135 } 135 }
OLDNEW
« no previous file with comments | « chrome/browser/extensions/extension_icon_manager.cc ('k') | chrome/browser/extensions/extension_install_ui.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698