diff options
29 files changed, 104 insertions, 100 deletions
diff --git a/android_webview/browser/aw_browser_context.cc b/android_webview/browser/aw_browser_context.cc index 8f0f214..ea98457 100644 --- a/android_webview/browser/aw_browser_context.cc +++ b/android_webview/browser/aw_browser_context.cc @@ -61,7 +61,7 @@ AwBrowserContext* AwBrowserContext::FromWebContents( } void AwBrowserContext::InitializeBeforeThreadCreation() { - DCHECK(!url_request_context_getter_); + DCHECK(!url_request_context_getter_.get()); url_request_context_getter_ = new AwURLRequestContextGetter(this); } @@ -78,7 +78,7 @@ void AwBrowserContext::AddVisitedURLs(const std::vector<GURL>& urls) { net::URLRequestContextGetter* AwBrowserContext::CreateRequestContext( content::ProtocolHandlerMap* protocol_handlers) { - CHECK(url_request_context_getter_); + CHECK(url_request_context_getter_.get()); url_request_context_getter_->SetProtocolHandlers(protocol_handlers); return url_request_context_getter_.get(); } @@ -88,7 +88,7 @@ AwBrowserContext::CreateRequestContextForStoragePartition( const base::FilePath& partition_path, bool in_memory, content::ProtocolHandlerMap* protocol_handlers) { - CHECK(url_request_context_getter_); + CHECK(url_request_context_getter_.get()); return url_request_context_getter_.get(); } @@ -159,9 +159,9 @@ AwBrowserContext::GetMediaRequestContextForStoragePartition( content::ResourceContext* AwBrowserContext::GetResourceContext() { if (!resource_context_) { - CHECK(url_request_context_getter_); - resource_context_.reset(new AwResourceContext( - url_request_context_getter_.get())); + CHECK(url_request_context_getter_.get()); + resource_context_.reset( + new AwResourceContext(url_request_context_getter_.get())); } return resource_context_.get(); } @@ -173,11 +173,11 @@ AwBrowserContext::GetDownloadManagerDelegate() { content::GeolocationPermissionContext* AwBrowserContext::GetGeolocationPermissionContext() { - if (!geolocation_permission_context_) { + if (!geolocation_permission_context_.get()) { geolocation_permission_context_ = native_factory_->CreateGeolocationPermission(this); } - return geolocation_permission_context_; + return geolocation_permission_context_.get(); } content::SpeechRecognitionPreferences* diff --git a/android_webview/browser/aw_content_browser_client.cc b/android_webview/browser/aw_content_browser_client.cc index 1cf2d6b..d41eccc 100644 --- a/android_webview/browser/aw_content_browser_client.cc +++ b/android_webview/browser/aw_content_browser_client.cc @@ -257,8 +257,11 @@ void AwContentBrowserClient::AllowCertificateError( AwContentsClientBridgeBase::FromID(render_process_id, render_view_id); bool cancel_request = true; if (client) - client->AllowCertificateError(cert_error, ssl_info.cert, request_url, - callback, &cancel_request); + client->AllowCertificateError(cert_error, + ssl_info.cert.get(), + request_url, + callback, + &cancel_request); if (cancel_request) *result = content::CERTIFICATE_REQUEST_RESULT_TYPE_DENY; } diff --git a/android_webview/browser/aw_form_database_service.cc b/android_webview/browser/aw_form_database_service.cc index d08ed0e..72b8b91 100644 --- a/android_webview/browser/aw_form_database_service.cc +++ b/android_webview/browser/aw_form_database_service.cc @@ -52,7 +52,7 @@ void AwFormDatabaseService::Shutdown() { void AwFormDatabaseService::CancelPendingQuery() { if (pending_query_handle_) { - if (autofill_data_) + if (autofill_data_.get()) autofill_data_->CancelRequest(pending_query_handle_); pending_query_handle_ = 0; } diff --git a/android_webview/browser/aw_login_delegate.cc b/android_webview/browser/aw_login_delegate.cc index c2ea5a4..2c73253 100644 --- a/android_webview/browser/aw_login_delegate.cc +++ b/android_webview/browser/aw_login_delegate.cc @@ -85,7 +85,7 @@ void AwLoginDelegate::HandleHttpAuthRequestOnUIThread( DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); aw_http_auth_handler_.reset(AwHttpAuthHandlerBase::Create( - this, auth_info_, first_auth_attempt)); + this, auth_info_.get(), first_auth_attempt)); RenderViewHost* render_view_host = RenderViewHost::FromID( render_process_id_, render_view_id_); diff --git a/android_webview/browser/net/android_stream_reader_url_request_job.cc b/android_webview/browser/net/android_stream_reader_url_request_job.cc index ae586b8..0dc6596 100644 --- a/android_webview/browser/net/android_stream_reader_url_request_job.cc +++ b/android_webview/browser/net/android_stream_reader_url_request_job.cc @@ -181,7 +181,7 @@ void AndroidStreamReaderURLRequestJob::OnInputStreamOpened( CreateStreamReader(input_stream.get())); DCHECK(input_stream_reader); - DCHECK(!input_stream_reader_wrapper_); + DCHECK(!input_stream_reader_wrapper_.get()); input_stream_reader_wrapper_ = new InputStreamReaderWrapper( input_stream.Pass(), input_stream_reader.Pass()); @@ -236,7 +236,7 @@ bool AndroidStreamReaderURLRequestJob::ReadRawData(net::IOBuffer* dest, int dest_size, int* bytes_read) { DCHECK(thread_checker_.CalledOnValidThread()); - if (!input_stream_reader_wrapper_) { + if (!input_stream_reader_wrapper_.get()) { // This will happen if opening the InputStream fails in which case the // error is communicated by setting the HTTP response status header rather // than failing the request during the header fetch phase. @@ -265,7 +265,7 @@ bool AndroidStreamReaderURLRequestJob::GetMimeType( JNIEnv* env = AttachCurrentThread(); DCHECK(env); - if (!input_stream_reader_wrapper_) + if (!input_stream_reader_wrapper_.get()) return false; // Since it's possible for this call to alter the InputStream a @@ -281,7 +281,7 @@ bool AndroidStreamReaderURLRequestJob::GetCharset(std::string* charset) { JNIEnv* env = AttachCurrentThread(); DCHECK(env); - if (!input_stream_reader_wrapper_) + if (!input_stream_reader_wrapper_.get()) return false; // Since it's possible for this call to alter the InputStream a 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; } diff --git a/cc/resources/raster_worker_pool.cc b/cc/resources/raster_worker_pool.cc index 4ac3b2e..22d3b7d 100644 --- a/cc/resources/raster_worker_pool.cc +++ b/cc/resources/raster_worker_pool.cc @@ -94,7 +94,7 @@ class RasterWorkerPoolTaskImpl : public internal::RasterWorkerPoolTask { "metadata", TracedValue::FromValue(metadata_.AsValue().release())); - DCHECK(picture_pile_); + DCHECK(picture_pile_.get()); DCHECK(rendering_stats_); PicturePileImpl* picture_clone = @@ -123,7 +123,7 @@ class RasterWorkerPoolTaskImpl : public internal::RasterWorkerPoolTask { devtools_instrumentation::ScopedLayerTask raster_task( devtools_instrumentation::kRasterTask, metadata_.layer_id); - DCHECK(picture_pile_); + DCHECK(picture_pile_.get()); DCHECK(device); if (analysis_.is_solid_color) diff --git a/chrome/browser/profile_resetter/profile_resetter_unittest.cc b/chrome/browser/profile_resetter/profile_resetter_unittest.cc index face781..67030a7 100644 --- a/chrome/browser/profile_resetter/profile_resetter_unittest.cc +++ b/chrome/browser/profile_resetter/profile_resetter_unittest.cc @@ -176,20 +176,20 @@ TEST_F(ExtensionsResetTest, ResetExtensionsByDisabling) { base::FilePath(FILE_PATH_LITERAL("//nonexistent")), Manifest::INVALID_LOCATION, false); - service_->AddExtension(ext2); + service_->AddExtension(ext2.get()); // Components and external policy extensions shouldn't be deleted. scoped_refptr<Extension> ext3 = CreateExtension( "example3", base::FilePath(FILE_PATH_LITERAL("//nonexistent2")), Manifest::COMPONENT, false); - service_->AddExtension(ext3); - scoped_refptr<Extension> ext4 = CreateExtension( - "example4", - base::FilePath(FILE_PATH_LITERAL("//nonexistent3")), - Manifest::EXTERNAL_POLICY_DOWNLOAD, - false); - service_->AddExtension(ext4); + service_->AddExtension(ext3.get()); + scoped_refptr<Extension> ext4 = + CreateExtension("example4", + base::FilePath(FILE_PATH_LITERAL("//nonexistent3")), + Manifest::EXTERNAL_POLICY_DOWNLOAD, + false); + service_->AddExtension(ext4.get()); EXPECT_EQ(4u, service_->extensions()->size()); resetter_->Reset( diff --git a/content/browser/android/edge_effect.cc b/content/browser/android/edge_effect.cc index a9d493c..c7cd7d0 100644 --- a/content/browser/android/edge_effect.cc +++ b/content/browser/android/edge_effect.cc @@ -139,8 +139,8 @@ EdgeEffect::EdgeEffect(scoped_refptr<cc::Layer> edge, , pull_distance_(0) , dpi_scale_(1) { // Prevent the provided layers from drawing until the effect is activated. - DisableLayer(edge_); - DisableLayer(glow_); + DisableLayer(edge_.get()); + DisableLayer(glow_.get()); dpi_scale_ = gfx::Screen::GetNativeScreen()->GetPrimaryDisplay().device_scale_factor(); @@ -153,8 +153,8 @@ bool EdgeEffect::IsFinished() const { } void EdgeEffect::Finish() { - DisableLayer(edge_); - DisableLayer(glow_); + DisableLayer(edge_.get()); + DisableLayer(glow_.get()); pull_distance_ = 0; state_ = STATE_IDLE; } @@ -338,8 +338,8 @@ void EdgeEffect::ApplyToLayers(gfx::SizeF size, Edge edge) { // An empty effect size, while meaningless, is also relatively harmless, and // will simply prevent any drawing of the layers. if (size.IsEmpty()) { - DisableLayer(edge_); - DisableLayer(glow_); + DisableLayer(edge_.get()); + DisableLayer(glow_.get()); return; } @@ -354,7 +354,7 @@ void EdgeEffect::ApplyToLayers(gfx::SizeF size, Edge edge) { const int glow_bottom = static_cast<int>(std::min( glow_height * glow_scale_y_ * kGlowImageAspectRatioInverse * 0.6f, glow_height * kMaxGlowHeight) * dpi_scale_ + 0.5f); - UpdateLayer(glow_, edge, size, glow_bottom, glow_alpha_); + UpdateLayer(glow_.get(), edge, size, glow_bottom, glow_alpha_); // Edge gfx::Size edge_image_bounds; @@ -364,7 +364,7 @@ void EdgeEffect::ApplyToLayers(gfx::SizeF size, Edge edge) { const int edge_height = edge_image_bounds.height(); const int edge_bottom = static_cast<int>( edge_height * edge_scale_y_ * dpi_scale_); - UpdateLayer(edge_, edge, size, edge_bottom, edge_alpha_); + UpdateLayer(edge_.get(), edge, size, edge_bottom, edge_alpha_); } } // namespace content diff --git a/content/browser/android/in_process/synchronous_compositor_impl.cc b/content/browser/android/in_process/synchronous_compositor_impl.cc index 197819c..280eda3 100644 --- a/content/browser/android/in_process/synchronous_compositor_impl.cc +++ b/content/browser/android/in_process/synchronous_compositor_impl.cc @@ -72,7 +72,7 @@ class SynchronousCompositorFactoryImpl : public SynchronousCompositorFactory { virtual scoped_refptr<cc::ContextProvider> GetOffscreenContextProviderForCompositorThread() OVERRIDE { - if (!offscreen_context_for_compositor_thread_ || + if (!offscreen_context_for_compositor_thread_.get() || offscreen_context_for_compositor_thread_->DestroyedOnMainThread()) { offscreen_context_for_compositor_thread_ = webkit::gpu::ContextProviderInProcess::Create(); diff --git a/content/browser/android/surface_texture_peer_browser_impl.cc b/content/browser/android/surface_texture_peer_browser_impl.cc index 256195d..faaf4a2 100644 --- a/content/browser/android/surface_texture_peer_browser_impl.cc +++ b/content/browser/android/surface_texture_peer_browser_impl.cc @@ -60,7 +60,7 @@ void SurfaceTexturePeerBrowserImpl::EstablishSurfaceTexturePeer( scoped_refptr<gfx::SurfaceTextureBridge> surface_texture_bridge, int render_view_id, int player_id) { - if (!surface_texture_bridge) + if (!surface_texture_bridge.get()) return; BrowserThread::PostTask(BrowserThread::UI, FROM_HERE, base::Bind( diff --git a/content/browser/device_orientation/data_fetcher_impl_android.cc b/content/browser/device_orientation/data_fetcher_impl_android.cc index def5d8a..069454d 100644 --- a/content/browser/device_orientation/data_fetcher_impl_android.cc +++ b/content/browser/device_orientation/data_fetcher_impl_android.cc @@ -59,11 +59,11 @@ const Orientation* DataFetcherImplAndroid::GetOrientation() { // Do we have a new orientation value? (It's safe to do this outside the lock // because we only skip the lock if the value is null. We always enter the // lock if we're going to make use of the new value.) - if (next_orientation_) { + if (next_orientation_.get()) { base::AutoLock autolock(next_orientation_lock_); next_orientation_.swap(current_orientation_); } - if (!current_orientation_) + if (!current_orientation_.get()) return new Orientation(); return current_orientation_.get(); } diff --git a/content/browser/geolocation/location_api_adapter_android.cc b/content/browser/geolocation/location_api_adapter_android.cc index 7d01502..3ab693b 100644 --- a/content/browser/geolocation/location_api_adapter_android.cc +++ b/content/browser/geolocation/location_api_adapter_android.cc @@ -41,7 +41,7 @@ AndroidLocationApiAdapter::AndroidLocationApiAdapter() AndroidLocationApiAdapter::~AndroidLocationApiAdapter() { CHECK(!location_provider_); - CHECK(!message_loop_); + CHECK(!message_loop_.get()); CHECK(java_location_provider_android_object_.is_null()); } @@ -151,7 +151,7 @@ void AndroidLocationApiAdapter::CreateJavaObject(JNIEnv* env) { void AndroidLocationApiAdapter::OnNewGeopositionInternal( const Geoposition& geoposition) { base::AutoLock lock(lock_); - if (!message_loop_) + if (!message_loop_.get()) return; message_loop_->PostTask( FROM_HERE, diff --git a/content/browser/renderer_host/java/java_bridge_dispatcher_host.cc b/content/browser/renderer_host/java/java_bridge_dispatcher_host.cc index 05bec13..4f1a295 100644 --- a/content/browser/renderer_host/java/java_bridge_dispatcher_host.cc +++ b/content/browser/renderer_host/java/java_bridge_dispatcher_host.cc @@ -140,7 +140,7 @@ void JavaBridgeDispatcherHost::CreateObjectStub(NPObject* object, int route_id) { DCHECK_EQ(g_background_thread.Get().message_loop(), base::MessageLoop::current()); - if (!channel_) { + if (!channel_.get()) { channel_ = JavaBridgeChannelHost::GetJavaBridgeChannelHost( render_view_host()->GetProcess()->GetID(), BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO)); @@ -156,8 +156,8 @@ void JavaBridgeDispatcherHost::CreateObjectStub(NPObject* object, // window message queue when a method on a renderer-side object causes a // dialog to be displayed, and the Java Bridge does not need this // functionality. The page URL is also not required. - stubs_.push_back( - (new NPObjectStub(object, channel_, route_id, 0, GURL()))->AsWeakPtr()); + stubs_.push_back((new NPObjectStub( + object, channel_.get(), route_id, 0, GURL()))->AsWeakPtr()); // The NPObjectStub takes a reference to the NPObject. Release the ref added // in CreateNPVariantParam(). diff --git a/content/browser/renderer_host/render_widget_host_view_android.cc b/content/browser/renderer_host/render_widget_host_view_android.cc index 1dcd30d..988eb52 100644 --- a/content/browser/renderer_host/render_widget_host_view_android.cc +++ b/content/browser/renderer_host/render_widget_host_view_android.cc @@ -124,7 +124,7 @@ RenderWidgetHostViewAndroid::~RenderWidgetHostViewAndroid() { texture_id_in_layer_); } - if (texture_layer_) + if (texture_layer_.get()) texture_layer_->ClearClient(); } diff --git a/content/browser/renderer_host/surface_texture_transport_client_android.cc b/content/browser/renderer_host/surface_texture_transport_client_android.cc index f4b76a8..17ffe7b 100644 --- a/content/browser/renderer_host/surface_texture_transport_client_android.cc +++ b/content/browser/renderer_host/surface_texture_transport_client_android.cc @@ -105,7 +105,7 @@ scoped_refptr<media::VideoFrame> SurfaceTextureTransportClient:: context->flush(); surface_texture_->AttachToGLContext(); } - if (!video_frame_) { + if (!video_frame_.get()) { const gfx::Size size = video_layer_->bounds(); video_frame_ = media::VideoFrame::WrapNativeTexture( texture_id_, kGLTextureExternalOES, diff --git a/content/renderer/gpu/stream_texture_host_android.cc b/content/renderer/gpu/stream_texture_host_android.cc index f3de1f0..1bfa9d0 100644 --- a/content/renderer/gpu/stream_texture_host_android.cc +++ b/content/renderer/gpu/stream_texture_host_android.cc @@ -53,7 +53,7 @@ bool StreamTextureHost::OnMessageReceived(const IPC::Message& message) { } void StreamTextureHost::EstablishPeer(int32 primary_id, int32 secondary_id) { - if (channel_) { + if (channel_.get()) { channel_->Send(new GpuChannelMsg_EstablishStreamTexture( stream_id_, primary_id, secondary_id)); } diff --git a/content/renderer/java/java_bridge_dispatcher.cc b/content/renderer/java/java_bridge_dispatcher.cc index bab01d2..a9657ab 100644 --- a/content/renderer/java/java_bridge_dispatcher.cc +++ b/content/renderer/java/java_bridge_dispatcher.cc @@ -22,7 +22,7 @@ JavaBridgeDispatcher::JavaBridgeDispatcher(RenderView* render_view) } bool JavaBridgeDispatcher::EnsureChannelIsSetUp() { - if (channel_) { + if (channel_.get()) { return true; } diff --git a/content/renderer/media/stream_texture_factory_impl_android.cc b/content/renderer/media/stream_texture_factory_impl_android.cc index 80ad606..b33c924 100644 --- a/content/renderer/media/stream_texture_factory_impl_android.cc +++ b/content/renderer/media/stream_texture_factory_impl_android.cc @@ -57,7 +57,7 @@ StreamTextureProxyImpl::StreamTextureProxyImpl( void StreamTextureProxyImpl::Release() { SetClient(NULL); - if (loop_ && loop_ != base::MessageLoopProxy::current()) + if (loop_.get() && loop_.get() != base::MessageLoopProxy::current()) loop_->DeleteSoon(FROM_HERE, this); else delete this; diff --git a/content/renderer/media/webrtc_local_audio_track.cc b/content/renderer/media/webrtc_local_audio_track.cc index dc54c00..704d551 100644 --- a/content/renderer/media/webrtc_local_audio_track.cc +++ b/content/renderer/media/webrtc_local_audio_track.cc @@ -38,7 +38,7 @@ WebRtcLocalAudioTrack::~WebRtcLocalAudioTrack() { DVLOG(1) << "WebRtcLocalAudioTrack::~WebRtcLocalAudioTrack()"; // Users might not call Stop() on the track. - if (capturer_) + if (capturer_.get()) Stop(); } @@ -129,14 +129,14 @@ void WebRtcLocalAudioTrack::RemoveSink( void WebRtcLocalAudioTrack::Start() { DCHECK(thread_checker_.CalledOnValidThread()); DVLOG(1) << "WebRtcLocalAudioTrack::Start()"; - if (capturer_) + if (capturer_.get()) capturer_->AddSink(this); } void WebRtcLocalAudioTrack::Stop() { DCHECK(thread_checker_.CalledOnValidThread()); DVLOG(1) << "WebRtcLocalAudioTrack::Stop()"; - if (capturer_) { + if (capturer_.get()) { capturer_->RemoveSink(this); capturer_ = NULL; } diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc index 284637e..c5c4489 100644 --- a/content/renderer/render_view_impl.cc +++ b/content/renderer/render_view_impl.cc @@ -2851,7 +2851,7 @@ WebMediaPlayer* RenderViewImpl::createMediaPlayer( scoped_refptr<cc::ContextProvider> context_provider = RenderThreadImpl::current()->OffscreenContextProviderForMainThread(); - if (!context_provider) { + if (!context_provider.get()) { LOG(ERROR) << "Failed to get context3d for media player"; return NULL; } diff --git a/gpu/command_buffer/tests/gl_unittests_android.cc b/gpu/command_buffer/tests/gl_unittests_android.cc index f110d2c..b1d4151 100644 --- a/gpu/command_buffer/tests/gl_unittests_android.cc +++ b/gpu/command_buffer/tests/gl_unittests_android.cc @@ -47,7 +47,7 @@ TEST_F(GLSurfaceTextureTest, SimpleTest) { gfx::GLSurface::CreateViewGLSurface(false, window); EXPECT_TRUE(gl_surface.get() != NULL); - gl_.SetSurface(gl_surface); + gl_.SetSurface(gl_surface.get()); glClearColor(0.0f, 1.0f, 0.0f, 1.0f); glClear(GL_COLOR_BUFFER_BIT); diff --git a/media/base/android/media_player_listener.cc b/media/base/android/media_player_listener.cc index 94cbfd1..730759e 100644 --- a/media/base/android/media_player_listener.cc +++ b/media/base/android/media_player_listener.cc @@ -25,7 +25,7 @@ MediaPlayerListener::MediaPlayerListener( base::WeakPtr<MediaPlayerBridge> media_player) : message_loop_(message_loop), media_player_(media_player) { - DCHECK(message_loop_); + DCHECK(message_loop_.get()); DCHECK(media_player_); } diff --git a/net/quic/crypto/crypto_server_config.cc b/net/quic/crypto/crypto_server_config.cc index b7f3c82..33ce544 100644 --- a/net/quic/crypto/crypto_server_config.cc +++ b/net/quic/crypto/crypto_server_config.cc @@ -185,7 +185,7 @@ CryptoHandshakeMessage* QuicCryptoServerConfig::AddConfig( configs_[config->id] = config; SelectNewPrimaryConfig(now); - DCHECK(primary_config_); + DCHECK(primary_config_.get()); } return msg.release(); diff --git a/net/socket/ssl_client_socket_openssl.cc b/net/socket/ssl_client_socket_openssl.cc index 9269c0c..9141a5b 100644 --- a/net/socket/ssl_client_socket_openssl.cc +++ b/net/socket/ssl_client_socket_openssl.cc @@ -590,7 +590,7 @@ int SSLClientSocketOpenSSL::ClientCertRequestCallback(SSL* ssl, } // Second pass: a client certificate should have been selected. - if (ssl_config_.client_cert) { + if (ssl_config_.client_cert.get()) { // A note about ownership: FetchClientCertPrivateKey() increments // the reference count of the EVP_PKEY. Ownership of this reference // is passed directly to OpenSSL, which will release the reference @@ -616,7 +616,7 @@ int SSLClientSocketOpenSSL::ClientCertRequestCallback(SSL* ssl, bool SSLClientSocketOpenSSL::GetSSLInfo(SSLInfo* ssl_info) { ssl_info->Reset(); - if (!server_cert_) + if (!server_cert_.get()) return false; ssl_info->cert = server_cert_verify_result_.verified_cert; @@ -626,7 +626,7 @@ bool SSLClientSocketOpenSSL::GetSSLInfo(SSLInfo* ssl_info) { ssl_info->public_key_hashes = server_cert_verify_result_.public_key_hashes; ssl_info->client_cert_sent = - ssl_config_.send_client_cert && ssl_config_.client_cert; + ssl_config_.send_client_cert && ssl_config_.client_cert.get(); ssl_info->channel_id_sent = WasChannelIDSent(); const SSL_CIPHER* cipher = SSL_get_current_cipher(ssl_); @@ -927,11 +927,11 @@ int SSLClientSocketOpenSSL::SelectNextProtoCallback(unsigned char** out, } int SSLClientSocketOpenSSL::DoVerifyCert(int result) { - DCHECK(server_cert_); + DCHECK(server_cert_.get()); GotoState(STATE_VERIFY_CERT_COMPLETE); CertStatus cert_status; - if (ssl_config_.IsAllowedBadCert(server_cert_, &cert_status)) { + if (ssl_config_.IsAllowedBadCert(server_cert_.get(), &cert_status)) { VLOG(1) << "Received an expected bad cert with status: " << cert_status; server_cert_verify_result_.Reset(); server_cert_verify_result_.cert_status = cert_status; @@ -948,7 +948,9 @@ int SSLClientSocketOpenSSL::DoVerifyCert(int result) { flags |= CertVerifier::VERIFY_CERT_IO_ENABLED; verifier_.reset(new SingleRequestCertVerifier(cert_verifier_)); return verifier_->Verify( - server_cert_, host_and_port_.host(), flags, + server_cert_.get(), + host_and_port_.host(), + flags, NULL /* no CRL set */, &server_cert_verify_result_, base::Bind(&SSLClientSocketOpenSSL::OnHandshakeIOComplete, @@ -974,8 +976,8 @@ int SSLClientSocketOpenSSL::DoVerifyCertComplete(int result) { } X509Certificate* SSLClientSocketOpenSSL::UpdateServerCert() { - if (server_cert_) - return server_cert_; + if (server_cert_.get()) + return server_cert_.get(); crypto::ScopedOpenSSL<X509, X509_free> cert(SSL_get_peer_certificate(ssl_)); if (!cert.get()) { @@ -992,9 +994,9 @@ X509Certificate* SSLClientSocketOpenSSL::UpdateServerCert() { intermediates.push_back(sk_X509_value(chain, i)); } server_cert_ = X509Certificate::CreateFromHandle(cert.get(), intermediates); - DCHECK(server_cert_); + DCHECK(server_cert_.get()); - return server_cert_; + return server_cert_.get(); } bool SSLClientSocketOpenSSL::DoTransportIO() { @@ -1016,7 +1018,7 @@ int SSLClientSocketOpenSSL::BufferSend(void) { if (transport_send_busy_) return ERR_IO_PENDING; - if (!send_buffer_) { + if (!send_buffer_.get()) { // Get a fresh send buffer out of the send BIO. size_t max_read = BIO_ctrl_pending(transport_bio_); if (!max_read) @@ -1028,10 +1030,10 @@ int SSLClientSocketOpenSSL::BufferSend(void) { } int rv = transport_->socket()->Write( - send_buffer_, - send_buffer_->BytesRemaining(), - base::Bind(&SSLClientSocketOpenSSL::BufferSendComplete, - base::Unretained(this))); + send_buffer_.get(), + send_buffer_->BytesRemaining(), + base::Bind(&SSLClientSocketOpenSSL::BufferSendComplete, + base::Unretained(this))); if (rv == ERR_IO_PENDING) { transport_send_busy_ = true; } else { @@ -1055,7 +1057,7 @@ void SSLClientSocketOpenSSL::TransportWriteComplete(int result) { BIO_set_mem_eof_return(transport_bio_, 0); send_buffer_ = NULL; } else { - DCHECK(send_buffer_); + DCHECK(send_buffer_.get()); send_buffer_->DidConsume(result); DCHECK_GE(send_buffer_->BytesRemaining(), 0); if (send_buffer_->BytesRemaining() <= 0) @@ -1091,7 +1093,8 @@ int SSLClientSocketOpenSSL::BufferRecv(void) { recv_buffer_ = new IOBuffer(max_write); int rv = transport_->socket()->Read( - recv_buffer_, max_write, + recv_buffer_.get(), + max_write, base::Bind(&SSLClientSocketOpenSSL::BufferRecvComplete, base::Unretained(this))); if (rv == ERR_IO_PENDING) { @@ -1119,7 +1122,7 @@ void SSLClientSocketOpenSSL::TransportReadComplete(int result) { BIO_set_mem_eof_return(transport_bio_, 0); (void)BIO_shutdown_wr(transport_bio_); } else { - DCHECK(recv_buffer_); + DCHECK(recv_buffer_.get()); int ret = BIO_write(transport_bio_, recv_buffer_->data(), result); // A write into a memory BIO should always succeed. CHECK_EQ(result, ret); @@ -1157,28 +1160,26 @@ void SSLClientSocketOpenSSL::OnSendComplete(int result) { int rv_write = ERR_IO_PENDING; bool network_moved; do { - if (user_read_buf_) - rv_read = DoPayloadRead(); - if (user_write_buf_) - rv_write = DoPayloadWrite(); - network_moved = DoTransportIO(); - } while (rv_read == ERR_IO_PENDING && - rv_write == ERR_IO_PENDING && - (user_read_buf_ || user_write_buf_) && - network_moved); + if (user_read_buf_.get()) + rv_read = DoPayloadRead(); + if (user_write_buf_.get()) + rv_write = DoPayloadWrite(); + network_moved = DoTransportIO(); + } while (rv_read == ERR_IO_PENDING && rv_write == ERR_IO_PENDING && + (user_read_buf_.get() || user_write_buf_.get()) && network_moved); // Performing the Read callback may cause |this| to be deleted. If this // happens, the Write callback should not be invoked. Guard against this by // holding a WeakPtr to |this| and ensuring it's still valid. base::WeakPtr<SSLClientSocketOpenSSL> guard(weak_factory_.GetWeakPtr()); - if (user_read_buf_ && rv_read != ERR_IO_PENDING) - DoReadCallback(rv_read); + if (user_read_buf_.get() && rv_read != ERR_IO_PENDING) + DoReadCallback(rv_read); if (!guard.get()) return; - if (user_write_buf_ && rv_write != ERR_IO_PENDING) - DoWriteCallback(rv_write); + if (user_write_buf_.get() && rv_write != ERR_IO_PENDING) + DoWriteCallback(rv_write); } void SSLClientSocketOpenSSL::OnRecvComplete(int result) { @@ -1190,7 +1191,7 @@ void SSLClientSocketOpenSSL::OnRecvComplete(int result) { // Network layer received some data, check if client requested to read // decrypted data. - if (!user_read_buf_) + if (!user_read_buf_.get()) return; int rv = DoReadLoop(result); @@ -1203,7 +1204,7 @@ bool SSLClientSocketOpenSSL::IsConnected() const { if (!completed_handshake_) return false; // If an asynchronous operation is still pending. - if (user_read_buf_ || user_write_buf_) + if (user_read_buf_.get() || user_write_buf_.get()) return true; return transport_->socket()->IsConnected(); @@ -1214,7 +1215,7 @@ bool SSLClientSocketOpenSSL::IsConnectedAndIdle() const { if (!completed_handshake_) return false; // If an asynchronous operation is still pending. - if (user_read_buf_ || user_write_buf_) + if (user_read_buf_.get() || user_write_buf_.get()) return false; // If there is data waiting to be sent, or data read from the network that // has not yet been consumed. diff --git a/net/ssl/openssl_client_key_store_unittest.cc b/net/ssl/openssl_client_key_store_unittest.cc index 6786584..70d2d7a 100644 --- a/net/ssl/openssl_client_key_store_unittest.cc +++ b/net/ssl/openssl_client_key_store_unittest.cc @@ -48,7 +48,7 @@ TEST_F(OpenSSLClientKeyStoreTest, Flush) { scoped_refptr<X509Certificate> cert_1( ImportCertFromFile(GetTestCertsDirectory(), "client_1.pem")); - ASSERT_TRUE(cert_1); + ASSERT_TRUE(cert_1.get()); ScopedEVP_PKEY priv_key(EVP_PKEY_new()); ASSERT_TRUE(priv_key.get()); @@ -72,7 +72,7 @@ TEST_F(OpenSSLClientKeyStoreTest, FetchEmptyPrivateKey) { scoped_refptr<X509Certificate> cert_1( ImportCertFromFile(GetTestCertsDirectory(), "client_1.pem")); - ASSERT_TRUE(cert_1); + ASSERT_TRUE(cert_1.get()); // Retrieve the private key now. This should fail because it was // never recorded in the store. @@ -92,7 +92,7 @@ TEST_F(OpenSSLClientKeyStoreTest, RecordAndFetchPrivateKey) { // JNI reference, with no way to access the real private key bits. scoped_refptr<X509Certificate> cert_1( ImportCertFromFile(GetTestCertsDirectory(), "client_1.pem")); - ASSERT_TRUE(cert_1); + ASSERT_TRUE(cert_1.get()); ScopedEVP_PKEY priv_key(EVP_PKEY_new()); ASSERT_TRUE(priv_key.get()); @@ -126,11 +126,11 @@ TEST_F(OpenSSLClientKeyStoreTest, RecordAndFetchPrivateKey) { TEST_F(OpenSSLClientKeyStoreTest, RecordAndFetchTwoPrivateKeys) { scoped_refptr<X509Certificate> cert_1( ImportCertFromFile(GetTestCertsDirectory(), "client_1.pem")); - ASSERT_TRUE(cert_1); + ASSERT_TRUE(cert_1.get()); scoped_refptr<X509Certificate> cert_2( ImportCertFromFile(GetTestCertsDirectory(), "client_2.pem")); - ASSERT_TRUE(cert_2); + ASSERT_TRUE(cert_2.get()); ScopedEVP_PKEY priv_key1(EVP_PKEY_new()); ASSERT_TRUE(priv_key1.get()); diff --git a/webkit/browser/fileapi/file_system_usage_cache.cc b/webkit/browser/fileapi/file_system_usage_cache.cc index bad78bb..a049f3d 100644 --- a/webkit/browser/fileapi/file_system_usage_cache.cc +++ b/webkit/browser/fileapi/file_system_usage_cache.cc @@ -289,7 +289,7 @@ bool FileSystemUsageCache::FlushFile(const base::FilePath& file_path) { void FileSystemUsageCache::ScheduleCloseTimer() { DCHECK(CalledOnValidThread()); if (!timer_) - timer_.reset(new TimedTaskHelper(task_runner_)); + timer_.reset(new TimedTaskHelper(task_runner_.get())); if (timer_->IsRunning()) { timer_->Reset(); diff --git a/webkit/browser/fileapi/sandbox_file_stream_writer.cc b/webkit/browser/fileapi/sandbox_file_stream_writer.cc index 69957c9..6588606 100644 --- a/webkit/browser/fileapi/sandbox_file_stream_writer.cc +++ b/webkit/browser/fileapi/sandbox_file_stream_writer.cc @@ -116,7 +116,7 @@ void SandboxFileStreamWriter::DidCreateSnapshotFile( const base::PlatformFileInfo& file_info, const base::FilePath& platform_path, const scoped_refptr<webkit_blob::ShareableFileReference>& file_ref) { - DCHECK(!file_ref); + DCHECK(!file_ref.get()); if (CancelIfRequested()) return; |