Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(827)

Unified Diff: remoting/client/plugin/chromoting_instance.cc

Issue 15927028: Update remoting/ to use WeakPtr<T>::get() instead of implicit "operator T*" (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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
Index: remoting/client/plugin/chromoting_instance.cc
diff --git a/remoting/client/plugin/chromoting_instance.cc b/remoting/client/plugin/chromoting_instance.cc
index 73d9d3721aa2220d761f118bee71bebbb1d7d63a..3d420ba9753ee93ab00ad89a4d14bf14f17b02c9 100644
--- a/remoting/client/plugin/chromoting_instance.cc
+++ b/remoting/client/plugin/chromoting_instance.cc
@@ -483,7 +483,7 @@ void ChromotingInstance::FetchThirdPartyToken(
// Once the Session object calls this function, it won't continue the
// authentication until the callback is called (or connection is canceled).
// So, it's impossible to reach this with a callback already registered.
- DCHECK(!pepper_token_fetcher_);
+ DCHECK(!pepper_token_fetcher_.get());
pepper_token_fetcher_ = pepper_token_fetcher;
scoped_ptr<base::DictionaryValue> data(new base::DictionaryValue());
data->SetString("tokenUrl", token_url.spec());
@@ -771,7 +771,7 @@ void ChromotingInstance::OnPinFetched(const std::string& pin) {
void ChromotingInstance::OnThirdPartyTokenFetched(
const std::string& token,
const std::string& shared_secret) {
- if (pepper_token_fetcher_) {
+ if (pepper_token_fetcher_.get()) {
pepper_token_fetcher_->OnTokenFetched(token, shared_secret);
pepper_token_fetcher_.reset();
} else {

Powered by Google App Engine
This is Rietveld 408576698