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

Side by Side Diff: chrome/common/extensions/manifest_tests/extension_manifests_icons_unittest.cc

Issue 15836003: Update chrome/ to use scoped_refptr<T>::get() rather than implicit "operator T*" (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased Created 7 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) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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/memory/linked_ptr.h" 5 #include "base/memory/linked_ptr.h"
6 #include "chrome/common/extensions/extension.h" 6 #include "chrome/common/extensions/extension.h"
7 #include "chrome/common/extensions/extension_constants.h" 7 #include "chrome/common/extensions/extension_constants.h"
8 #include "chrome/common/extensions/extension_icon_set.h" 8 #include "chrome/common/extensions/extension_icon_set.h"
9 #include "chrome/common/extensions/manifest_handlers/icons_handler.h" 9 #include "chrome/common/extensions/manifest_handlers/icons_handler.h"
10 #include "chrome/common/extensions/manifest_tests/extension_manifest_test.h" 10 #include "chrome/common/extensions/manifest_tests/extension_manifest_test.h"
11 #include "testing/gtest/include/gtest/gtest.h" 11 #include "testing/gtest/include/gtest/gtest.h"
12 12
13 namespace extensions { 13 namespace extensions {
14 14
15 class IconsManifestTest : public ExtensionManifestTest { 15 class IconsManifestTest : public ExtensionManifestTest {
16 }; 16 };
17 17
18 TEST_F(IconsManifestTest, NormalizeIconPaths) { 18 TEST_F(IconsManifestTest, NormalizeIconPaths) {
19 scoped_refptr<extensions::Extension> extension( 19 scoped_refptr<extensions::Extension> extension(
20 LoadAndExpectSuccess("normalize_icon_paths.json")); 20 LoadAndExpectSuccess("normalize_icon_paths.json"));
21 const ExtensionIconSet& icons = IconsInfo::GetIcons(extension); 21 const ExtensionIconSet& icons = IconsInfo::GetIcons(extension.get());
22 22
23 EXPECT_EQ("16.png", icons.Get(extension_misc::EXTENSION_ICON_BITTY, 23 EXPECT_EQ("16.png", icons.Get(extension_misc::EXTENSION_ICON_BITTY,
24 ExtensionIconSet::MATCH_EXACTLY)); 24 ExtensionIconSet::MATCH_EXACTLY));
25 EXPECT_EQ("48.png", icons.Get(extension_misc::EXTENSION_ICON_MEDIUM, 25 EXPECT_EQ("48.png", icons.Get(extension_misc::EXTENSION_ICON_MEDIUM,
26 ExtensionIconSet::MATCH_EXACTLY)); 26 ExtensionIconSet::MATCH_EXACTLY));
27 } 27 }
28 28
29 TEST_F(IconsManifestTest, InvalidIconSizes) { 29 TEST_F(IconsManifestTest, InvalidIconSizes) {
30 scoped_refptr<extensions::Extension> extension( 30 scoped_refptr<extensions::Extension> extension(
31 LoadAndExpectSuccess("init_ignored_icon_size.json")); 31 LoadAndExpectSuccess("init_ignored_icon_size.json"));
32 EXPECT_EQ("", IconsInfo::GetIcons(extension).Get( 32 EXPECT_EQ("",
33 300, ExtensionIconSet::MATCH_EXACTLY)); 33 IconsInfo::GetIcons(extension.get())
34 .Get(300, ExtensionIconSet::MATCH_EXACTLY));
34 } 35 }
35 36
36 TEST_F(IconsManifestTest, ValidIconSizes) { 37 TEST_F(IconsManifestTest, ValidIconSizes) {
37 scoped_refptr<extensions::Extension> extension( 38 scoped_refptr<extensions::Extension> extension(
38 LoadAndExpectSuccess("init_valid_icon_size.json")); 39 LoadAndExpectSuccess("init_valid_icon_size.json"));
39 const ExtensionIconSet& icons = IconsInfo::GetIcons(extension); 40 const ExtensionIconSet& icons = IconsInfo::GetIcons(extension.get());
40 41
41 EXPECT_EQ("16.png", icons.Get(extension_misc::EXTENSION_ICON_BITTY, 42 EXPECT_EQ("16.png", icons.Get(extension_misc::EXTENSION_ICON_BITTY,
42 ExtensionIconSet::MATCH_EXACTLY)); 43 ExtensionIconSet::MATCH_EXACTLY));
43 EXPECT_EQ("24.png", icons.Get(extension_misc::EXTENSION_ICON_SMALLISH, 44 EXPECT_EQ("24.png", icons.Get(extension_misc::EXTENSION_ICON_SMALLISH,
44 ExtensionIconSet::MATCH_EXACTLY)); 45 ExtensionIconSet::MATCH_EXACTLY));
45 EXPECT_EQ("32.png", icons.Get(extension_misc::EXTENSION_ICON_SMALL, 46 EXPECT_EQ("32.png", icons.Get(extension_misc::EXTENSION_ICON_SMALL,
46 ExtensionIconSet::MATCH_EXACTLY)); 47 ExtensionIconSet::MATCH_EXACTLY));
47 EXPECT_EQ("48.png", icons.Get(extension_misc::EXTENSION_ICON_MEDIUM, 48 EXPECT_EQ("48.png", icons.Get(extension_misc::EXTENSION_ICON_MEDIUM,
48 ExtensionIconSet::MATCH_EXACTLY)); 49 ExtensionIconSet::MATCH_EXACTLY));
49 EXPECT_EQ("128.png", icons.Get(extension_misc::EXTENSION_ICON_LARGE, 50 EXPECT_EQ("128.png", icons.Get(extension_misc::EXTENSION_ICON_LARGE,
50 ExtensionIconSet::MATCH_EXACTLY)); 51 ExtensionIconSet::MATCH_EXACTLY));
51 EXPECT_EQ("256.png", icons.Get(extension_misc::EXTENSION_ICON_EXTRA_LARGE, 52 EXPECT_EQ("256.png", icons.Get(extension_misc::EXTENSION_ICON_EXTRA_LARGE,
52 ExtensionIconSet::MATCH_EXACTLY)); 53 ExtensionIconSet::MATCH_EXACTLY));
53 EXPECT_EQ("512.png", icons.Get(extension_misc::EXTENSION_ICON_GIGANTOR, 54 EXPECT_EQ("512.png", icons.Get(extension_misc::EXTENSION_ICON_GIGANTOR,
54 ExtensionIconSet::MATCH_EXACTLY)); 55 ExtensionIconSet::MATCH_EXACTLY));
55 } 56 }
56 57
57 } // namespace extensions 58 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698