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

Side by Side Diff: chrome/common/extensions/api/extension_action/browser_action_manifest_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) 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/common/extensions/api/extension_action/action_info.h" 5 #include "chrome/common/extensions/api/extension_action/action_info.h"
6 #include "chrome/common/extensions/extension_builder.h" 6 #include "chrome/common/extensions/extension_builder.h"
7 #include "chrome/common/extensions/extension_icon_set.h" 7 #include "chrome/common/extensions/extension_icon_set.h"
8 #include "chrome/common/extensions/extension_manifest_constants.h" 8 #include "chrome/common/extensions/extension_manifest_constants.h"
9 #include "chrome/common/extensions/manifest_tests/extension_manifest_test.h" 9 #include "chrome/common/extensions/manifest_tests/extension_manifest_test.h"
10 #include "chrome/common/extensions/value_builder.h" 10 #include "chrome/common/extensions/value_builder.h"
(...skipping 15 matching lines...) Expand all
26 .SetManifest(DictionaryBuilder() 26 .SetManifest(DictionaryBuilder()
27 .Set("name", "No default properties") 27 .Set("name", "No default properties")
28 .Set("version", "1.0.0") 28 .Set("version", "1.0.0")
29 .Set("manifest_version", 2) 29 .Set("manifest_version", 2)
30 .Set("browser_action", DictionaryBuilder() 30 .Set("browser_action", DictionaryBuilder()
31 .Set("default_title", "Title"))) 31 .Set("default_title", "Title")))
32 .Build(); 32 .Build();
33 33
34 ASSERT_TRUE(extension.get()); 34 ASSERT_TRUE(extension.get());
35 const ActionInfo* browser_action_info = 35 const ActionInfo* browser_action_info =
36 ActionInfo::GetBrowserActionInfo(extension); 36 ActionInfo::GetBrowserActionInfo(extension.get());
37 ASSERT_TRUE(browser_action_info); 37 ASSERT_TRUE(browser_action_info);
38 EXPECT_TRUE(browser_action_info->default_icon.empty()); 38 EXPECT_TRUE(browser_action_info->default_icon.empty());
39 } 39 }
40 40
41 TEST_F(BrowserActionManifestTest, 41 TEST_F(BrowserActionManifestTest,
42 BrowserActionManifestIcons_StringDefaultIcon) { 42 BrowserActionManifestIcons_StringDefaultIcon) {
43 scoped_refptr<const Extension> extension = 43 scoped_refptr<const Extension> extension =
44 ExtensionBuilder() 44 ExtensionBuilder()
45 .SetManifest(DictionaryBuilder() 45 .SetManifest(DictionaryBuilder()
46 .Set("name", "String default icon") 46 .Set("name", "String default icon")
47 .Set("version", "1.0.0") 47 .Set("version", "1.0.0")
48 .Set("manifest_version", 2) 48 .Set("manifest_version", 2)
49 .Set("browser_action", DictionaryBuilder() 49 .Set("browser_action", DictionaryBuilder()
50 .Set("default_icon", "icon.png"))) 50 .Set("default_icon", "icon.png")))
51 .Build(); 51 .Build();
52 52
53 ASSERT_TRUE(extension.get()); 53 ASSERT_TRUE(extension.get());
54 const ActionInfo* browser_action_info = 54 const ActionInfo* browser_action_info =
55 ActionInfo::GetBrowserActionInfo(extension); 55 ActionInfo::GetBrowserActionInfo(extension.get());
56 ASSERT_TRUE(browser_action_info); 56 ASSERT_TRUE(browser_action_info);
57 ASSERT_FALSE(browser_action_info->default_icon.empty()); 57 ASSERT_FALSE(browser_action_info->default_icon.empty());
58 58
59 const ExtensionIconSet& icons = browser_action_info->default_icon; 59 const ExtensionIconSet& icons = browser_action_info->default_icon;
60 60
61 EXPECT_EQ(1u, icons.map().size()); 61 EXPECT_EQ(1u, icons.map().size());
62 EXPECT_EQ("icon.png", icons.Get(19, ExtensionIconSet::MATCH_EXACTLY)); 62 EXPECT_EQ("icon.png", icons.Get(19, ExtensionIconSet::MATCH_EXACTLY));
63 } 63 }
64 64
65 TEST_F(BrowserActionManifestTest, 65 TEST_F(BrowserActionManifestTest,
66 BrowserActionManifestIcons_DictDefaultIcon) { 66 BrowserActionManifestIcons_DictDefaultIcon) {
67 scoped_refptr<const Extension> extension = 67 scoped_refptr<const Extension> extension =
68 ExtensionBuilder() 68 ExtensionBuilder()
69 .SetManifest(DictionaryBuilder() 69 .SetManifest(DictionaryBuilder()
70 .Set("name", "Dictionary default icon") 70 .Set("name", "Dictionary default icon")
71 .Set("version", "1.0.0") 71 .Set("version", "1.0.0")
72 .Set("manifest_version", 2) 72 .Set("manifest_version", 2)
73 .Set("browser_action", DictionaryBuilder() 73 .Set("browser_action", DictionaryBuilder()
74 .Set("default_icon", DictionaryBuilder() 74 .Set("default_icon", DictionaryBuilder()
75 .Set("19", "icon19.png") 75 .Set("19", "icon19.png")
76 .Set("24", "icon24.png") // Should be ignored. 76 .Set("24", "icon24.png") // Should be ignored.
77 .Set("38", "icon38.png")))) 77 .Set("38", "icon38.png"))))
78 .Build(); 78 .Build();
79 79
80 ASSERT_TRUE(extension.get()); 80 ASSERT_TRUE(extension.get());
81 const ActionInfo* browser_action_info = 81 const ActionInfo* browser_action_info =
82 ActionInfo::GetBrowserActionInfo(extension); 82 ActionInfo::GetBrowserActionInfo(extension.get());
83 ASSERT_TRUE(browser_action_info); 83 ASSERT_TRUE(browser_action_info);
84 ASSERT_FALSE(browser_action_info->default_icon.empty()); 84 ASSERT_FALSE(browser_action_info->default_icon.empty());
85 85
86 const ExtensionIconSet& icons = browser_action_info->default_icon; 86 const ExtensionIconSet& icons = browser_action_info->default_icon;
87 87
88 // 24px icon should be ignored. 88 // 24px icon should be ignored.
89 EXPECT_EQ(2u, icons.map().size()); 89 EXPECT_EQ(2u, icons.map().size());
90 EXPECT_EQ("icon19.png", icons.Get(19, ExtensionIconSet::MATCH_EXACTLY)); 90 EXPECT_EQ("icon19.png", icons.Get(19, ExtensionIconSet::MATCH_EXACTLY));
91 EXPECT_EQ("icon38.png", icons.Get(38, ExtensionIconSet::MATCH_EXACTLY)); 91 EXPECT_EQ("icon38.png", icons.Get(38, ExtensionIconSet::MATCH_EXACTLY));
92 } 92 }
(...skipping 10 matching lines...) Expand all
103 .Set("24", "icon24.png").Set("38", "icon38.png"))).Build(); 103 .Set("24", "icon24.png").Set("38", "icon38.png"))).Build();
104 104
105 string16 error = ErrorUtils::FormatErrorMessageUTF16( 105 string16 error = ErrorUtils::FormatErrorMessageUTF16(
106 errors::kInvalidIconPath, "19"); 106 errors::kInvalidIconPath, "19");
107 LoadAndExpectError(Manifest(manifest_value.get(), "Invalid default icon"), 107 LoadAndExpectError(Manifest(manifest_value.get(), "Invalid default icon"),
108 errors::kInvalidIconPath); 108 errors::kInvalidIconPath);
109 } 109 }
110 110
111 } // namespace 111 } // namespace
112 } // namespace extensions 112 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698