summaryrefslogtreecommitdiffstats
path: root/extensions
diff options
context:
space:
mode:
authorrsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-01 04:32:48 +0000
committerrsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-01 04:32:48 +0000
commit83501baf7d4e148982f9068fbca4379ccf983540 (patch)
tree5e14d6aade622ab175d0b744cfc422cfb9e35eda /extensions
parent1eb4f6d4d9d6991d7ab21c04c37d3557fee13168 (diff)
downloadchromium_src-83501baf7d4e148982f9068fbca4379ccf983540.zip
chromium_src-83501baf7d4e148982f9068fbca4379ccf983540.tar.gz
chromium_src-83501baf7d4e148982f9068fbca4379ccf983540.tar.bz2
Update extensions/ to use scoped_refptr<T>::get() rather than implicit "operator T*"
Linux fixes BUG=110610 TBR=darin Review URL: https://chromiumcodereview.appspot.com/15759013 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@203572 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'extensions')
-rw-r--r--extensions/common/matcher/url_matcher_factory_unittest.cc2
-rw-r--r--extensions/common/one_shot_event.cc2
2 files changed, 2 insertions, 2 deletions
diff --git a/extensions/common/matcher/url_matcher_factory_unittest.cc b/extensions/common/matcher/url_matcher_factory_unittest.cc
index 1f56916..1335726 100644
--- a/extensions/common/matcher/url_matcher_factory_unittest.cc
+++ b/extensions/common/matcher/url_matcher_factory_unittest.cc
@@ -244,7 +244,7 @@ void UrlConditionCaseTest::CheckCondition(
matcher.condition_factory(), &condition, 1, &error);
if (expected_result == CREATE_FAILURE) {
EXPECT_FALSE(error.empty());
- EXPECT_FALSE(result);
+ EXPECT_FALSE(result.get());
return;
}
EXPECT_EQ("", error);
diff --git a/extensions/common/one_shot_event.cc b/extensions/common/one_shot_event.cc
index e654e3e..318acad 100644
--- a/extensions/common/one_shot_event.cc
+++ b/extensions/common/one_shot_event.cc
@@ -19,7 +19,7 @@ struct OneShotEvent::TaskInfo {
const scoped_refptr<TaskRunner>& runner,
const base::Closure& task)
: from_here(from_here), runner(runner), task(task) {
- CHECK(runner); // Detect mistakes with a decent stack frame.
+ CHECK(runner.get()); // Detect mistakes with a decent stack frame.
}
tracked_objects::Location from_here;
scoped_refptr<TaskRunner> runner;