diff options
| author | rsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-13 22:42:42 +0000 |
|---|---|---|
| committer | rsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-13 22:42:42 +0000 |
| commit | 13914c9dae337943e348df3f63bed3bb1375bb3c (patch) | |
| tree | 30107ef8b54c575b70ba288cb93e0eb96973cdab /android_webview/native | |
| parent | 7b8a31630192ab3f7c28a0790a681c543a94d409 (diff) | |
| download | chromium_src-13914c9dae337943e348df3f63bed3bb1375bb3c.zip chromium_src-13914c9dae337943e348df3f63bed3bb1375bb3c.tar.gz chromium_src-13914c9dae337943e348df3f63bed3bb1375bb3c.tar.bz2 | |
Update Android to use scoped_refptr<T>::get() rather than implicit "operator T*"
Android fixes and post-Linux cleanup
BUG=110610
TBR=darin@chromium.org
Review URL: https://codereview.chromium.org/16907002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@206179 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'android_webview/native')
| -rw-r--r-- | android_webview/native/aw_http_auth_handler.cc | 4 | ||||
| -rw-r--r-- | android_webview/native/cookie_manager.cc | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/android_webview/native/aw_http_auth_handler.cc b/android_webview/native/aw_http_auth_handler.cc index 8bcebba..5ff4df9 100644 --- a/android_webview/native/aw_http_auth_handler.cc +++ b/android_webview/native/aw_http_auth_handler.cc @@ -41,7 +41,7 @@ void AwHttpAuthHandler::Proceed(JNIEnv* env, jstring user, jstring password) { DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI)); - if (login_delegate_) { + if (login_delegate_.get()) { login_delegate_->Proceed(ConvertJavaStringToUTF16(env, user), ConvertJavaStringToUTF16(env, password)); login_delegate_ = NULL; @@ -50,7 +50,7 @@ void AwHttpAuthHandler::Proceed(JNIEnv* env, void AwHttpAuthHandler::Cancel(JNIEnv* env, jobject obj) { DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI)); - if (login_delegate_) { + if (login_delegate_.get()) { login_delegate_->Cancel(); login_delegate_ = NULL; } diff --git a/android_webview/native/cookie_manager.cc b/android_webview/native/cookie_manager.cc index b0f477c..597fa05 100644 --- a/android_webview/native/cookie_manager.cc +++ b/android_webview/native/cookie_manager.cc @@ -122,7 +122,7 @@ void CookieManager::ExecCookieTask(const CookieTask& task, const bool wait_for_completion) { base::WaitableEvent completion(false, false); - DCHECK(cookie_monster_); + DCHECK(cookie_monster_.get()); BrowserThread::PostTask(BrowserThread::FILE, FROM_HERE, base::Bind(task, wait_for_completion ? &completion : NULL)); @@ -134,7 +134,7 @@ void CookieManager::ExecCookieTask(const CookieTask& task, } void CookieManager::SetCookieMonster(net::CookieMonster* cookie_monster) { - DCHECK(!cookie_monster_); + DCHECK(!cookie_monster_.get()); cookie_monster_ = cookie_monster; } |