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

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

Issue 10500016: Move test_browser_thread.h from content\test to content\public\test. This way we can enforce that i… (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 8 years, 6 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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/json/json_file_value_serializer.h" 5 #include "base/json/json_file_value_serializer.h"
6 #include "base/message_loop.h" 6 #include "base/message_loop.h"
7 #include "base/path_service.h" 7 #include "base/path_service.h"
8 #include "base/values.h" 8 #include "base/values.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 "content/test/test_browser_thread.h" 13 #include "content/public/test/test_browser_thread.h"
14 #include "testing/gtest/include/gtest/gtest.h" 14 #include "testing/gtest/include/gtest/gtest.h"
15 #include "ui/gfx/skia_util.h" 15 #include "ui/gfx/skia_util.h"
16 16
17 using content::BrowserThread; 17 using content::BrowserThread;
18 using extensions::Extension; 18 using extensions::Extension;
19 19
20 // Our test class that takes care of managing the necessary threads for loading 20 // Our test class that takes care of managing the necessary threads for loading
21 // extension icons, and waiting for those loads to happen. 21 // extension icons, and waiting for those loads to happen.
22 class ExtensionIconManagerTest : public testing::Test { 22 class ExtensionIconManagerTest : public testing::Test {
23 public: 23 public:
(...skipping 149 matching lines...) Expand 10 before | Expand all | Expand 10 after
173 // Now re-load the icon - we should get the same result bitmap (and not the 173 // Now re-load the icon - we should get the same result bitmap (and not the
174 // default icon). 174 // default icon).
175 icon_manager.LoadIcon(extension.get()); 175 icon_manager.LoadIcon(extension.get());
176 WaitForImageLoad(); 176 WaitForImageLoad();
177 SkBitmap second_icon = icon_manager.GetIcon(extension->id()); 177 SkBitmap second_icon = icon_manager.GetIcon(extension->id());
178 EXPECT_FALSE(gfx::BitmapsAreEqual(second_icon, default_icon)); 178 EXPECT_FALSE(gfx::BitmapsAreEqual(second_icon, default_icon));
179 179
180 EXPECT_TRUE(gfx::BitmapsAreEqual(first_icon, second_icon)); 180 EXPECT_TRUE(gfx::BitmapsAreEqual(first_icon, second_icon));
181 } 181 }
182 #endif 182 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698