summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordcheng <dcheng@chromium.org>2014-09-15 15:50:26 -0700
committerCommit bot <commit-bot@chromium.org>2014-09-15 22:53:20 +0000
commit54672cdaacce980bf62aaa50b65ace634d2e5096 (patch)
treeff833708723ed7fa03e064d60c1676a0d5bfb965
parent2c7fdae75971a3352f0b29a1a0672cc09050738e (diff)
downloadchromium_src-54672cdaacce980bf62aaa50b65ace634d2e5096.zip
chromium_src-54672cdaacce980bf62aaa50b65ace634d2e5096.tar.gz
chromium_src-54672cdaacce980bf62aaa50b65ace634d2e5096.tar.bz2
Remove implicit conversions from scoped_refptr to T* in c/b/chromeos/attestation
This patch was generated by running the rewrite_scoped_refptr clang tool on a ChromeOS build. BUG=110610 Review URL: https://codereview.chromium.org/567763003 Cr-Commit-Position: refs/heads/master@{#294909}
-rw-r--r--chrome/browser/chromeos/attestation/platform_verification_flow_unittest.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/chromeos/attestation/platform_verification_flow_unittest.cc b/chrome/browser/chromeos/attestation/platform_verification_flow_unittest.cc
index 8c28660..609d0b1 100644
--- a/chrome/browser/chromeos/attestation/platform_verification_flow_unittest.cc
+++ b/chrome/browser/chromeos/attestation/platform_verification_flow_unittest.cc
@@ -96,7 +96,7 @@ class FakeDelegate : public PlatformVerificationFlow::Delegate {
virtual HostContentSettingsMap* GetContentSettings(
content::WebContents* web_contents) OVERRIDE {
- return content_settings_;
+ return content_settings_.get();
}
virtual bool IsGuestOrIncognito(content::WebContents* web_contents) OVERRIDE {