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

Side by Side Diff: chrome/common/extensions/api/commands/commands_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/manifest_tests/extension_manifest_test.h" 5 #include "chrome/common/extensions/manifest_tests/extension_manifest_test.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/string_util.h" 8 #include "base/string_util.h"
9 #include "chrome/common/chrome_switches.h" 9 #include "chrome/common/chrome_switches.h"
10 #include "chrome/common/extensions/api/commands/commands_handler.h" 10 #include "chrome/common/extensions/api/commands/commands_handler.h"
(...skipping 14 matching lines...) Expand all
25 #endif 25 #endif
26 26
27 const ui::Accelerator ctrl_f = ui::Accelerator(ui::VKEY_F, ctrl); 27 const ui::Accelerator ctrl_f = ui::Accelerator(ui::VKEY_F, ctrl);
28 const ui::Accelerator ctrl_shift_f = 28 const ui::Accelerator ctrl_shift_f =
29 ui::Accelerator(ui::VKEY_F, ctrl | ui::EF_SHIFT_DOWN); 29 ui::Accelerator(ui::VKEY_F, ctrl | ui::EF_SHIFT_DOWN);
30 const ui::Accelerator alt_shift_f = 30 const ui::Accelerator alt_shift_f =
31 ui::Accelerator(ui::VKEY_F, ui::EF_ALT_DOWN | ui::EF_SHIFT_DOWN); 31 ui::Accelerator(ui::VKEY_F, ui::EF_ALT_DOWN | ui::EF_SHIFT_DOWN);
32 32
33 scoped_refptr<Extension> extension = 33 scoped_refptr<Extension> extension =
34 LoadAndExpectSuccess("command_simple.json"); 34 LoadAndExpectSuccess("command_simple.json");
35 ASSERT_TRUE(extension); 35 ASSERT_TRUE(extension.get());
36 36
37 const CommandMap* commands = CommandsInfo::GetNamedCommands(extension); 37 const CommandMap* commands = CommandsInfo::GetNamedCommands(extension.get());
38 ASSERT_TRUE(commands); 38 ASSERT_TRUE(commands);
39 ASSERT_EQ(1u, commands->size()); 39 ASSERT_EQ(1u, commands->size());
40 CommandMap::const_iterator iter = commands->begin(); 40 CommandMap::const_iterator iter = commands->begin();
41 ASSERT_TRUE(commands->end() != iter); 41 ASSERT_TRUE(commands->end() != iter);
42 const Command* named_command = &(*iter).second; 42 const Command* named_command = &(*iter).second;
43 ASSERT_STREQ("feature1", named_command->command_name().c_str()); 43 ASSERT_STREQ("feature1", named_command->command_name().c_str());
44 ASSERT_STREQ("desc", UTF16ToASCII(named_command->description()).c_str()); 44 ASSERT_STREQ("desc", UTF16ToASCII(named_command->description()).c_str());
45 ASSERT_EQ(ctrl_shift_f, named_command->accelerator()); 45 ASSERT_EQ(ctrl_shift_f, named_command->accelerator());
46 46
47 const Command* browser_action = 47 const Command* browser_action =
48 CommandsInfo::GetBrowserActionCommand(extension); 48 CommandsInfo::GetBrowserActionCommand(extension.get());
49 ASSERT_TRUE(NULL != browser_action); 49 ASSERT_TRUE(NULL != browser_action);
50 ASSERT_STREQ("_execute_browser_action", 50 ASSERT_STREQ("_execute_browser_action",
51 browser_action->command_name().c_str()); 51 browser_action->command_name().c_str());
52 ASSERT_STREQ("", UTF16ToASCII(browser_action->description()).c_str()); 52 ASSERT_STREQ("", UTF16ToASCII(browser_action->description()).c_str());
53 ASSERT_EQ(alt_shift_f, browser_action->accelerator()); 53 ASSERT_EQ(alt_shift_f, browser_action->accelerator());
54 54
55 const Command* page_action = CommandsInfo::GetPageActionCommand(extension); 55 const Command* page_action =
56 CommandsInfo::GetPageActionCommand(extension.get());
56 ASSERT_TRUE(NULL != page_action); 57 ASSERT_TRUE(NULL != page_action);
57 ASSERT_STREQ("_execute_page_action", 58 ASSERT_STREQ("_execute_page_action",
58 page_action->command_name().c_str()); 59 page_action->command_name().c_str());
59 ASSERT_STREQ("", UTF16ToASCII(page_action->description()).c_str()); 60 ASSERT_STREQ("", UTF16ToASCII(page_action->description()).c_str());
60 ASSERT_EQ(ctrl_f, page_action->accelerator()); 61 ASSERT_EQ(ctrl_f, page_action->accelerator());
61 } 62 }
62 63
63 TEST_F(CommandsManifestTest, CommandManifestShortcutsTooMany) { 64 TEST_F(CommandsManifestTest, CommandManifestShortcutsTooMany) {
64 LoadAndExpectError("command_too_many.json", 65 LoadAndExpectError("command_too_many.json",
65 errors::kInvalidKeyBindingTooMany); 66 errors::kInvalidKeyBindingTooMany);
(...skipping 13 matching lines...) Expand all
79 LoadAndExpectError("command_reject_just_shift.json", 80 LoadAndExpectError("command_reject_just_shift.json",
80 errors::kInvalidKeyBinding); 81 errors::kInvalidKeyBinding);
81 } 82 }
82 83
83 TEST_F(CommandsManifestTest, BrowserActionSynthesizesCommand) { 84 TEST_F(CommandsManifestTest, BrowserActionSynthesizesCommand) {
84 scoped_refptr<Extension> extension = 85 scoped_refptr<Extension> extension =
85 LoadAndExpectSuccess("browser_action_synthesizes_command.json"); 86 LoadAndExpectSuccess("browser_action_synthesizes_command.json");
86 // An extension with a browser action but no extension command specified 87 // An extension with a browser action but no extension command specified
87 // should get a command assigned to it. 88 // should get a command assigned to it.
88 const extensions::Command* command = 89 const extensions::Command* command =
89 CommandsInfo::GetBrowserActionCommand(extension); 90 CommandsInfo::GetBrowserActionCommand(extension.get());
90 ASSERT_TRUE(command != NULL); 91 ASSERT_TRUE(command != NULL);
91 ASSERT_EQ(ui::VKEY_UNKNOWN, command->accelerator().key_code()); 92 ASSERT_EQ(ui::VKEY_UNKNOWN, command->accelerator().key_code());
92 } 93 }
93 94
94 } // namespace extensions 95 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698