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

Side by Side Diff: extensions/browser/image_loader_unittest.cc

Issue 334053003: Moves extension_icon_image and image_loader to extensions/browser (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: polish Created 6 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 "chrome/browser/extensions/image_loader.h" 5 #include "extensions/browser/image_loader.h"
6 6
7 #include "base/files/file_path.h"
7 #include "base/json/json_file_value_serializer.h" 8 #include "base/json/json_file_value_serializer.h"
8 #include "base/message_loop/message_loop.h" 9 #include "base/message_loop/message_loop.h"
9 #include "base/path_service.h" 10 #include "base/path_service.h"
11 #include "base/strings/string_util.h"
10 #include "chrome/browser/chrome_notification_types.h" 12 #include "chrome/browser/chrome_notification_types.h"
11 #include "chrome/common/chrome_paths.h" 13 #include "chrome/common/chrome_paths.h"
12 #include "content/public/browser/notification_service.h" 14 #include "content/public/browser/notification_service.h"
13 #include "content/public/test/test_browser_thread.h" 15 #include "content/public/test/test_browser_thread.h"
16 #include "extensions/browser/component_extension_resource_manager.h"
14 #include "extensions/common/constants.h" 17 #include "extensions/common/constants.h"
15 #include "extensions/common/extension.h" 18 #include "extensions/common/extension.h"
16 #include "extensions/common/extension_icon_set.h" 19 #include "extensions/common/extension_icon_set.h"
17 #include "extensions/common/extension_resource.h" 20 #include "extensions/common/extension_resource.h"
18 #include "extensions/common/manifest.h" 21 #include "extensions/common/manifest.h"
19 #include "extensions/common/manifest_handlers/icons_handler.h" 22 #include "extensions/common/manifest_handlers/icons_handler.h"
20 #include "testing/gtest/include/gtest/gtest.h" 23 #include "testing/gtest/include/gtest/gtest.h"
21 #include "third_party/skia/include/core/SkBitmap.h" 24 #include "third_party/skia/include/core/SkBitmap.h"
22 #include "ui/file_manager/grit/file_manager_resources.h" 25 #include "ui/file_manager/grit/file_manager_resources.h"
23 #include "ui/gfx/image/image.h" 26 #include "ui/gfx/image/image.h"
24 #include "ui/gfx/image/image_family.h" 27 #include "ui/gfx/image/image_family.h"
25 #include "ui/gfx/image/image_skia.h" 28 #include "ui/gfx/image/image_skia.h"
26 #include "ui/gfx/size.h" 29 #include "ui/gfx/size.h"
27 30
28 using content::BrowserThread; 31 using content::BrowserThread;
29 using extensions::Extension; 32 using extensions::Extension;
30 using extensions::ExtensionResource; 33 using extensions::ExtensionResource;
31 using extensions::ImageLoader; 34 using extensions::ImageLoader;
32 using extensions::Manifest; 35 using extensions::Manifest;
33 using extensions::UnloadedExtensionInfo; 36 using extensions::UnloadedExtensionInfo;
34 37
38 namespace {
39
40 class TestingComponentExtensionResourceManager
41 : public extensions::ComponentExtensionResourceManager {
42 public:
43 static const int kResourceId;
44
45 TestingComponentExtensionResourceManager() {}
46 virtual ~TestingComponentExtensionResourceManager() {}
47
48 private:
49 // Overridden from extensions::ComponentExtensionResourceManager:
50 virtual bool IsComponentExtensionResource(
51 const base::FilePath& extension_path,
52 const base::FilePath& resource_path,
53 int* resource_id) OVERRIDE {
54 if (!EndsWith(extension_path.MaybeAsASCII(), "file_manager", false))
55 return false;
56 *resource_id = kResourceId;
57 return true;
58 }
59 };
60
61 const int TestingComponentExtensionResourceManager::kResourceId = 42;
62
63 }
64
35 class ImageLoaderTest : public testing::Test { 65 class ImageLoaderTest : public testing::Test {
36 public: 66 public:
37 ImageLoaderTest() 67 ImageLoaderTest()
38 : image_loaded_count_(0), 68 : image_loaded_count_(0),
39 quit_in_image_loaded_(false), 69 quit_in_image_loaded_(false),
40 ui_thread_(BrowserThread::UI, &ui_loop_), 70 ui_thread_(BrowserThread::UI, &ui_loop_),
41 file_thread_(BrowserThread::FILE), 71 file_thread_(BrowserThread::FILE),
42 io_thread_(BrowserThread::IO) { 72 io_thread_(BrowserThread::IO) {
43 } 73 }
44 74
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
104 } 134 }
105 135
106 gfx::Image image_; 136 gfx::Image image_;
107 gfx::ImageFamily image_family_; 137 gfx::ImageFamily image_family_;
108 138
109 private: 139 private:
110 virtual void SetUp() OVERRIDE { 140 virtual void SetUp() OVERRIDE {
111 testing::Test::SetUp(); 141 testing::Test::SetUp();
112 file_thread_.Start(); 142 file_thread_.Start();
113 io_thread_.Start(); 143 io_thread_.Start();
144 extensions::ComponentExtensionResourceManager::Set(
145 new TestingComponentExtensionResourceManager());
146 }
147
148 virtual void TearDown() OVERRIDE {
149 extensions::ComponentExtensionResourceManager::Set(NULL);
150 testing::Test::TearDown();
114 } 151 }
115 152
116 int image_loaded_count_; 153 int image_loaded_count_;
117 bool quit_in_image_loaded_; 154 bool quit_in_image_loaded_;
118 base::MessageLoop ui_loop_; 155 base::MessageLoop ui_loop_;
119 content::TestBrowserThread ui_thread_; 156 content::TestBrowserThread ui_thread_;
120 content::TestBrowserThread file_thread_; 157 content::TestBrowserThread file_thread_;
121 content::TestBrowserThread io_thread_; 158 content::TestBrowserThread io_thread_;
122 }; 159 };
123 160
(...skipping 195 matching lines...) Expand 10 before | Expand all | Expand 10 after
319 TEST_F(ImageLoaderTest, IsComponentExtensionResource) { 356 TEST_F(ImageLoaderTest, IsComponentExtensionResource) {
320 scoped_refptr<Extension> extension(CreateExtension( 357 scoped_refptr<Extension> extension(CreateExtension(
321 "file_manager", Manifest::COMPONENT)); 358 "file_manager", Manifest::COMPONENT));
322 ASSERT_TRUE(extension.get() != NULL); 359 ASSERT_TRUE(extension.get() != NULL);
323 360
324 ExtensionResource resource = extensions::IconsInfo::GetIconResource( 361 ExtensionResource resource = extensions::IconsInfo::GetIconResource(
325 extension.get(), 362 extension.get(),
326 extension_misc::EXTENSION_ICON_BITTY, 363 extension_misc::EXTENSION_ICON_BITTY,
327 ExtensionIconSet::MATCH_EXACTLY); 364 ExtensionIconSet::MATCH_EXACTLY);
328 365
329 #if defined(OS_CHROMEOS)
330 int resource_id; 366 int resource_id;
331 ASSERT_EQ(true, 367 ASSERT_TRUE(
332 ImageLoader::IsComponentExtensionResource(extension->path(), 368 ImageLoader::IsComponentExtensionResource(extension->path(),
333 resource.relative_path(), 369 resource.relative_path(),
334 &resource_id)); 370 &resource_id));
335 ASSERT_EQ(IDR_FILE_MANAGER_ICON_16, resource_id); 371 ASSERT_EQ(TestingComponentExtensionResourceManager::kResourceId, resource_id);
336 #endif
337 } 372 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698