summaryrefslogtreecommitdiffstats
path: root/blimp
diff options
context:
space:
mode:
authordanakj <danakj@chromium.org>2015-11-16 16:27:47 -0800
committerCommit bot <commit-bot@chromium.org>2015-11-17 00:28:45 +0000
commit8199479504103bee23b5e560a96b914b9d959caf (patch)
treee497cb99b5651a655d39b53821faec278293d79e /blimp
parent563454636cfe3df6a57fff84560e8a89e4f6b175 (diff)
downloadchromium_src-8199479504103bee23b5e560a96b914b9d959caf.zip
chromium_src-8199479504103bee23b5e560a96b914b9d959caf.tar.gz
chromium_src-8199479504103bee23b5e560a96b914b9d959caf.tar.bz2
Make operators on scoped_ptr match the ones defined for std::unique_ptr
Currently scoped_ptr is missing comparison operators other than == and !=, and it defines those operators incorrectly (it compares to a raw pointer but unique_ptr compares to a unique_ptr). This fixes the operator== and !=, and adds .get() at a bunch of callsites. And adds the < > <= >= operators so that we don't have any differences in where you can use it. This will help the transition from scoped_ptr to unique_ptr as no code will have to change along with the rename wrt these operators. R=Nico, dcheng TBR=ellyjones, sky, jochen, wez, rockot, droger BUG=554390 CQ_INCLUDE_TRYBOTS=tryserver.blink:linux_blink_rel Review URL: https://codereview.chromium.org/1440593004 Cr-Commit-Position: refs/heads/master@{#359957}
Diffstat (limited to 'blimp')
-rw-r--r--blimp/engine/browser/blimp_engine_session.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/blimp/engine/browser/blimp_engine_session.cc b/blimp/engine/browser/blimp_engine_session.cc
index 79c1a40..f65706a 100644
--- a/blimp/engine/browser/blimp_engine_session.cc
+++ b/blimp/engine/browser/blimp_engine_session.cc
@@ -225,7 +225,7 @@ void BlimpEngineSession::RequestToLockMouse(content::WebContents* web_contents,
}
void BlimpEngineSession::CloseContents(content::WebContents* source) {
- if (source == web_contents_)
+ if (source == web_contents_.get())
web_contents_.reset();
}