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

Side by Side Diff: chrome/browser/extensions/image_loading_tracker_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 "chrome/browser/browser_thread.h" 7 #include "chrome/browser/browser_thread.h"
8 #include "chrome/browser/extensions/image_loading_tracker.h" 8 #include "chrome/browser/extensions/image_loading_tracker.h"
9 #include "chrome/common/chrome_paths.h" 9 #include "chrome/common/chrome_paths.h"
10 #include "chrome/common/extensions/extension.h" 10 #include "chrome/common/extensions/extension.h"
11 #include "chrome/common/extensions/extension_icon_set.h" 11 #include "chrome/common/extensions/extension_icon_set.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 "chrome/common/notification_service.h" 14 #include "chrome/common/notification_service.h"
15 #include "chrome/common/notification_type.h" 15 #include "chrome/common/notification_type.h"
16 #include "gfx/size.h"
17 #include "testing/gtest/include/gtest/gtest.h" 16 #include "testing/gtest/include/gtest/gtest.h"
18 #include "third_party/skia/include/core/SkBitmap.h" 17 #include "third_party/skia/include/core/SkBitmap.h"
18 #include "ui/gfx/size.h"
19 19
20 class ImageLoadingTrackerTest : public testing::Test, 20 class ImageLoadingTrackerTest : public testing::Test,
21 public ImageLoadingTracker::Observer { 21 public ImageLoadingTracker::Observer {
22 public: 22 public:
23 ImageLoadingTrackerTest() 23 ImageLoadingTrackerTest()
24 : image_loaded_count_(0), 24 : image_loaded_count_(0),
25 quit_in_image_loaded_(false), 25 quit_in_image_loaded_(false),
26 ui_thread_(BrowserThread::UI, &ui_loop_), 26 ui_thread_(BrowserThread::UI, &ui_loop_),
27 file_thread_(BrowserThread::FILE), 27 file_thread_(BrowserThread::FILE),
28 io_thread_(BrowserThread::IO) { 28 io_thread_(BrowserThread::IO) {
(...skipping 144 matching lines...) Expand 10 before | Expand all | Expand 10 after
173 173
174 WaitForImageLoad(); 174 WaitForImageLoad();
175 175
176 // Even though we deleted the extension, we should still get the image. 176 // Even though we deleted the extension, we should still get the image.
177 // We should still have gotten the image. 177 // We should still have gotten the image.
178 EXPECT_EQ(1, image_loaded_count()); 178 EXPECT_EQ(1, image_loaded_count());
179 179
180 // Check that the image was loaded. 180 // Check that the image was loaded.
181 EXPECT_EQ(Extension::EXTENSION_ICON_SMALLISH, image_.width()); 181 EXPECT_EQ(Extension::EXTENSION_ICON_SMALLISH, image_.width());
182 } 182 }
OLDNEW
« no previous file with comments | « chrome/browser/extensions/extensions_ui.cc ('k') | chrome/browser/extensions/sandboxed_extension_unpacker.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698