chrome/common/extensions/api/commands/commands_manifest_unittest.cc - Issue 15836003: Update chrome/ to use scoped_refptr<T>::get() rather than implicit "operator T*"

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified 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, 7 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/common/cancelable_task_tracker_unittest.cc ('k') | chrome/common/extensions/api/extension_action/browser_action_manifest_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/common/extensions/api/commands/commands_manifest_unittest.cc

diff --git a/chrome/common/extensions/api/commands/commands_manifest_unittest.cc b/chrome/common/extensions/api/commands/commands_manifest_unittest.cc

index 02d34894169277e6a3df9a227af14dabe3180da9..21b79c6619c6e563de8dcd6d0947bec9107f8661 100644

--- a/chrome/common/extensions/api/commands/commands_manifest_unittest.cc

+++ b/chrome/common/extensions/api/commands/commands_manifest_unittest.cc

@@ -32,9 +32,9 @@ TEST_F(CommandsManifestTest, CommandManifestSimple) {

scoped_refptr<Extension> extension =

LoadAndExpectSuccess("command_simple.json");

- ASSERT_TRUE(extension);

+ ASSERT_TRUE(extension.get());

- const CommandMap* commands = CommandsInfo::GetNamedCommands(extension);

+ const CommandMap* commands = CommandsInfo::GetNamedCommands(extension.get());

ASSERT_TRUE(commands);

ASSERT_EQ(1u, commands->size());

CommandMap::const_iterator iter = commands->begin();

@@ -45,14 +45,15 @@ TEST_F(CommandsManifestTest, CommandManifestSimple) {

ASSERT_EQ(ctrl_shift_f, named_command->accelerator());

const Command* browser_action =

- CommandsInfo::GetBrowserActionCommand(extension);

+ CommandsInfo::GetBrowserActionCommand(extension.get());

ASSERT_TRUE(NULL != browser_action);

ASSERT_STREQ("_execute_browser_action",

browser_action->command_name().c_str());

ASSERT_STREQ("", UTF16ToASCII(browser_action->description()).c_str());

ASSERT_EQ(alt_shift_f, browser_action->accelerator());

- const Command* page_action = CommandsInfo::GetPageActionCommand(extension);

+ const Command* page_action =

+ CommandsInfo::GetPageActionCommand(extension.get());

ASSERT_TRUE(NULL != page_action);

ASSERT_STREQ("_execute_page_action",

page_action->command_name().c_str());

@@ -86,7 +87,7 @@ TEST_F(CommandsManifestTest, BrowserActionSynthesizesCommand) {

// An extension with a browser action but no extension command specified

// should get a command assigned to it.

const extensions::Command* command =

- CommandsInfo::GetBrowserActionCommand(extension);

+ CommandsInfo::GetBrowserActionCommand(extension.get());

ASSERT_TRUE(command != NULL);

ASSERT_EQ(ui::VKEY_UNKNOWN, command->accelerator().key_code());

}