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

Side by Side Diff: chrome/browser/extensions/image_loading_tracker_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 "chrome/browser/extensions/image_loading_tracker.h" 8 #include "chrome/browser/extensions/image_loading_tracker.h"
9 #include "chrome/common/chrome_notification_types.h" 9 #include "chrome/common/chrome_notification_types.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_icon_set.h" 12 #include "chrome/common/extensions/extension_icon_set.h"
13 #include "chrome/common/extensions/extension_resource.h" 13 #include "chrome/common/extensions/extension_resource.h"
14 #include "content/public/browser/notification_service.h" 14 #include "content/public/browser/notification_service.h"
15 #include "content/test/test_browser_thread.h" 15 #include "content/public/test/test_browser_thread.h"
16 #include "grit/component_extension_resources.h" 16 #include "grit/component_extension_resources.h"
17 #include "testing/gtest/include/gtest/gtest.h" 17 #include "testing/gtest/include/gtest/gtest.h"
18 #include "third_party/skia/include/core/SkBitmap.h" 18 #include "third_party/skia/include/core/SkBitmap.h"
19 #include "ui/gfx/image/image.h" 19 #include "ui/gfx/image/image.h"
20 #include "ui/gfx/image/image_skia.h" 20 #include "ui/gfx/image/image_skia.h"
21 #include "ui/gfx/size.h" 21 #include "ui/gfx/size.h"
22 22
23 using content::BrowserThread; 23 using content::BrowserThread;
24 using extensions::Extension; 24 using extensions::Extension;
25 25
(...skipping 217 matching lines...) Expand 10 before | Expand all | Expand 10 after
243 #if defined(FILE_MANAGER_EXTENSION) 243 #if defined(FILE_MANAGER_EXTENSION)
244 ImageLoadingTracker loader(this); 244 ImageLoadingTracker loader(this);
245 int resource_id; 245 int resource_id;
246 ASSERT_EQ(true, 246 ASSERT_EQ(true,
247 loader.IsComponentExtensionResource(extension.get(), 247 loader.IsComponentExtensionResource(extension.get(),
248 resource, 248 resource,
249 resource_id)); 249 resource_id));
250 ASSERT_EQ(IDR_FILE_MANAGER_ICON_16, resource_id); 250 ASSERT_EQ(IDR_FILE_MANAGER_ICON_16, resource_id);
251 #endif 251 #endif
252 } 252 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698