summaryrefslogtreecommitdiffstats
path: root/chrome/browser/extensions/api/declarative_content/content_action_unittest.cc
diff options
context:
space:
mode:
authorrsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-02 21:15:09 +0000
committerrsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-02 21:15:09 +0000
commitdc24976fc87171d50b49f37bbaaa23ae53e51f4b (patch)
tree8d7c684afa0d65e22efc3384197ef5b50d867160 /chrome/browser/extensions/api/declarative_content/content_action_unittest.cc
parentfc72bb18b111ff63e57135d97de6d59291f3b7b8 (diff)
downloadchromium_src-dc24976fc87171d50b49f37bbaaa23ae53e51f4b.zip
chromium_src-dc24976fc87171d50b49f37bbaaa23ae53e51f4b.tar.gz
chromium_src-dc24976fc87171d50b49f37bbaaa23ae53e51f4b.tar.bz2
Update chrome/ to use scoped_refptr<T>::get() rather than implicit "operator T*"
Linux fixes, Part 2 of N BUG=110610 TBR=darin Review URL: https://chromiumcodereview.appspot.com/16295003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@203625 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/api/declarative_content/content_action_unittest.cc')
-rw-r--r--chrome/browser/extensions/api/declarative_content/content_action_unittest.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/chrome/browser/extensions/api/declarative_content/content_action_unittest.cc b/chrome/browser/extensions/api/declarative_content/content_action_unittest.cc
index bce9c80c..049cc6c 100644
--- a/chrome/browser/extensions/api/declarative_content/content_action_unittest.cc
+++ b/chrome/browser/extensions/api/declarative_content/content_action_unittest.cc
@@ -31,14 +31,14 @@ TEST(DeclarativeContentActionTest, InvalidCreation) {
result = ContentAction::Create(*ParseJson("[]"), &error, &bad_message);
EXPECT_TRUE(bad_message);
EXPECT_EQ("", error);
- EXPECT_FALSE(result);
+ EXPECT_FALSE(result.get());
// Test missing instanceType element.
error.clear();
result = ContentAction::Create(*ParseJson("{}"), &error, &bad_message);
EXPECT_TRUE(bad_message);
EXPECT_EQ("", error);
- EXPECT_FALSE(result);
+ EXPECT_FALSE(result.get());
// Test wrong instanceType element.
error.clear();
@@ -48,7 +48,7 @@ TEST(DeclarativeContentActionTest, InvalidCreation) {
"}"),
&error, &bad_message);
EXPECT_THAT(error, HasSubstr("invalid instanceType"));
- EXPECT_FALSE(result);
+ EXPECT_FALSE(result.get());
}
TEST(DeclarativeContentActionTest, ShowPageAction) {
@@ -63,7 +63,7 @@ TEST(DeclarativeContentActionTest, ShowPageAction) {
&error, &bad_message);
EXPECT_EQ("", error);
EXPECT_FALSE(bad_message);
- ASSERT_TRUE(result);
+ ASSERT_TRUE(result.get());
EXPECT_EQ(ContentAction::ACTION_SHOW_PAGE_ACTION, result->GetType());
const Extension* extension = env.MakeExtension(