diff options
author | erg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-17 16:43:27 +0000 |
---|---|---|
committer | erg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-17 16:43:27 +0000 |
commit | 59383c78c7b67b435ff4970060213928e1f153b8 (patch) | |
tree | 5c215c1ba34a10bf83ceea455552908c20061a5b | |
parent | bf36fe526209a41c15f6747ffc1392206338896c (diff) | |
download | chromium_src-59383c78c7b67b435ff4970060213928e1f153b8.zip chromium_src-59383c78c7b67b435ff4970060213928e1f153b8.tar.gz chromium_src-59383c78c7b67b435ff4970060213928e1f153b8.tar.bz2 |
Cleanup: Remove unnecessary ".get()" from scoped_ptrs<>.
In r174057, ajwong@ added support for implicit testing to scoped_ptr<>. Removes
these in content/.
BUG=232084
Review URL: https://codereview.chromium.org/14081010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@194608 0039d316-1c4b-4281-b951-d872f2087c98
144 files changed, 411 insertions, 411 deletions
diff --git a/content/browser/accessibility/accessibility_win_browsertest.cc b/content/browser/accessibility/accessibility_win_browsertest.cc index 31e9a6b..b099af9d 100644 --- a/content/browser/accessibility/accessibility_win_browsertest.cc +++ b/content/browser/accessibility/accessibility_win_browsertest.cc @@ -54,7 +54,7 @@ base::win::ScopedComPtr<IAccessible> GetAccessibleFromResultVariant( base::win::ScopedComPtr<IDispatch> dispatch; HRESULT hr = parent->get_accChild(*var, dispatch.Receive()); EXPECT_TRUE(SUCCEEDED(hr)); - if (dispatch.get()) + if (dispatch) dispatch.QueryInterface(ptr.Receive()); break; } @@ -112,7 +112,7 @@ void RecursiveFindNodeInAccessibilityTree(IAccessible* node, for (int index = 0; index < obtained_count; index++) { base::win::ScopedComPtr<IAccessible> child_accessible( GetAccessibleFromResultVariant(node, &child_array.get()[index])); - if (child_accessible.get()) { + if (child_accessible) { RecursiveFindNodeInAccessibilityTree( child_accessible.get(), expected_role, expected_name, depth + 1, found); diff --git a/content/browser/accessibility/browser_accessibility_cocoa.mm b/content/browser/accessibility/browser_accessibility_cocoa.mm index 95a2a84..b2117bb 100644 --- a/content/browser/accessibility/browser_accessibility_cocoa.mm +++ b/content/browser/accessibility/browser_accessibility_cocoa.mm @@ -381,7 +381,7 @@ NSDictionary* attributeToMethodNameMap = nil; // Returns an array of BrowserAccessibilityCocoa objects, representing the // accessibility children of this object. - (NSArray*)children { - if (!children_.get()) { + if (!children_) { children_.reset([[NSMutableArray alloc] initWithCapacity:browserAccessibility_->child_count()] ); for (uint32 index = 0; diff --git a/content/browser/android/content_settings.cc b/content/browser/android/content_settings.cc index fb53d24..8ac82cb 100644 --- a/content/browser/android/content_settings.cc +++ b/content/browser/android/content_settings.cc @@ -150,7 +150,7 @@ bool ContentSettings::RegisterContentSettings(JNIEnv* env) { void ContentSettings::SyncFromNativeImpl() { JNIEnv* env = base::android::AttachCurrentThread(); CHECK(env); - if (!field_ids_.get()) + if (!field_ids_) field_ids_.reset(new FieldIds(env)); ScopedJavaLocalRef<jobject> scoped_obj = content_settings_.get(env); @@ -309,7 +309,7 @@ void ContentSettings::SyncFromNativeImpl() { void ContentSettings::SyncToNativeImpl() { JNIEnv* env = base::android::AttachCurrentThread(); CHECK(env); - if (!field_ids_.get()) + if (!field_ids_) field_ids_.reset(new FieldIds(env)); ScopedJavaLocalRef<jobject> scoped_obj = content_settings_.get(env); diff --git a/content/browser/android/content_view_render_view.cc b/content/browser/android/content_view_render_view.cc index 8e38e08..a9a3c32 100644 --- a/content/browser/android/content_view_render_view.cc +++ b/content/browser/android/content_view_render_view.cc @@ -84,12 +84,12 @@ void ContentViewRenderView::ScheduleComposite() { } void ContentViewRenderView::InitCompositor() { - if (!compositor_.get()) + if (!compositor_) compositor_.reset(Compositor::Create(this)); } void ContentViewRenderView::Composite() { - if (!compositor_.get()) + if (!compositor_) return; scheduled_composite_ = false; diff --git a/content/browser/appcache/appcache_dispatcher_host.cc b/content/browser/appcache/appcache_dispatcher_host.cc index ac4564c..a01c9d7 100644 --- a/content/browser/appcache/appcache_dispatcher_host.cc +++ b/content/browser/appcache/appcache_dispatcher_host.cc @@ -22,7 +22,7 @@ AppCacheDispatcherHost::AppCacheDispatcherHost( void AppCacheDispatcherHost::OnChannelConnected(int32 peer_pid) { BrowserMessageFilter::OnChannelConnected(peer_pid); - if (appcache_service_.get()) { + if (appcache_service_) { backend_impl_.Initialize( appcache_service_.get(), &frontend_proxy_, process_id_); get_status_callback_ = @@ -69,7 +69,7 @@ void AppCacheDispatcherHost::BadMessageReceived() { } void AppCacheDispatcherHost::OnRegisterHost(int host_id) { - if (appcache_service_.get()) { + if (appcache_service_) { if (!backend_impl_.RegisterHost(host_id)) { BadMessageReceived(); } @@ -77,7 +77,7 @@ void AppCacheDispatcherHost::OnRegisterHost(int host_id) { } void AppCacheDispatcherHost::OnUnregisterHost(int host_id) { - if (appcache_service_.get()) { + if (appcache_service_) { if (!backend_impl_.UnregisterHost(host_id)) { BadMessageReceived(); } @@ -86,7 +86,7 @@ void AppCacheDispatcherHost::OnUnregisterHost(int host_id) { void AppCacheDispatcherHost::OnSetSpawningHostId( int host_id, int spawning_host_id) { - if (appcache_service_.get()) { + if (appcache_service_) { if (!backend_impl_.SetSpawningHostId(host_id, spawning_host_id)) BadMessageReceived(); } @@ -96,7 +96,7 @@ void AppCacheDispatcherHost::OnSelectCache( int host_id, const GURL& document_url, int64 cache_document_was_loaded_from, const GURL& opt_manifest_url) { - if (appcache_service_.get()) { + if (appcache_service_) { if (!backend_impl_.SelectCache(host_id, document_url, cache_document_was_loaded_from, opt_manifest_url)) { @@ -109,7 +109,7 @@ void AppCacheDispatcherHost::OnSelectCache( void AppCacheDispatcherHost::OnSelectCacheForWorker( int host_id, int parent_process_id, int parent_host_id) { - if (appcache_service_.get()) { + if (appcache_service_) { if (!backend_impl_.SelectCacheForWorker( host_id, parent_process_id, parent_host_id)) { BadMessageReceived(); @@ -121,7 +121,7 @@ void AppCacheDispatcherHost::OnSelectCacheForWorker( void AppCacheDispatcherHost::OnSelectCacheForSharedWorker( int host_id, int64 appcache_id) { - if (appcache_service_.get()) { + if (appcache_service_) { if (!backend_impl_.SelectCacheForSharedWorker(host_id, appcache_id)) BadMessageReceived(); } else { @@ -132,7 +132,7 @@ void AppCacheDispatcherHost::OnSelectCacheForSharedWorker( void AppCacheDispatcherHost::OnMarkAsForeignEntry( int host_id, const GURL& document_url, int64 cache_document_was_loaded_from) { - if (appcache_service_.get()) { + if (appcache_service_) { if (!backend_impl_.MarkAsForeignEntry(host_id, document_url, cache_document_was_loaded_from)) { BadMessageReceived(); @@ -142,19 +142,19 @@ void AppCacheDispatcherHost::OnMarkAsForeignEntry( void AppCacheDispatcherHost::OnGetResourceList( int host_id, std::vector<appcache::AppCacheResourceInfo>* params) { - if (appcache_service_.get()) + if (appcache_service_) backend_impl_.GetResourceList(host_id, params); } void AppCacheDispatcherHost::OnGetStatus(int host_id, IPC::Message* reply_msg) { - if (pending_reply_msg_.get()) { + if (pending_reply_msg_) { BadMessageReceived(); delete reply_msg; return; } pending_reply_msg_.reset(reply_msg); - if (appcache_service_.get()) { + if (appcache_service_) { if (!backend_impl_.GetStatusWithCallback(host_id, get_status_callback_, reply_msg)) { BadMessageReceived(); @@ -167,14 +167,14 @@ void AppCacheDispatcherHost::OnGetStatus(int host_id, IPC::Message* reply_msg) { void AppCacheDispatcherHost::OnStartUpdate(int host_id, IPC::Message* reply_msg) { - if (pending_reply_msg_.get()) { + if (pending_reply_msg_) { BadMessageReceived(); delete reply_msg; return; } pending_reply_msg_.reset(reply_msg); - if (appcache_service_.get()) { + if (appcache_service_) { if (!backend_impl_.StartUpdateWithCallback(host_id, start_update_callback_, reply_msg)) { BadMessageReceived(); @@ -186,14 +186,14 @@ void AppCacheDispatcherHost::OnStartUpdate(int host_id, } void AppCacheDispatcherHost::OnSwapCache(int host_id, IPC::Message* reply_msg) { - if (pending_reply_msg_.get()) { + if (pending_reply_msg_) { BadMessageReceived(); delete reply_msg; return; } pending_reply_msg_.reset(reply_msg); - if (appcache_service_.get()) { + if (appcache_service_) { if (!backend_impl_.SwapCacheWithCallback(host_id, swap_cache_callback_, reply_msg)) { BadMessageReceived(); diff --git a/content/browser/browser_child_process_host_impl.cc b/content/browser/browser_child_process_host_impl.cc index 7979c36..91e4665 100644 --- a/content/browser/browser_child_process_host_impl.cc +++ b/content/browser/browser_child_process_host_impl.cc @@ -221,7 +221,7 @@ void BrowserChildProcessHostImpl::NotifyProcessInstanceCreated( base::TerminationStatus BrowserChildProcessHostImpl::GetTerminationStatus( int* exit_code) { DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); - if (!child_process_.get()) // If the delegate doesn't use Launch() helper. + if (!child_process_) // If the delegate doesn't use Launch() helper. return base::GetTerminationStatus(data_.handle, exit_code); return child_process_->GetChildTerminationStatus(false /* known_dead */, exit_code); diff --git a/content/browser/browser_main_loop.cc b/content/browser/browser_main_loop.cc index 041960a..e92a698 100644 --- a/content/browser/browser_main_loop.cc +++ b/content/browser/browser_main_loop.cc @@ -309,7 +309,7 @@ void BrowserMainLoop::EarlyInitialization() { } #endif - if (parts_.get()) + if (parts_) parts_->PreEarlyInitialization(); #if defined(OS_WIN) @@ -339,12 +339,12 @@ void BrowserMainLoop::EarlyInitialization() { } #endif // !defined(OS_IOS) - if (parts_.get()) + if (parts_) parts_->PostEarlyInitialization(); } void BrowserMainLoop::MainMessageLoopStart() { - if (parts_.get()) + if (parts_) parts_->PreMainMessageLoopStart(); #if defined(OS_WIN) @@ -395,7 +395,7 @@ void BrowserMainLoop::MainMessageLoopStart() { system_message_window_.reset(new SystemMessageWindowWin); #endif - if (parts_.get()) + if (parts_) parts_->PostMainMessageLoopStart(); #if defined(OS_ANDROID) @@ -410,7 +410,7 @@ void BrowserMainLoop::MainMessageLoopStart() { } void BrowserMainLoop::CreateThreads() { - if (parts_.get()) + if (parts_) result_code_ = parts_->PreCreateThreads(); #if !defined(OS_IOS) && (!defined(GOOGLE_CHROME_BUILD) || defined(OS_ANDROID)) @@ -497,7 +497,7 @@ void BrowserMainLoop::CreateThreads() { BrowserThreadsStarted(); - if (parts_.get()) + if (parts_) parts_->PreMainMessageLoopRun(); // If the UI thread blocks, the whole UI is unresponsive. @@ -510,7 +510,7 @@ void BrowserMainLoop::RunMainMessageLoopParts() { TRACE_EVENT_BEGIN_ETW("BrowserMain:MESSAGE_LOOP", 0, ""); bool ran_main_loop = false; - if (parts_.get()) + if (parts_) ran_main_loop = parts_->MainMessageLoopRun(&result_code_); if (!ran_main_loop) @@ -528,7 +528,7 @@ void BrowserMainLoop::ShutdownThreadsAndCleanUp() { base::Bind(base::IgnoreResult(&base::ThreadRestrictions::SetIOAllowed), true)); - if (parts_.get()) + if (parts_) parts_->PostMainMessageLoopRun(); #if !defined(OS_IOS) @@ -539,7 +539,7 @@ void BrowserMainLoop::ShutdownThreadsAndCleanUp() { GpuProcessHostUIShim::DestroyAll(); // Cancel pending requests and prevent new requests. - if (resource_dispatcher_host_.get()) + if (resource_dispatcher_host_) resource_dispatcher_host_.get()->Shutdown(); #if defined(USE_AURA) @@ -607,7 +607,7 @@ void BrowserMainLoop::ShutdownThreadsAndCleanUp() { #if !defined(OS_IOS) // Clean up state that lives on or uses the file_thread_ before // it goes away. - if (resource_dispatcher_host_.get()) + if (resource_dispatcher_host_) resource_dispatcher_host_.get()->save_file_manager()->Shutdown(); #endif // !defined(OS_IOS) break; @@ -660,14 +660,14 @@ void BrowserMainLoop::ShutdownThreadsAndCleanUp() { URLDataManager::DeleteDataSources(); #endif // !defined(OS_IOS) - if (parts_.get()) + if (parts_) parts_->PostDestroyThreads(); } void BrowserMainLoop::InitializeMainThread() { const char* kThreadName = "CrBrowserMain"; base::PlatformThread::SetName(kThreadName); - if (main_message_loop_.get()) + if (main_message_loop_) main_message_loop_->set_thread_name(kThreadName); // Register the main thread by instantiating it, but don't call any methods. @@ -798,7 +798,7 @@ void BrowserMainLoop::InitializeToolkit() { LOG_GETLASTERROR(FATAL); #endif - if (parts_.get()) + if (parts_) parts_->ToolkitInitialized(); } diff --git a/content/browser/byte_stream.cc b/content/browser/byte_stream.cc index 44f5ce3..f83e8c3 100644 --- a/content/browser/byte_stream.cc +++ b/content/browser/byte_stream.cc @@ -363,7 +363,7 @@ void ByteStreamReaderImpl::TransferDataInternal( bool was_empty = available_contents_.empty(); - if (transfer_buffer.get()) { + if (transfer_buffer) { available_contents_.insert(available_contents_.end(), transfer_buffer->begin(), transfer_buffer->end()); diff --git a/content/browser/device_orientation/data_fetcher_impl_android.cc b/content/browser/device_orientation/data_fetcher_impl_android.cc index e140083..c7a066f 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_.get()) { + if (next_orientation_) { base::AutoLock autolock(next_orientation_lock_); next_orientation_.swap(current_orientation_); } - if (!current_orientation_.get()) + if (!current_orientation_) return new Orientation(); return current_orientation_.get(); } diff --git a/content/browser/device_orientation/observer_delegate.cc b/content/browser/device_orientation/observer_delegate.cc index 1ffe07a..fc4273f 100644 --- a/content/browser/device_orientation/observer_delegate.cc +++ b/content/browser/device_orientation/observer_delegate.cc @@ -29,7 +29,7 @@ ObserverDelegate::~ObserverDelegate() { void ObserverDelegate::OnDeviceDataUpdate( const DeviceData* device_data, DeviceData::Type device_data_type) { scoped_refptr<const DeviceData> new_device_data(device_data); - if (!new_device_data.get()) + if (!new_device_data) new_device_data = EmptyDeviceData(device_data_type); sender_->Send(new_device_data->CreateIPCMessage(render_view_id_)); diff --git a/content/browser/device_orientation/provider_impl.cc b/content/browser/device_orientation/provider_impl.cc index c490514..71e1587 100644 --- a/content/browser/device_orientation/provider_impl.cc +++ b/content/browser/device_orientation/provider_impl.cc @@ -91,7 +91,7 @@ void ProviderImpl::PollingThread::Initialize(DataFetcherFactory factory, // start polling. scoped_ptr<DataFetcher> fetcher(factory()); - if (fetcher.get()) { + if (fetcher) { scoped_refptr<const DeviceData> device_data(fetcher->GetDeviceData(type)); if (device_data != NULL) { // Pass ownership of fetcher to provider_. diff --git a/content/browser/devtools/devtools_http_handler_impl.cc b/content/browser/devtools/devtools_http_handler_impl.cc index 237e6b9..d5d9453 100644 --- a/content/browser/devtools/devtools_http_handler_impl.cc +++ b/content/browser/devtools/devtools_http_handler_impl.cc @@ -192,7 +192,7 @@ DevToolsHttpHandlerImpl::~DevToolsHttpHandlerImpl() { } void DevToolsHttpHandlerImpl::Start() { - if (thread_.get()) + if (thread_) return; thread_.reset(new base::Thread(kDevToolsHandlerThreadName)); BrowserThread::PostTask( @@ -226,7 +226,7 @@ void DevToolsHttpHandlerImpl::ResetHandlerThreadAndRelease() { } void DevToolsHttpHandlerImpl::Stop() { - if (!thread_.get()) + if (!thread_) return; BrowserThread::PostTaskAndReply( BrowserThread::FILE, FROM_HERE, @@ -606,7 +606,7 @@ void DevToolsHttpHandlerImpl::OnDiscoveryPageRequestUI(int connection_id) { void DevToolsHttpHandlerImpl::OnWebSocketRequestUI( int connection_id, const net::HttpServerRequestInfo& request) { - if (!thread_.get()) + if (!thread_) return; std::string browser_prefix = "/devtools/browser"; size_t browser_pos = request.path.find(browser_prefix); @@ -739,7 +739,7 @@ void DevToolsHttpHandlerImpl::SendJson(int connection_id, net::HttpStatusCode status_code, base::Value* value, const std::string& message) { - if (!thread_.get()) + if (!thread_) return; // Serialize value and message. @@ -771,7 +771,7 @@ void DevToolsHttpHandlerImpl::SendJson(int connection_id, void DevToolsHttpHandlerImpl::Send200(int connection_id, const std::string& data, const std::string& mime_type) { - if (!thread_.get()) + if (!thread_) return; thread_->message_loop()->PostTask( FROM_HERE, @@ -783,7 +783,7 @@ void DevToolsHttpHandlerImpl::Send200(int connection_id, } void DevToolsHttpHandlerImpl::Send404(int connection_id) { - if (!thread_.get()) + if (!thread_) return; thread_->message_loop()->PostTask( FROM_HERE, @@ -792,7 +792,7 @@ void DevToolsHttpHandlerImpl::Send404(int connection_id) { void DevToolsHttpHandlerImpl::Send500(int connection_id, const std::string& message) { - if (!thread_.get()) + if (!thread_) return; thread_->message_loop()->PostTask( FROM_HERE, @@ -803,7 +803,7 @@ void DevToolsHttpHandlerImpl::Send500(int connection_id, void DevToolsHttpHandlerImpl::AcceptWebSocket( int connection_id, const net::HttpServerRequestInfo& request) { - if (!thread_.get()) + if (!thread_) return; thread_->message_loop()->PostTask( FROM_HERE, diff --git a/content/browser/devtools/devtools_protocol.cc b/content/browser/devtools/devtools_protocol.cc index 1363e6c..1ef3085 100644 --- a/content/browser/devtools/devtools_protocol.cc +++ b/content/browser/devtools/devtools_protocol.cc @@ -54,7 +54,7 @@ std::string DevToolsProtocol::Command::Serialize() { DictionaryValue command; command.SetInteger(kIdParam, id_); command.SetString(kMethodParam, method_); - if (params_.get()) + if (params_) command.Set(kParamsParam, params_->DeepCopy()); std::string json_command; @@ -107,7 +107,7 @@ std::string DevToolsProtocol::Response::Serialize() { error_object->SetInteger(kErrorCodeParam, error_code_); if (!error_message_.empty()) error_object->SetString(kErrorMessageParam, error_message_); - } else if (result_.get()) { + } else if (result_) { response.Set(kResultParam, result_->DeepCopy()); } @@ -145,7 +145,7 @@ DevToolsProtocol::Notification::~Notification() { std::string DevToolsProtocol::Notification::Serialize() { DictionaryValue notification; notification.SetString(kMethodParam, method_); - if (params_.get()) + if (params_) notification.Set(kParamsParam, params_->DeepCopy()); std::string json_notification; diff --git a/content/browser/download/base_file.cc b/content/browser/download/base_file.cc index 0b1db97..687c321 100644 --- a/content/browser/download/base_file.cc +++ b/content/browser/download/base_file.cc @@ -67,7 +67,7 @@ DownloadInterruptReason BaseFile::Initialize( DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE)); DCHECK(!detached_); - if (file_stream_.get()) { + if (file_stream_) { file_stream_->SetBoundNetLogSource(bound_net_log_); file_stream_->EnableErrorStatistics(); } @@ -103,7 +103,7 @@ DownloadInterruptReason BaseFile::AppendDataToFile(const char* data, if (detached_) RecordDownloadCount(APPEND_TO_DETACHED_FILE_COUNT); - if (!file_stream_.get()) + if (!file_stream_) return LogInterruptReason("No file stream on append", 0, DOWNLOAD_INTERRUPT_REASON_FILE_FAILED); @@ -274,7 +274,7 @@ DownloadInterruptReason BaseFile::Open() { base::Bind(&FileOpenedNetLogCallback, &full_path_, bytes_so_far_)); // Create a new file stream if it is not provided. - if (!file_stream_.get()) { + if (!file_stream_) { CreateFileStream(); file_stream_->EnableErrorStatistics(); int open_result = file_stream_->OpenSync( @@ -322,7 +322,7 @@ void BaseFile::Close() { bound_net_log_.AddEvent(net::NetLog::TYPE_DOWNLOAD_FILE_CLOSED); - if (file_stream_.get()) { + if (file_stream_) { #if defined(OS_CHROMEOS) // Currently we don't really care about the return value, since if it fails // theres not much we can do. But we might in the future. diff --git a/content/browser/download/download_item_impl.cc b/content/browser/download/download_item_impl.cc index cbac17b..7d5dd10 100644 --- a/content/browser/download/download_item_impl.cc +++ b/content/browser/download/download_item_impl.cc @@ -347,7 +347,7 @@ void DownloadItemImpl::Cancel(bool user_cancel) { // |SavePackage| integration. // |download_file_| can be NULL if Interrupt() is called after the // download file has been released. - if (!is_save_package_download_ && download_file_.get()) + if (!is_save_package_download_ && download_file_) ReleaseDownloadFile(true); if (state_ != INTERRUPTED_INTERNAL) { @@ -688,7 +688,7 @@ WebContents* DownloadItemImpl::GetWebContents() const { // paths that might be used by DownloadItems created from history import. // Currently such items have null request_handle_s, where other items // (regular and SavePackage downloads) have actual objects off the pointer. - if (request_handle_.get()) + if (request_handle_) return request_handle_->GetWebContents(); return NULL; } @@ -1452,7 +1452,7 @@ void DownloadItemImpl::ReleaseDownloadFile(bool destroy_file) { // |SavePackage| integration. // |download_file_| can be NULL if Interrupt() is called after the // download file has been released. - if (!is_save_package_download_ && download_file_.get()) { + if (!is_save_package_download_ && download_file_) { BrowserThread::PostTask( BrowserThread::FILE, FROM_HERE, // Will be deleted at end of task execution. diff --git a/content/browser/download/download_resource_handler.cc b/content/browser/download/download_resource_handler.cc index a803d01..388bcd1 100644 --- a/content/browser/download/download_resource_handler.cc +++ b/content/browser/download/download_resource_handler.cc @@ -380,7 +380,7 @@ bool DownloadResourceHandler::OnResponseCompleted( // Send the info down the stream. Conditional is in case we get // OnResponseCompleted without OnResponseStarted. - if (stream_writer_.get()) + if (stream_writer_) stream_writer_->Close(reason); // If the error mapped to something unknown, record it so that @@ -480,7 +480,7 @@ DownloadResourceHandler::~DownloadResourceHandler() { CallStartedCB(NULL, net::ERR_ACCESS_DENIED); // Remove output stream callback if a stream exists. - if (stream_writer_.get()) + if (stream_writer_) stream_writer_->RegisterCallback(base::Closure()); UMA_HISTOGRAM_TIMES("SB2.DownloadDuration", diff --git a/content/browser/download/drag_download_util.cc b/content/browser/download/drag_download_util.cc index ea1c897..c69829c 100644 --- a/content/browser/download/drag_download_util.cc +++ b/content/browser/download/drag_download_util.cc @@ -114,7 +114,7 @@ void PromiseFileFinalizer::OnDownloadAborted() { PromiseFileFinalizer::~PromiseFileFinalizer() {} void PromiseFileFinalizer::Cleanup() { - if (drag_file_downloader_.get()) + if (drag_file_downloader_) drag_file_downloader_ = NULL; } diff --git a/content/browser/fileapi/fileapi_message_filter.cc b/content/browser/fileapi/fileapi_message_filter.cc index ac81220..41632e6 100644 --- a/content/browser/fileapi/fileapi_message_filter.cc +++ b/content/browser/fileapi/fileapi_message_filter.cc @@ -90,7 +90,7 @@ FileAPIMessageFilter::FileAPIMessageFilter( void FileAPIMessageFilter::OnChannelConnected(int32 peer_pid) { BrowserMessageFilter::OnChannelConnected(peer_pid); - if (request_context_getter_.get()) { + if (request_context_getter_) { DCHECK(!request_context_); request_context_ = request_context_getter_->GetURLRequestContext(); request_context_getter_ = NULL; diff --git a/content/browser/gamepad/gamepad_provider.cc b/content/browser/gamepad/gamepad_provider.cc index 8231683..86e96d7 100644 --- a/content/browser/gamepad/gamepad_provider.cc +++ b/content/browser/gamepad/gamepad_provider.cc @@ -128,14 +128,14 @@ void GamepadProvider::DoInitializePollingThread( DCHECK(MessageLoop::current() == polling_thread_->message_loop()); DCHECK(!data_fetcher_.get()); // Should only initialize once. - if (!fetcher.get()) + if (!fetcher) fetcher.reset(new GamepadPlatformDataFetcher); data_fetcher_ = fetcher.Pass(); } void GamepadProvider::SendPauseHint(bool paused) { DCHECK(MessageLoop::current() == polling_thread_->message_loop()); - if (data_fetcher_.get()) + if (data_fetcher_) data_fetcher_->PauseHint(paused); } diff --git a/content/browser/gamepad/gamepad_service.cc b/content/browser/gamepad/gamepad_service.cc index 2f6b6bd..11a6964 100644 --- a/content/browser/gamepad/gamepad_service.cc +++ b/content/browser/gamepad/gamepad_service.cc @@ -35,7 +35,7 @@ void GamepadService::AddConsumer() { num_readers_++; DCHECK(num_readers_ > 0); - if (!provider_.get()) + if (!provider_) provider_.reset(new GamepadProvider); provider_->Resume(); } diff --git a/content/browser/geolocation/location_arbitrator_impl.cc b/content/browser/geolocation/location_arbitrator_impl.cc index 97cae8e..9b1594f 100644 --- a/content/browser/geolocation/location_arbitrator_impl.cc +++ b/content/browser/geolocation/location_arbitrator_impl.cc @@ -125,7 +125,7 @@ AccessTokenStore* GeolocationArbitratorImpl::NewAccessTokenStore() { } AccessTokenStore* GeolocationArbitratorImpl::GetAccessTokenStore() { - if (!access_token_store_.get()) + if (!access_token_store_) access_token_store_ = NewAccessTokenStore(); return access_token_store_.get(); } diff --git a/content/browser/geolocation/wifi_data_provider_corewlan_mac.mm b/content/browser/geolocation/wifi_data_provider_corewlan_mac.mm index e9f3e26..ab4a729 100644 --- a/content/browser/geolocation/wifi_data_provider_corewlan_mac.mm +++ b/content/browser/geolocation/wifi_data_provider_corewlan_mac.mm @@ -89,7 +89,7 @@ bool CoreWlanApi::Init() { } // "Leak" dl_handle rather than dlclose it, to ensure |merge_key_| // remains valid. - if (!merge_key_.get()) { + if (!merge_key_) { // Fall back to a known-working value should the lookup fail (if // this value is itself wrong it's not the end of the world, we might just // get very slightly lower quality location fixes due to SSID merges). diff --git a/content/browser/geolocation/wifi_data_provider_linux.cc b/content/browser/geolocation/wifi_data_provider_linux.cc index c8d68ac..09a60f3 100644 --- a/content/browser/geolocation/wifi_data_provider_linux.cc +++ b/content/browser/geolocation/wifi_data_provider_linux.cc @@ -148,7 +148,7 @@ bool NetworkManagerWlanApi::GetAccessPointData( device_proxy->CallMethodAndBlock( &method_call, dbus::ObjectProxy::TIMEOUT_USE_DEFAULT)); - if (!response.get()) { + if (!response) { LOG(WARNING) << "Failed to get the device type for " << device_path.value(); continue; // Check the next device. @@ -180,7 +180,7 @@ bool NetworkManagerWlanApi::GetAdapterDeviceList( network_manager_proxy_->CallMethodAndBlock( &method_call, dbus::ObjectProxy::TIMEOUT_USE_DEFAULT)); - if (!response.get()) { + if (!response) { LOG(WARNING) << "Failed to get the device list"; return false; } @@ -208,7 +208,7 @@ bool NetworkManagerWlanApi::GetAccessPointsForAdapter( device_proxy->CallMethodAndBlock( &method_call, dbus::ObjectProxy::TIMEOUT_USE_DEFAULT)); - if (!response.get()) { + if (!response) { LOG(WARNING) << "Failed to get access points data for " << adapter_path.value(); return false; @@ -236,7 +236,7 @@ bool NetworkManagerWlanApi::GetAccessPointsForAdapter( { scoped_ptr<dbus::Response> response( GetAccessPointProperty(access_point_proxy, "Ssid")); - if (!response.get()) + if (!response) continue; // The response should contain a variant that contains an array of bytes. dbus::MessageReader reader(response.get()); @@ -260,7 +260,7 @@ bool NetworkManagerWlanApi::GetAccessPointsForAdapter( { // Read the mac address scoped_ptr<dbus::Response> response( GetAccessPointProperty(access_point_proxy, "HwAddress")); - if (!response.get()) + if (!response) continue; dbus::MessageReader reader(response.get()); std::string mac; @@ -284,7 +284,7 @@ bool NetworkManagerWlanApi::GetAccessPointsForAdapter( { // Read signal strength. scoped_ptr<dbus::Response> response( GetAccessPointProperty(access_point_proxy, "Strength")); - if (!response.get()) + if (!response) continue; dbus::MessageReader reader(response.get()); uint8 strength = 0; @@ -300,7 +300,7 @@ bool NetworkManagerWlanApi::GetAccessPointsForAdapter( { // Read the channel scoped_ptr<dbus::Response> response( GetAccessPointProperty(access_point_proxy, "Frequency")); - if (!response.get()) + if (!response) continue; dbus::MessageReader reader(response.get()); uint32 frequency = 0; @@ -335,7 +335,7 @@ scoped_ptr<dbus::Response> NetworkManagerWlanApi::GetAccessPointProperty( scoped_ptr<dbus::Response> response = access_point_proxy->CallMethodAndBlock( &method_call, dbus::ObjectProxy::TIMEOUT_USE_DEFAULT); - if (!response.get()) { + if (!response) { LOG(WARNING) << "Failed to get property for " << property_name; } return response.Pass(); diff --git a/content/browser/gpu/browser_gpu_channel_host_factory.cc b/content/browser/gpu/browser_gpu_channel_host_factory.cc index ca18691..00ab6c3 100644 --- a/content/browser/gpu/browser_gpu_channel_host_factory.cc +++ b/content/browser/gpu/browser_gpu_channel_host_factory.cc @@ -251,7 +251,7 @@ void BrowserGpuChannelHostFactory::GpuChannelEstablishedOnIO( GpuChannelHost* BrowserGpuChannelHostFactory::EstablishGpuChannelSync( CauseForGpuLaunch cause_for_gpu_launch) { - if (gpu_channel_.get()) { + if (gpu_channel_) { // Recreate the channel if it has been lost. if (gpu_channel_->state() == GpuChannelHost::kLost) gpu_channel_ = NULL; diff --git a/content/browser/gpu/gpu_data_manager_impl.cc b/content/browser/gpu/gpu_data_manager_impl.cc index 1afc18a..589ff0b 100644 --- a/content/browser/gpu/gpu_data_manager_impl.cc +++ b/content/browser/gpu/gpu_data_manager_impl.cc @@ -363,7 +363,7 @@ void GpuDataManagerImpl::UpdateGpuInfo(const GPUInfo& gpu_info) { GetContentClient()->SetGpuInfo(my_gpu_info); - if (gpu_blacklist_.get()) { + if (gpu_blacklist_) { std::set<int> features = gpu_blacklist_->MakeDecision( GpuControlList::kOsAny, std::string(), my_gpu_info); if (update_histograms_) @@ -371,7 +371,7 @@ void GpuDataManagerImpl::UpdateGpuInfo(const GPUInfo& gpu_info) { UpdateBlacklistedFeatures(features); } - if (gpu_switching_list_.get()) { + if (gpu_switching_list_) { std::set<int> option = gpu_switching_list_->MakeDecision( GpuControlList::kOsAny, std::string(), my_gpu_info); if (option.size() == 1) { @@ -381,7 +381,7 @@ void GpuDataManagerImpl::UpdateGpuInfo(const GPUInfo& gpu_info) { gpu_switching_ = static_cast<GpuSwitchingOption>(*(option.begin())); } } - if (gpu_driver_bug_list_.get()) + if (gpu_driver_bug_list_) gpu_driver_bugs_ = gpu_driver_bug_list_->MakeDecision( GpuControlList::kOsAny, std::string(), my_gpu_info); @@ -588,14 +588,14 @@ void GpuDataManagerImpl::DisableHardwareAcceleration() { } std::string GpuDataManagerImpl::GetBlacklistVersion() const { - if (gpu_blacklist_.get()) + if (gpu_blacklist_) return gpu_blacklist_->version(); return "0"; } base::ListValue* GpuDataManagerImpl::GetBlacklistReasons() const { ListValue* reasons = new ListValue(); - if (gpu_blacklist_.get()) + if (gpu_blacklist_) gpu_blacklist_->GetReasons(reasons); return reasons; } diff --git a/content/browser/in_process_webkit/indexed_db_dispatcher_host.cc b/content/browser/in_process_webkit/indexed_db_dispatcher_host.cc index 7f384d9..9e45d07 100644 --- a/content/browser/in_process_webkit/indexed_db_dispatcher_host.cc +++ b/content/browser/in_process_webkit/indexed_db_dispatcher_host.cc @@ -135,7 +135,7 @@ bool IndexedDBDispatcherHost::OnMessageReceived(const IPC::Message& message, } int32 IndexedDBDispatcherHost::Add(WebIDBCursor* idb_cursor) { - if (!cursor_dispatcher_host_.get()) { + if (!cursor_dispatcher_host_) { delete idb_cursor; return 0; } @@ -145,7 +145,7 @@ int32 IndexedDBDispatcherHost::Add(WebIDBCursor* idb_cursor) { int32 IndexedDBDispatcherHost::Add(WebIDBDatabase* idb_database, int32 ipc_thread_id, const GURL& origin_url) { - if (!database_dispatcher_host_.get()) { + if (!database_dispatcher_host_) { delete idb_database; return 0; } diff --git a/content/browser/indexed_db/indexed_db_context_impl.cc b/content/browser/indexed_db/indexed_db_context_impl.cc index f045681..8905b43 100644 --- a/content/browser/indexed_db/indexed_db_context_impl.cc +++ b/content/browser/indexed_db/indexed_db_context_impl.cc @@ -103,7 +103,7 @@ IndexedDBContextImpl::IndexedDBContextImpl( WebIDBFactory* IndexedDBContextImpl::GetIDBFactory() { DCHECK(BrowserThread::CurrentlyOn(BrowserThread::WEBKIT_DEPRECATED)); - if (!idb_factory_.get()) { + if (!idb_factory_) { // Prime our cache of origins with existing databases so we can // detect when dbs are newly created. GetOriginSet(); @@ -367,7 +367,7 @@ void IndexedDBContextImpl::QueryAvailableQuota(const GURL& origin_url) { } std::set<GURL>* IndexedDBContextImpl::GetOriginSet() { - if (!origin_set_.get()) { + if (!origin_set_) { origin_set_.reset(new std::set<GURL>); std::vector<GURL> origins; GetAllOriginsAndPaths(data_path_, &origins, NULL); diff --git a/content/browser/loader/resource_dispatcher_host_impl.cc b/content/browser/loader/resource_dispatcher_host_impl.cc index 8b655fc..7eee77b 100644 --- a/content/browser/loader/resource_dispatcher_host_impl.cc +++ b/content/browser/loader/resource_dispatcher_host_impl.cc @@ -1397,7 +1397,7 @@ void ResourceDispatcherHostImpl::RemovePendingLoader( pending_loaders_.erase(iter); // If we have no more pending requests, then stop the load state monitor - if (pending_loaders_.empty() && update_load_states_timer_.get()) + if (pending_loaders_.empty() && update_load_states_timer_) update_load_states_timer_->Stop(); } diff --git a/content/browser/loader/resource_dispatcher_host_unittest.cc b/content/browser/loader/resource_dispatcher_host_unittest.cc index 5c3faef..ac5e826 100644 --- a/content/browser/loader/resource_dispatcher_host_unittest.cc +++ b/content/browser/loader/resource_dispatcher_host_unittest.cc @@ -497,7 +497,7 @@ class TestResourceDispatcherHostDelegate int route_id, bool is_continuation_of_transferred_request, ScopedVector<ResourceThrottle>* throttles) OVERRIDE { - if (user_data_.get()) { + if (user_data_) { const void* key = user_data_.get(); request->SetUserData(key, user_data_.release()); } diff --git a/content/browser/media/media_internals_proxy.cc b/content/browser/media/media_internals_proxy.cc index 5d837d6..4ab19f1 100644 --- a/content/browser/media/media_internals_proxy.cc +++ b/content/browser/media/media_internals_proxy.cc @@ -152,7 +152,7 @@ void MediaInternalsProxy::AddNetEventOnUIThread(base::Value* entry) { // Send the updates to the page in kMediaInternalsProxyEventDelayMilliseconds // if an update is not already pending. - if (!pending_net_updates_.get()) { + if (!pending_net_updates_) { pending_net_updates_.reset(new base::ListValue()); MessageLoop::current()->PostDelayedTask( FROM_HERE, diff --git a/content/browser/net/sqlite_persistent_cookie_store.cc b/content/browser/net/sqlite_persistent_cookie_store.cc index 82bdd06..a315985 100644 --- a/content/browser/net/sqlite_persistent_cookie_store.cc +++ b/content/browser/net/sqlite_persistent_cookie_store.cc @@ -624,7 +624,7 @@ void SQLitePersistentCookieStore::Backend::ChainLoadCookies( bool load_success = true; - if (!db_.get()) { + if (!db_) { // Close() has been called on this store. load_success = false; } else if (keys_to_load_.size() > 0) { @@ -994,10 +994,10 @@ void SQLitePersistentCookieStore::Backend::InternalBackgroundClose() { void SQLitePersistentCookieStore::Backend::DeleteSessionCookiesOnShutdown() { DCHECK(background_task_runner_->RunsTasksOnCurrentThread()); - if (!db_.get()) + if (!db_) return; - if (!special_storage_policy_.get()) + if (!special_storage_policy_) return; sql::Statement del_smt(db_->GetCachedStatement( @@ -1048,7 +1048,7 @@ void SQLitePersistentCookieStore::Backend::ScheduleKillDatabase() { void SQLitePersistentCookieStore::Backend::KillDatabase() { DCHECK(background_task_runner_->RunsTasksOnCurrentThread()); - if (db_.get()) { + if (db_) { // This Backend will now be in-memory only. In a future run we will recreate // the database. Hopefully things go better then! bool success = db_->RazeAndClose(); diff --git a/content/browser/plugin_service_impl.cc b/content/browser/plugin_service_impl.cc index a800ec2..3986644 100644 --- a/content/browser/plugin_service_impl.cc +++ b/content/browser/plugin_service_impl.cc @@ -152,9 +152,9 @@ PluginServiceImpl::~PluginServiceImpl() { // Release the events since they're owned by RegKey, not WaitableEvent. hkcu_watcher_.StopWatching(); hklm_watcher_.StopWatching(); - if (hkcu_event_.get()) + if (hkcu_event_) hkcu_event_->Release(); - if (hklm_event_.get()) + if (hklm_event_) hklm_event_->Release(); #endif // Make sure no plugin channel requests have been leaked. @@ -606,7 +606,7 @@ void PluginServiceImpl::GetPlugins(const GetPluginsCallback& callback) { } else { // If we switch back to loading plugins in process, then we need to make // sure g_thread_init() gets called since plugins may call glib at load. - if (!plugin_loader_.get()) + if (!plugin_loader_) plugin_loader_ = new PluginLoaderPosix; BrowserThread::PostTask(BrowserThread::IO, FROM_HERE, base::Bind(&PluginLoaderPosix::LoadPlugins, plugin_loader_, @@ -633,7 +633,7 @@ void PluginServiceImpl::GetPluginsInternal( void PluginServiceImpl::OnWaitableEventSignaled( base::WaitableEvent* waitable_event) { #if defined(OS_WIN) - if (waitable_event == hkcu_event_.get()) { + if (waitable_event == hkcu_event_) { hkcu_key_.StartWatching(); } else { hklm_key_.StartWatching(); diff --git a/content/browser/power_save_blocker_linux.cc b/content/browser/power_save_blocker_linux.cc index a0e3764..c7dba77 100644 --- a/content/browser/power_save_blocker_linux.cc +++ b/content/browser/power_save_blocker_linux.cc @@ -242,7 +242,7 @@ void PowerSaveBlockerImpl::Delegate::ApplyBlock(DBusAPI api) { // We're on the FILE thread so it should be OK to block briefly here. scoped_ptr<dbus::Response> response(object_proxy->CallMethodAndBlock( method_call.get(), dbus::ObjectProxy::TIMEOUT_USE_DEFAULT)); - if (response.get()) { + if (response) { // The method returns an inhibit_cookie, used to uniquely identify // this request. It should be used as an argument to Uninhibit() // in order to remove the request. @@ -285,7 +285,7 @@ void PowerSaveBlockerImpl::Delegate::RemoveBlock(DBusAPI api) { message_writer.AppendUint32(inhibit_cookie_); scoped_ptr<dbus::Response> response(object_proxy->CallMethodAndBlock( method_call.get(), dbus::ObjectProxy::TIMEOUT_USE_DEFAULT)); - if (!response.get()) + if (!response) LOG(ERROR) << "No response to Uninhibit() request!"; // We don't care about checking the result. We assume it works; we can't // really do anything about it anyway if it fails. diff --git a/content/browser/renderer_host/compositing_iosurface_mac.mm b/content/browser/renderer_host/compositing_iosurface_mac.mm index 6da2085..f000456 100644 --- a/content/browser/renderer_host/compositing_iosurface_mac.mm +++ b/content/browser/renderer_host/compositing_iosurface_mac.mm @@ -573,7 +573,7 @@ bool CompositingIOSurfaceMac::MapIOSurfaceToTexture( static_cast<uint32>(io_surface_handle))); // Can fail if IOSurface with that ID was already released by the gpu // process. - if (!io_surface_.get()) { + if (!io_surface_) { io_surface_handle_ = 0; return false; } diff --git a/content/browser/renderer_host/compositor_impl_android.cc b/content/browser/renderer_host/compositor_impl_android.cc index 78d6834..25c4fea 100644 --- a/content/browser/renderer_host/compositor_impl_android.cc +++ b/content/browser/renderer_host/compositor_impl_android.cc @@ -129,7 +129,7 @@ CompositorImpl::~CompositorImpl() { } void CompositorImpl::Composite() { - if (host_.get()) + if (host_) host_->Composite(base::TimeTicks::Now()); } @@ -183,7 +183,7 @@ void CompositorImpl::SetSurface(jobject surface) { void CompositorImpl::SetVisible(bool visible) { if (!visible) { host_.reset(); - } else if (!host_.get()) { + } else if (!host_) { cc::LayerTreeSettings settings; settings.refresh_rate = 60.0; settings.impl_side_painting = false; @@ -229,12 +229,12 @@ void CompositorImpl::SetWindowBounds(const gfx::Size& size) { void CompositorImpl::SetHasTransparentBackground(bool flag) { has_transparent_background_ = flag; - if (host_.get()) + if (host_) host_->set_has_transparent_background(flag); } bool CompositorImpl::CompositeAndReadback(void *pixels, const gfx::Rect& rect) { - if (host_.get()) + if (host_) return host_->CompositeAndReadback(pixels, rect); else return false; diff --git a/content/browser/renderer_host/image_transport_factory.cc b/content/browser/renderer_host/image_transport_factory.cc index aab8860..b2f09b7 100644 --- a/content/browser/renderer_host/image_transport_factory.cc +++ b/content/browser/renderer_host/image_transport_factory.cc @@ -462,7 +462,7 @@ class GpuProcessTransportFactory } virtual GLHelper* GetGLHelper() OVERRIDE { - if (!gl_helper_.get()) { + if (!gl_helper_) { CreateSharedContextLazy(); WebGraphicsContext3DCommandBufferImpl* context_for_main_thread = shared_contexts_main_thread_->Context3d(); diff --git a/content/browser/renderer_host/image_transport_factory_android.cc b/content/browser/renderer_host/image_transport_factory_android.cc index a4b6bd6..bfb6dbb 100644 --- a/content/browser/renderer_host/image_transport_factory_android.cc +++ b/content/browser/renderer_host/image_transport_factory_android.cc @@ -160,7 +160,7 @@ void CmdBufferImageTransportFactory::ReleaseTexture( } GLHelper* CmdBufferImageTransportFactory::GetGLHelper() { - if (!gl_helper_.get()) + if (!gl_helper_) gl_helper_.reset(new GLHelper(context_.get())); return gl_helper_.get(); diff --git a/content/browser/renderer_host/java/java_type.cc b/content/browser/renderer_host/java/java_type.cc index e68f6db..b590e77 100644 --- a/content/browser/renderer_host/java/java_type.cc +++ b/content/browser/renderer_host/java/java_type.cc @@ -68,7 +68,7 @@ JavaType::~JavaType() { JavaType& JavaType::operator=(const JavaType& other) { type = other.type; - if (other.inner_type.get()) { + if (other.inner_type) { DCHECK_EQ(JavaType::TypeArray, type); inner_type.reset(new JavaType(*other.inner_type)); } else { diff --git a/content/browser/renderer_host/media/audio_input_renderer_host.cc b/content/browser/renderer_host/media/audio_input_renderer_host.cc index 65f9e62..3f60520 100644 --- a/content/browser/renderer_host/media/audio_input_renderer_host.cc +++ b/content/browser/renderer_host/media/audio_input_renderer_host.cc @@ -404,7 +404,7 @@ AudioInputRendererHost::AudioEntry* AudioInputRendererHost::LookupByController( // TODO(hclam): Implement a faster look up method. for (AudioEntryMap::iterator i = audio_entries_.begin(); i != audio_entries_.end(); ++i) { - if (controller == i->second->controller.get()) + if (controller == i->second->controller) return i->second; } return NULL; diff --git a/content/browser/renderer_host/media/audio_sync_reader.cc b/content/browser/renderer_host/media/audio_sync_reader.cc index 7b3ea02..5e0a169 100644 --- a/content/browser/renderer_host/media/audio_sync_reader.cc +++ b/content/browser/renderer_host/media/audio_sync_reader.cc @@ -63,7 +63,7 @@ void AudioSyncReader::UpdatePendingBytes(uint32 bytes) { media::SetUnknownDataSize(shared_memory_, packet_size_); } - if (socket_.get()) { + if (socket_) { socket_->Send(&bytes, sizeof(bytes)); } } @@ -75,7 +75,7 @@ int AudioSyncReader::Read(AudioBus* source, AudioBus* dest) { // Copy optional synchronized live audio input for consumption by renderer // process. - if (source && input_bus_.get()) { + if (source && input_bus_) { DCHECK_EQ(source->channels(), input_bus_->channels()); DCHECK_LE(source->frames(), input_bus_->frames()); source->CopyTo(input_bus_.get()); @@ -119,7 +119,7 @@ int AudioSyncReader::Read(AudioBus* source, AudioBus* dest) { } void AudioSyncReader::Close() { - if (socket_.get()) { + if (socket_) { socket_->Close(); } } diff --git a/content/browser/renderer_host/media/media_stream_manager.cc b/content/browser/renderer_host/media/media_stream_manager.cc index a640dc5..0646835 100644 --- a/content/browser/renderer_host/media/media_stream_manager.cc +++ b/content/browser/renderer_host/media/media_stream_manager.cc @@ -615,7 +615,7 @@ void MediaStreamManager::HandleRequest(const std::string& label) { void MediaStreamManager::InitializeDeviceManagersOnIOThread() { DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); - if (device_thread_.get()) + if (device_thread_) return; device_thread_.reset(new base::Thread("MediaStreamDeviceThread")); @@ -1001,7 +1001,7 @@ void MediaStreamManager::UseFakeDevice() { void MediaStreamManager::WillDestroyCurrentMessageLoop() { DCHECK_EQ(MessageLoop::current(), io_loop_); DCHECK(requests_.empty()); - if (device_thread_.get()) { + if (device_thread_) { StopMonitoring(); video_capture_manager_->Unregister(); diff --git a/content/browser/renderer_host/media/web_contents_video_capture_device.cc b/content/browser/renderer_host/media/web_contents_video_capture_device.cc index 8530cf4..a5095cf 100644 --- a/content/browser/renderer_host/media/web_contents_video_capture_device.cc +++ b/content/browser/renderer_host/media/web_contents_video_capture_device.cc @@ -1119,17 +1119,17 @@ void WebContentsVideoCaptureDevice::Impl::AssignCaptureMachine( scoped_ptr<CaptureMachine> capture_machine) { DCHECK(!impl || impl->thread_checker_.CalledOnValidThread()); - if (!impl.get()) { + if (!impl) { // If WCVD::Impl was destroyed before we got back on it's thread and // capture_machine is not NULL, then we need to return to the UI thread to // safely cleanup the CaptureMachine. - if (capture_machine.get()) { + if (capture_machine) { BrowserThread::PostTask( BrowserThread::UI, FROM_HERE, base::Bind( &DeleteCaptureMachineOnUIThread, base::Passed(&capture_machine))); return; } - } else if (!capture_machine.get()) { + } else if (!capture_machine) { impl->Error(); } else { impl->capture_machine_ = capture_machine.Pass(); @@ -1167,7 +1167,7 @@ WebContentsVideoCaptureDevice::Impl::~Impl() { // There is still a capture pipeline running that is checking in with the // oracle, and processing captures that are already started in flight. That // pipeline must be shut down asynchronously, on the UI thread. - if (capture_machine_.get()) { + if (capture_machine_) { // The task that is posted to the UI thread might not run if we are shutting // down, so we transfer ownership of CaptureMachine to the closure so that // it is still cleaned up when the closure is deleted. diff --git a/content/browser/renderer_host/p2p/socket_dispatcher_host.cc b/content/browser/renderer_host/p2p/socket_dispatcher_host.cc index 7c79711..36b9210 100644 --- a/content/browser/renderer_host/p2p/socket_dispatcher_host.cc +++ b/content/browser/renderer_host/p2p/socket_dispatcher_host.cc @@ -197,7 +197,7 @@ void P2PSocketDispatcherHost::OnCreateSocket( scoped_ptr<P2PSocketHost> socket( P2PSocketHost::Create(this, socket_id, type)); - if (!socket.get()) { + if (!socket) { Send(new P2PMsg_OnError(socket_id)); return; } diff --git a/content/browser/renderer_host/p2p/socket_host_tcp.cc b/content/browser/renderer_host/p2p/socket_host_tcp.cc index be59f72..834afb7 100644 --- a/content/browser/renderer_host/p2p/socket_host_tcp.cc +++ b/content/browser/renderer_host/p2p/socket_host_tcp.cc @@ -186,7 +186,7 @@ void P2PSocketHostTcp::DidCompleteRead(int result) { void P2PSocketHostTcp::Send(const net::IPEndPoint& to, const std::vector<char>& data) { - if (!socket_.get()) { + if (!socket_) { // The Send message may be sent after the an OnError message was // sent by hasn't been processed the renderer. return; diff --git a/content/browser/renderer_host/p2p/socket_host_udp.cc b/content/browser/renderer_host/p2p/socket_host_udp.cc index 6a9a93d..68718c2 100644 --- a/content/browser/renderer_host/p2p/socket_host_udp.cc +++ b/content/browser/renderer_host/p2p/socket_host_udp.cc @@ -140,7 +140,7 @@ void P2PSocketHostUdp::HandleReadResult(int result) { void P2PSocketHostUdp::Send(const net::IPEndPoint& to, const std::vector<char>& data) { - if (!socket_.get()) { + if (!socket_) { // The Send message may be sent after the an OnError message was // sent by hasn't been processed the renderer. return; diff --git a/content/browser/renderer_host/pepper/pepper_message_filter.cc b/content/browser/renderer_host/pepper/pepper_message_filter.cc index f73e08d..95fe84d 100644 --- a/content/browser/renderer_host/pepper/pepper_message_filter.cc +++ b/content/browser/renderer_host/pepper/pepper_message_filter.cc @@ -154,7 +154,7 @@ net::HostResolver* PepperMessageFilter::GetHostResolver() { } net::CertVerifier* PepperMessageFilter::GetCertVerifier() { - if (!cert_verifier_.get()) + if (!cert_verifier_) cert_verifier_.reset(net::CertVerifier::CreateDefault()); return cert_verifier_.get(); diff --git a/content/browser/renderer_host/pepper/pepper_tcp_socket.cc b/content/browser/renderer_host/pepper/pepper_tcp_socket.cc index c77563a..3638898 100644 --- a/content/browser/renderer_host/pepper/pepper_tcp_socket.cc +++ b/content/browser/renderer_host/pepper/pepper_tcp_socket.cc @@ -66,7 +66,7 @@ PepperTCPSocket::PepperTCPSocket( PepperTCPSocket::~PepperTCPSocket() { // Make sure no further callbacks from socket_. - if (socket_.get()) + if (socket_) socket_->Disconnect(); } @@ -140,7 +140,7 @@ void PepperTCPSocket::SSLHandshake( ssl_context.cert_verifier = manager_->GetCertVerifier(); socket_.reset(factory->CreateSSLClientSocket( handle, host_port_pair, manager_->ssl_config(), ssl_context)); - if (!socket_.get()) { + if (!socket_) { LOG(WARNING) << "Failed to create an SSL client socket."; OnSSLHandshakeCompleted(net::ERR_UNEXPECTED); return; @@ -291,7 +291,7 @@ bool PepperTCPSocket::GetCertificateFields( ppapi::PPB_X509Certificate_Fields* fields) { scoped_refptr<net::X509Certificate> cert = net::X509Certificate::CreateFromBytes(der, length); - if (!cert.get()) + if (!cert) return false; return GetCertificateFields(*cert, fields); } @@ -314,7 +314,7 @@ void PepperTCPSocket::SendSSLHandshakeACK(bool succeeded) { static_cast<net::SSLClientSocket*>(socket_.get()); net::SSLInfo ssl_info; ssl_socket->GetSSLInfo(&ssl_info); - if (ssl_info.cert.get()) + if (ssl_info.cert) GetCertificateFields(*ssl_info.cert, &certificate_fields); } manager_->Send(new PpapiMsg_PPBTCPSocket_SSLHandshakeACK( diff --git a/content/browser/renderer_host/pepper/pepper_udp_socket_private_message_filter.cc b/content/browser/renderer_host/pepper/pepper_udp_socket_private_message_filter.cc index 4799d66..e6563cf 100644 --- a/content/browser/renderer_host/pepper/pepper_udp_socket_private_message_filter.cc +++ b/content/browser/renderer_host/pepper/pepper_udp_socket_private_message_filter.cc @@ -165,7 +165,7 @@ int32_t PepperUDPSocketPrivateMessageFilter::OnMsgRecvFrom( if (closed_) return PP_ERROR_FAILED; - if (recvfrom_buffer_.get()) + if (recvfrom_buffer_) return PP_ERROR_INPROGRESS; if (num_bytes > ppapi::proxy::UDPSocketPrivateResource::kMaxReadSize) { // |num_bytes| value is checked on the plugin side. @@ -263,7 +263,7 @@ void PepperUDPSocketPrivateMessageFilter::DoSendTo( return; } - if (sendto_buffer_.get()) { + if (sendto_buffer_) { SendSendToError(context, PP_ERROR_INPROGRESS); return; } diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc index 53b2822..f9b629b 100644 --- a/content/browser/renderer_host/render_process_host_impl.cc +++ b/content/browser/renderer_host/render_process_host_impl.cc @@ -439,7 +439,7 @@ void RenderProcessHostImpl::EnableSendQueue() { bool RenderProcessHostImpl::Init() { // calling Init() more than once does nothing, this makes it more convenient // for the view host which may not be sure in some cases - if (channel_.get()) + if (channel_) return true; CommandLine::StringType renderer_prefix; @@ -1083,7 +1083,7 @@ void RenderProcessHostImpl::ClearTransportDIBCache() { } bool RenderProcessHostImpl::Send(IPC::Message* msg) { - if (!channel_.get()) { + if (!channel_) { if (!is_initialized_) { queued_messages_.push(msg); return true; @@ -1676,7 +1676,7 @@ void RenderProcessHostImpl::OnProcessLaunched() { if (deleting_soon_) return; - if (child_process_launcher_.get()) { + if (child_process_launcher_) { if (!child_process_launcher_->GetHandle()) { OnChannelError(); return; diff --git a/content/browser/renderer_host/render_sandbox_host_linux.cc b/content/browser/renderer_host/render_sandbox_host_linux.cc index 78eba83..97c9304 100644 --- a/content/browser/renderer_host/render_sandbox_host_linux.cc +++ b/content/browser/renderer_host/render_sandbox_host_linux.cc @@ -664,12 +664,12 @@ class SandboxIPCProcess { SandboxIPCProcess::~SandboxIPCProcess() { paths_.deleteAll(); - if (webkit_platform_support_.get()) + if (webkit_platform_support_) WebKit::shutdown(); } void SandboxIPCProcess::EnsureWebKitInitialized() { - if (webkit_platform_support_.get()) + if (webkit_platform_support_) return; webkit_platform_support_.reset(new WebKitPlatformSupportImpl); WebKit::initializeWithoutV8(webkit_platform_support_.get()); diff --git a/content/browser/renderer_host/render_view_host_impl.cc b/content/browser/renderer_host/render_view_host_impl.cc index 484e1fc..87aa019 100644 --- a/content/browser/renderer_host/render_view_host_impl.cc +++ b/content/browser/renderer_host/render_view_host_impl.cc @@ -361,7 +361,7 @@ void RenderViewHostImpl::SetNavigationsSuspended( DCHECK(navigations_suspended_ != suspend); navigations_suspended_ = suspend; - if (!suspend && suspended_nav_params_.get()) { + if (!suspend && suspended_nav_params_) { // There's navigation message params waiting to be sent. Now that we're not // suspended anymore, resume navigation by sending them. If we were swapped // out, we should also stop filtering out the IPC messages now. @@ -376,7 +376,7 @@ void RenderViewHostImpl::SetNavigationsSuspended( void RenderViewHostImpl::CancelSuspendedNavigations() { // Clear any state if a pending navigation is canceled or pre-empted. - if (suspended_nav_params_.get()) + if (suspended_nav_params_) suspended_nav_params_.reset(); navigations_suspended_ = false; } diff --git a/content/browser/renderer_host/render_widget_host_impl.cc b/content/browser/renderer_host/render_widget_host_impl.cc index d84036b..6803a53 100644 --- a/content/browser/renderer_host/render_widget_host_impl.cc +++ b/content/browser/renderer_host/render_widget_host_impl.cc @@ -309,7 +309,7 @@ int RenderWidgetHostImpl::SyntheticScrollMessageInterval() const { void RenderWidgetHostImpl::SetOverscrollControllerEnabled(bool enabled) { if (!enabled) overscroll_controller_.reset(); - else if (!overscroll_controller_.get()) + else if (!overscroll_controller_) overscroll_controller_.reset(new OverscrollController(this)); } @@ -1037,7 +1037,7 @@ void RenderWidgetHostImpl::ForwardMouseEventImmediately( // more WM_MOUSEMOVE events than we wish to send to the renderer. if (mouse_event.type == WebInputEvent::MouseMove) { if (mouse_move_pending_) { - if (!next_mouse_move_.get()) { + if (!next_mouse_move_) { next_mouse_move_.reset(new WebMouseEvent(mouse_event)); } else { // Accumulate movement deltas. @@ -1331,7 +1331,7 @@ void RenderWidgetHostImpl::RendererExited(base::TerminationStatus status, // Must reset these to ensure that gesture events work with a new renderer. gesture_event_filter_->Reset(); - if (overscroll_controller_.get()) + if (overscroll_controller_) overscroll_controller_->Reset(); // Must reset these to ensure that keyboard events work with a new renderer. @@ -1840,7 +1840,7 @@ void RenderWidgetHostImpl::OnInputEventAck( mouse_move_pending_ = false; // now, we can send the next mouse move event - if (next_mouse_move_.get()) { + if (next_mouse_move_) { DCHECK(next_mouse_move_->type == WebInputEvent::MouseMove); ForwardMouseEvent(*next_mouse_move_); } @@ -1958,7 +1958,7 @@ void RenderWidgetHostImpl::TickActiveSmoothScrollGesture() { void RenderWidgetHostImpl::OnSelectRangeAck() { select_range_pending_ = false; - if (next_selection_range_.get()) { + if (next_selection_range_) { scoped_ptr<SelectionRange> next(next_selection_range_.Pass()); SelectRange(next->start, next->end); } @@ -1966,7 +1966,7 @@ void RenderWidgetHostImpl::OnSelectRangeAck() { void RenderWidgetHostImpl::OnMsgMoveCaretAck() { move_caret_pending_ = false; - if (next_move_caret_.get()) { + if (next_move_caret_) { scoped_ptr<gfx::Point> next(next_move_caret_.Pass()); MoveCaret(*next); } @@ -1975,7 +1975,7 @@ void RenderWidgetHostImpl::OnMsgMoveCaretAck() { void RenderWidgetHostImpl::ProcessWheelAck(bool processed) { mouse_wheel_pending_ = false; - if (overscroll_controller_.get()) + if (overscroll_controller_) overscroll_controller_->ReceivedEventACK(current_wheel_event_, processed); // Now send the next (coalesced) mouse wheel event. @@ -1991,7 +1991,7 @@ void RenderWidgetHostImpl::ProcessWheelAck(bool processed) { } void RenderWidgetHostImpl::ProcessGestureAck(bool processed, int type) { - if (overscroll_controller_.get()) { + if (overscroll_controller_) { overscroll_controller_->ReceivedEventACK( gesture_event_filter_->GetGestureEventAwaitingAck(), processed); } @@ -2339,7 +2339,7 @@ void RenderWidgetHostImpl::ScrollFocusedEditableNodeIntoRect( void RenderWidgetHostImpl::SelectRange(const gfx::Point& start, const gfx::Point& end) { if (select_range_pending_) { - if (!next_selection_range_.get()) { + if (!next_selection_range_) { next_selection_range_.reset(new SelectionRange()); } next_selection_range_->start = start; 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 1597e00..1067355 100644 --- a/content/browser/renderer_host/render_widget_host_view_android.cc +++ b/content/browser/renderer_host/render_widget_host_view_android.cc @@ -647,7 +647,7 @@ gfx::Rect RenderWidgetHostViewAndroid::GetBoundsInRootWindow() { } gfx::GLSurfaceHandle RenderWidgetHostViewAndroid::GetCompositingSurface() { - if (surface_texture_transport_.get()) { + if (surface_texture_transport_) { return surface_texture_transport_->GetCompositingSurface( host_->surface_id()); } else { diff --git a/content/browser/renderer_host/render_widget_host_view_aura.cc b/content/browser/renderer_host/render_widget_host_view_aura.cc index 1785386..fd3f2a3 100644 --- a/content/browser/renderer_host/render_widget_host_view_aura.cc +++ b/content/browser/renderer_host/render_widget_host_view_aura.cc @@ -1708,7 +1708,7 @@ void RenderWidgetHostViewAura::CopyFromCompositingSurfaceFinished( bool result) { callback.Run(result, bitmap); - if (!render_widget_host_view.get()) + if (!render_widget_host_view) return; --render_widget_host_view->pending_thumbnail_tasks_; } diff --git a/content/browser/renderer_host/render_widget_host_view_gtk.cc b/content/browser/renderer_host/render_widget_host_view_gtk.cc index 803cda0..8b289ed 100644 --- a/content/browser/renderer_host/render_widget_host_view_gtk.cc +++ b/content/browser/renderer_host/render_widget_host_view_gtk.cc @@ -1547,7 +1547,7 @@ void RenderWidgetHostViewGtk::FatalAccessibilityTreeError() { void RenderWidgetHostViewGtk::OnAccessibilityNotifications( const std::vector<AccessibilityHostMsg_NotificationParams>& params) { - if (!browser_accessibility_manager_.get()) { + if (!browser_accessibility_manager_) { GtkWidget* parent = gtk_widget_get_parent(view_.get()); browser_accessibility_manager_.reset( new BrowserAccessibilityManagerGtk( @@ -1559,7 +1559,7 @@ void RenderWidgetHostViewGtk::OnAccessibilityNotifications( } AtkObject* RenderWidgetHostViewGtk::GetAccessible() { - if (!browser_accessibility_manager_.get()) { + if (!browser_accessibility_manager_) { GtkWidget* parent = gtk_widget_get_parent(view_.get()); browser_accessibility_manager_.reset( new BrowserAccessibilityManagerGtk( diff --git a/content/browser/renderer_host/render_widget_host_view_mac.mm b/content/browser/renderer_host/render_widget_host_view_mac.mm index 14d4f2c..4a3b027 100644 --- a/content/browser/renderer_host/render_widget_host_view_mac.mm +++ b/content/browser/renderer_host/render_widget_host_view_mac.mm @@ -1051,7 +1051,7 @@ bool RenderWidgetHostViewMac::CompositorSwapBuffers(uint64 surface_handle, if (window_number() <= 0) { // There is no window to present so capturing during present won't work. // We check if frame subscriber wants this frame and capture manually. - if (compositing_iosurface_.get() && frame_subscriber_.get()) { + if (compositing_iosurface_.get() && frame_subscriber_) { scoped_refptr<media::VideoFrame> frame; RenderWidgetHostViewFrameSubscriber::DeliverFrameCallback callback; if (frame_subscriber_->ShouldCaptureFrame(&frame, &callback)) { @@ -1084,7 +1084,7 @@ bool RenderWidgetHostViewMac::CompositorSwapBuffers(uint64 surface_handle, return true; } - if (!compositing_iosurface_.get()) { + if (!compositing_iosurface_) { CompositingIOSurfaceMac::SurfaceOrder order = allow_overlapping_views_ ? CompositingIOSurfaceMac::SURFACE_ORDER_BELOW_WINDOW : CompositingIOSurfaceMac::SURFACE_ORDER_ABOVE_WINDOW; @@ -1092,7 +1092,7 @@ bool RenderWidgetHostViewMac::CompositorSwapBuffers(uint64 surface_handle, CompositingIOSurfaceMac::Create(window_number(), order)); } - if (!compositing_iosurface_.get()) + if (!compositing_iosurface_) return true; compositing_iosurface_->SetIOSurface(surface_handle, size); @@ -1123,7 +1123,7 @@ void RenderWidgetHostViewMac::AckPendingSwapBuffers() { if (pending_swap_buffers_acks_.front().first != 0) { AcceleratedSurfaceMsg_BufferPresented_Params ack_params; ack_params.sync_point = 0; - if (compositing_iosurface_.get()) + if (compositing_iosurface_) ack_params.renderer_id = compositing_iosurface_->GetRendererID(); RenderWidgetHostImpl::AcknowledgeBufferPresent( pending_swap_buffers_acks_.front().first, @@ -1133,7 +1133,7 @@ void RenderWidgetHostViewMac::AckPendingSwapBuffers() { render_widget_host_->AcknowledgeSwapBuffersToRenderer(); // Send VSync parameters to compositor thread. - if (compositing_iosurface_.get()) { + if (compositing_iosurface_) { base::TimeTicks timebase; uint32 numerator = 0, denominator = 0; compositing_iosurface_->GetVSyncParameters(&timebase, @@ -1306,7 +1306,7 @@ void RenderWidgetHostViewMac::AcceleratedSurfacePostSubBuffer( } void RenderWidgetHostViewMac::AcceleratedSurfaceSuspend() { - if (compositing_iosurface_.get()) + if (compositing_iosurface_) compositing_iosurface_->UnrefIOSurface(); } @@ -2183,7 +2183,7 @@ gfx::Rect RenderWidgetHostViewMac::GetScaledOpenGLPixelRect( return; handlingGlobalFrameDidChange_ = YES; - if (renderWidgetHostView_->compositing_iosurface_.get()) + if (renderWidgetHostView_->compositing_iosurface_) renderWidgetHostView_->compositing_iosurface_->GlobalFrameDidChange(); handlingGlobalFrameDidChange_ = NO; } diff --git a/content/browser/renderer_host/render_widget_host_view_win.cc b/content/browser/renderer_host/render_widget_host_view_win.cc index ea99f0a..dc7d008e 100644 --- a/content/browser/renderer_host/render_widget_host_view_win.cc +++ b/content/browser/renderer_host/render_widget_host_view_win.cc @@ -486,7 +486,7 @@ void RenderWidgetHostViewWin::WasHidden() { if (render_widget_host_) render_widget_host_->WasHidden(); - if (accelerated_surface_.get()) + if (accelerated_surface_) accelerated_surface_->WasHidden(); if (GetBrowserAccessibilityManager()) @@ -861,7 +861,7 @@ void RenderWidgetHostViewWin::CopyFromCompositingSurface( const base::Callback<void(bool, const SkBitmap&)>& callback) { base::ScopedClosureRunner scoped_callback_runner( base::Bind(callback, false, SkBitmap())); - if (!accelerated_surface_.get()) + if (!accelerated_surface_) return; if (dst_size.IsEmpty() || src_subrect.IsEmpty()) @@ -876,7 +876,7 @@ void RenderWidgetHostViewWin::CopyFromCompositingSurfaceToVideoFrame( const scoped_refptr<media::VideoFrame>& target, const base::Callback<void(bool)>& callback) { base::ScopedClosureRunner scoped_callback_runner(base::Bind(callback, false)); - if (!accelerated_surface_.get()) + if (!accelerated_surface_) return; if (!target || target->format() != media::VideoFrame::YV12) @@ -2424,7 +2424,7 @@ static LRESULT CALLBACK CompositorHostWindowProc(HWND hWnd, UINT message, void RenderWidgetHostViewWin::AcceleratedPaint(HDC dc) { if (render_widget_host_) render_widget_host_->ScheduleComposite(); - if (accelerated_surface_.get()) + if (accelerated_surface_) accelerated_surface_->Present(dc); } @@ -2461,7 +2461,7 @@ gfx::GLSurfaceHandle RenderWidgetHostViewWin::GetCompositingSurface() { // On Vista and later we present directly to the view window rather than a // child window. if (GpuDataManagerImpl::GetInstance()->IsUsingAcceleratedSurface()) { - if (!accelerated_surface_.get()) + if (!accelerated_surface_) accelerated_surface_.reset(new AcceleratedSurface(m_hWnd)); return gfx::GLSurfaceHandle(m_hWnd, gfx::NATIVE_TRANSPORT); } @@ -2551,7 +2551,7 @@ void RenderWidgetHostViewWin::OnAcceleratedCompositingStateChange() { // Drop the backing store for the accelerated surface when the accelerated // compositor is disabled. Otherwise, a flash of the last presented frame // could appear when it is next enabled. - if (accelerated_surface_.get()) + if (accelerated_surface_) accelerated_surface_->Suspend(); hide_compositor_window_at_next_paint_ = true; } @@ -2570,7 +2570,7 @@ void RenderWidgetHostViewWin::AcceleratedSurfacePostSubBuffer( } void RenderWidgetHostViewWin::AcceleratedSurfaceSuspend() { - if (!accelerated_surface_.get()) + if (!accelerated_surface_) return; accelerated_surface_->Suspend(); @@ -2708,7 +2708,7 @@ LRESULT RenderWidgetHostViewWin::OnSessionChange(UINT message, handled = FALSE; TRACE_EVENT0("browser", "RenderWidgetHostViewWin::OnSessionChange"); - if (!accelerated_surface_.get()) + if (!accelerated_surface_) return 0; switch (wparam) { diff --git a/content/browser/resolve_proxy_msg_helper.cc b/content/browser/resolve_proxy_msg_helper.cc index 52d0987..796b070 100644 --- a/content/browser/resolve_proxy_msg_helper.cc +++ b/content/browser/resolve_proxy_msg_helper.cc @@ -83,7 +83,7 @@ void ResolveProxyMsgHelper::StartPendingRequest() { // Verify the request wasn't started yet. DCHECK(NULL == req.pac_req); - if (context_getter_.get()) { + if (context_getter_) { proxy_service_ = context_getter_->GetURLRequestContext()->proxy_service(); context_getter_ = NULL; } diff --git a/content/browser/speech/speech_recognition_manager_impl.cc b/content/browser/speech/speech_recognition_manager_impl.cc index 2dc6cf8..b4d8173 100644 --- a/content/browser/speech/speech_recognition_manager_impl.cc +++ b/content/browser/speech/speech_recognition_manager_impl.cc @@ -86,7 +86,7 @@ int SpeechRecognitionManagerImpl::CreateSession( std::string hardware_info; bool can_report_metrics = false; - if (delegate_.get()) + if (delegate_) delegate_->GetDiagnosticInformation(&can_report_metrics, &hardware_info); SpeechRecognitionEngineConfig remote_engine_config; @@ -138,7 +138,7 @@ void SpeechRecognitionManagerImpl::StartSession(int session_id) { primary_session_id_ = session_id; - if (delegate_.get()) { + if (delegate_) { delegate_->CheckRecognitionIsAllowed( session_id, base::Bind(&SpeechRecognitionManagerImpl::RecognitionAllowedCallback, diff --git a/content/browser/speech/speech_recognizer.cc b/content/browser/speech/speech_recognizer.cc index cc66178..62c1b35 100644 --- a/content/browser/speech/speech_recognizer.cc +++ b/content/browser/speech/speech_recognizer.cc @@ -155,7 +155,7 @@ SpeechRecognizer::recognition_engine() const { SpeechRecognizer::~SpeechRecognizer() { endpointer_.EndSession(); - if (audio_controller_.get()) { + if (audio_controller_) { audio_controller_->Close(base::Bind(&KeepAudioControllerRefcountedForDtor, audio_controller_)); } diff --git a/content/browser/streams/stream_url_request_job.cc b/content/browser/streams/stream_url_request_job.cc index da2e9ce..8f94606 100644 --- a/content/browser/streams/stream_url_request_job.cc +++ b/content/browser/streams/stream_url_request_job.cc @@ -117,7 +117,7 @@ bool StreamURLRequestJob::ReadRawData(net::IOBuffer* buf, } bool StreamURLRequestJob::GetMimeType(std::string* mime_type) const { - if (!response_info_.get()) + if (!response_info_) return false; // TODO(zork): Support registered MIME types if needed. @@ -125,12 +125,12 @@ bool StreamURLRequestJob::GetMimeType(std::string* mime_type) const { } void StreamURLRequestJob::GetResponseInfo(net::HttpResponseInfo* info) { - if (response_info_.get()) + if (response_info_) *info = *response_info_; } int StreamURLRequestJob::GetResponseCode() const { - if (!response_info_.get()) + if (!response_info_) return -1; return response_info_->headers->response_code(); diff --git a/content/browser/tracing/tracing_ui.cc b/content/browser/tracing/tracing_ui.cc index 373a3f7..a12962c 100644 --- a/content/browser/tracing/tracing_ui.cc +++ b/content/browser/tracing/tracing_ui.cc @@ -305,7 +305,7 @@ void TracingMessageHandler::FileSelectionCanceled(void* params) { void TracingMessageHandler::OnLoadTraceFile(const base::ListValue* list) { // Only allow a single dialog at a time. - if (select_trace_file_dialog_.get()) + if (select_trace_file_dialog_) return; select_trace_file_dialog_type_ = ui::SelectFileDialog::SELECT_OPEN_FILE; select_trace_file_dialog_ = ui::SelectFileDialog::Create( @@ -350,7 +350,7 @@ void TracingMessageHandler::LoadTraceFileComplete(string16* contents) { void TracingMessageHandler::OnSaveTraceFile(const base::ListValue* list) { // Only allow a single dialog at a time. - if (select_trace_file_dialog_.get()) + if (select_trace_file_dialog_) return; DCHECK(list->GetSize() == 1); diff --git a/content/browser/web_contents/render_view_host_manager.cc b/content/browser/web_contents/render_view_host_manager.cc index 3f14460..558a7dd 100644 --- a/content/browser/web_contents/render_view_host_manager.cc +++ b/content/browser/web_contents/render_view_host_manager.cc @@ -703,9 +703,9 @@ void RenderViewHostManager::CommitPending() { // |pending_web_ui_|, or clear |web_ui_| if there is no pending WebUI, or // leave |web_ui_| as is if reusing it. DCHECK(!(pending_web_ui_.get() && pending_and_current_web_ui_.get())); - if (pending_web_ui_.get()) + if (pending_web_ui_) web_ui_.reset(pending_web_ui_.release()); - else if (!pending_and_current_web_ui_.get()) + else if (!pending_and_current_web_ui_) web_ui_.reset(); // It's possible for the pending_render_view_host_ to be NULL when we aren't diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc index b3dc3fa..1cc9efeb 100644 --- a/content/browser/web_contents/web_contents_impl.cc +++ b/content/browser/web_contents/web_contents_impl.cc @@ -1110,13 +1110,13 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) { view_.reset(GetContentClient()->browser()-> OverrideCreateWebContentsView(this, &render_view_host_delegate_view_)); - if (view_.get()) { + if (view_) { CHECK(render_view_host_delegate_view_); } else { WebContentsViewDelegate* delegate = GetContentClient()->browser()->GetWebContentsViewDelegate(this); - if (browser_plugin_guest_.get()) { + if (browser_plugin_guest_) { WebContentsViewPort* platform_view = CreateWebContentsView( this, delegate, &render_view_host_delegate_view_); @@ -2577,7 +2577,7 @@ gfx::Rect WebContentsImpl::GetRootWindowResizerRect() const { } void WebContentsImpl::RemoveBrowserPluginEmbedder() { - if (browser_plugin_embedder_.get()) + if (browser_plugin_embedder_) browser_plugin_embedder_.reset(); } diff --git a/content/browser/web_contents/web_contents_view_android.cc b/content/browser/web_contents/web_contents_view_android.cc index 28ce304..9108005 100644 --- a/content/browser/web_contents/web_contents_view_android.cc +++ b/content/browser/web_contents/web_contents_view_android.cc @@ -177,7 +177,7 @@ void WebContentsViewAndroid::SetOverscrollControllerEnabled(bool enabled) { void WebContentsViewAndroid::ShowContextMenu( const ContextMenuParams& params, ContextMenuSourceType type) { - if (delegate_.get()) + if (delegate_) delegate_->ShowContextMenu(params, type); } diff --git a/content/browser/web_contents/web_contents_view_aura.cc b/content/browser/web_contents/web_contents_view_aura.cc index a87ebb0..788dac5 100644 --- a/content/browser/web_contents/web_contents_view_aura.cc +++ b/content/browser/web_contents/web_contents_view_aura.cc @@ -498,7 +498,7 @@ class ShadowWindow : public aura::Window, } void UpdateShadowBounds() { - if (!shadow_.get()) + if (!shadow_) return; gfx::Rect bound; switch (edge_) { @@ -896,7 +896,7 @@ WebContentsViewAura::~WebContentsViewAura() { } void WebContentsViewAura::SetupOverlayWindowForTesting() { - if (navigation_overlay_.get()) + if (navigation_overlay_) navigation_overlay_->SetupForTesting(); } @@ -927,7 +927,7 @@ void WebContentsViewAura::PrepareOverscrollWindow() { // completed immidiately, which triggers |OnImplicitAnimationsCompleted()| // callback, and that tries to reset |overscroll_window_| again, causing a // double-free. So use a temporary variable here. - if (overscroll_window_.get()) { + if (overscroll_window_) { base::AutoReset<OverscrollMode> reset_state(¤t_overscroll_gesture_, current_overscroll_gesture_); scoped_ptr<aura::Window> reset_window(overscroll_window_.release()); @@ -955,7 +955,7 @@ void WebContentsViewAura::PrepareOverscrollWindow() { bounds.Offset(base::i18n::IsRTL() ? -bounds.width() : bounds.width(), 0); } - if (GetWindowToAnimateForOverscroll() == overscroll_window_.get()) { + if (GetWindowToAnimateForOverscroll() == overscroll_window_) { overscroll_delegate->set_show_shadow(true); window_->StackChildAbove(overscroll_window_.get(), content_container_); } else { @@ -1176,12 +1176,12 @@ void WebContentsViewAura::SetInitialFocus() { } void WebContentsViewAura::StoreFocus() { - if (delegate_.get()) + if (delegate_) delegate_->StoreFocus(); } void WebContentsViewAura::RestoreFocus() { - if (delegate_.get()) + if (delegate_) delegate_->RestoreFocus(); } @@ -1233,7 +1233,7 @@ void WebContentsViewAura::CreateView( // delegate_->GetDragDestDelegate() creates a new delegate on every call. // Hence, we save a reference to it locally. Similar model is used on other // platforms as well. - if (delegate_.get()) + if (delegate_) drag_dest_delegate_ = delegate_->GetDragDestDelegate(); } @@ -1270,7 +1270,7 @@ RenderWidgetHostView* WebContentsViewAura::CreateViewForWidget( if (host_impl->overscroll_controller() && web_contents_->GetDelegate() && web_contents_->GetDelegate()->CanOverscrollContent()) { host_impl->overscroll_controller()->set_delegate(this); - if (!navigation_overlay_.get()) + if (!navigation_overlay_) navigation_overlay_.reset(new OverscrollNavigationOverlay()); } @@ -1312,7 +1312,7 @@ void WebContentsViewAura::SetOverscrollControllerEnabled(bool enabled) { void WebContentsViewAura::ShowContextMenu( const ContextMenuParams& params, ContextMenuSourceType type) { - if (delegate_.get()) + if (delegate_) delegate_->ShowContextMenu(params, type); } @@ -1493,7 +1493,7 @@ gfx::Size WebContentsViewAura::GetMaximumSize() const { void WebContentsViewAura::OnBoundsChanged(const gfx::Rect& old_bounds, const gfx::Rect& new_bounds) { SizeChangedCommon(new_bounds.size()); - if (delegate_.get()) + if (delegate_) delegate_->SizeChanged(new_bounds.size()); // Constrained web dialogs, need to be kept centered over our content area. diff --git a/content/browser/web_contents/web_contents_view_gtk.cc b/content/browser/web_contents/web_contents_view_gtk.cc index b70b0df..9cb92127 100644 --- a/content/browser/web_contents/web_contents_view_gtk.cc +++ b/content/browser/web_contents/web_contents_view_gtk.cc @@ -100,7 +100,7 @@ WebContentsViewGtk::WebContentsViewGtk( gtk_widget_show(expanded_.get()); drag_source_.reset(new WebDragSourceGtk(web_contents)); - if (delegate_.get()) + if (delegate_) delegate_->Initialize(expanded_.get(), &focus_store_); } @@ -109,7 +109,7 @@ WebContentsViewGtk::~WebContentsViewGtk() { } gfx::NativeView WebContentsViewGtk::GetNativeView() const { - if (delegate_.get()) + if (delegate_) return delegate_->GetNativeView(); return expanded_.get(); @@ -151,7 +151,7 @@ void WebContentsViewGtk::OnTabCrashed(base::TerminationStatus status, void WebContentsViewGtk::Focus() { if (web_contents_->ShowingInterstitialPage()) { web_contents_->GetInterstitialPage()->Focus(); - } else if (delegate_.get()) { + } else if (delegate_) { delegate_->Focus(); } } @@ -314,7 +314,7 @@ void WebContentsViewGtk::UpdateDragDest(RenderViewHost* host) { // Create the new drag_dest_. drag_dest_.reset(new WebDragDestGtk(web_contents_, content_view)); - if (delegate_.get()) + if (delegate_) drag_dest_->set_delegate(delegate_->GetDragDestDelegate()); } @@ -326,7 +326,7 @@ void WebContentsViewGtk::UpdateDragDest(RenderViewHost* host) { gboolean WebContentsViewGtk::OnFocus(GtkWidget* widget, GtkDirectionType focus) { // Give our view wrapper first chance at this event. - if (delegate_.get()) { + if (delegate_) { gboolean return_value = FALSE; if (delegate_->OnNativeViewFocusEvent(widget, focus, &return_value)) return return_value; @@ -347,7 +347,7 @@ gboolean WebContentsViewGtk::OnFocus(GtkWidget* widget, void WebContentsViewGtk::ShowContextMenu( const ContextMenuParams& params, ContextMenuSourceType type) { - if (delegate_.get()) + if (delegate_) delegate_->ShowContextMenu(params, type); else DLOG(ERROR) << "Cannot show context menus without a delegate."; diff --git a/content/browser/web_contents/web_contents_view_mac.mm b/content/browser/web_contents/web_contents_view_mac.mm index c22a840..f8cb4ae 100644 --- a/content/browser/web_contents/web_contents_view_mac.mm +++ b/content/browser/web_contents/web_contents_view_mac.mm @@ -483,7 +483,7 @@ void WebContentsViewMac::CloseTab() { // Returns what kind of drag operations are available. This is a required // method for NSDraggingSource. - (NSDragOperation)draggingSourceOperationMaskForLocal:(BOOL)isLocal { - if (dragSource_.get()) + if (dragSource_) return [dragSource_ draggingSourceOperationMaskForLocal:isLocal]; // No web drag source - this is the case for dragging a file from the // downloads manager. Default to copy operation. Note: It is desirable to diff --git a/content/browser/web_contents/web_contents_view_win.cc b/content/browser/web_contents/web_contents_view_win.cc index 28f489a..3ceeb0f 100644 --- a/content/browser/web_contents/web_contents_view_win.cc +++ b/content/browser/web_contents/web_contents_view_win.cc @@ -155,7 +155,7 @@ void WebContentsViewWin::CreateView( // Remove the root view drop target so we can register our own. RevokeDragDrop(GetNativeView()); drag_dest_ = new WebDragDest(hwnd(), web_contents_); - if (delegate_.get()) { + if (delegate_) { WebDragDestDelegate* delegate = delegate_->GetDragDestDelegate(); if (delegate) drag_dest_->set_delegate(delegate); @@ -184,12 +184,12 @@ void WebContentsViewWin::SetInitialFocus() { } void WebContentsViewWin::StoreFocus() { - if (delegate_.get()) + if (delegate_) delegate_->StoreFocus(); } void WebContentsViewWin::RestoreFocus() { - if (delegate_.get()) + if (delegate_) delegate_->RestoreFocus(); } @@ -246,7 +246,7 @@ void WebContentsViewWin::SetOverscrollControllerEnabled(bool enabled) { void WebContentsViewWin::ShowContextMenu( const ContextMenuParams& params, ContextMenuSourceType type) { - if (delegate_.get()) + if (delegate_) delegate_->ShowContextMenu(params, type); } @@ -310,11 +310,11 @@ LRESULT WebContentsViewWin::OnCreate( LRESULT WebContentsViewWin::OnDestroy( UINT message, WPARAM wparam, LPARAM lparam, BOOL& handled) { - if (drag_dest_.get()) { + if (drag_dest_) { RevokeDragDrop(GetNativeView()); drag_dest_ = NULL; } - if (drag_handler_.get()) { + if (drag_handler_) { drag_handler_->CancelDrag(); drag_handler_ = NULL; } @@ -357,7 +357,7 @@ LRESULT WebContentsViewWin::OnWindowPosChanged( if (rwhv) rwhv->SetSize(size); - if (delegate_.get()) + if (delegate_) delegate_->SizeChanged(size); return 0; diff --git a/content/browser/web_contents/web_drag_source_gtk.cc b/content/browser/web_contents/web_drag_source_gtk.cc index 9fe1c16..64e883b 100644 --- a/content/browser/web_contents/web_drag_source_gtk.cc +++ b/content/browser/web_contents/web_drag_source_gtk.cc @@ -58,7 +58,7 @@ WebDragSourceGtk::WebDragSourceGtk(WebContents* web_contents) WebDragSourceGtk::~WebDragSourceGtk() { // Break the current drag, if any. - if (drop_data_.get()) { + if (drop_data_) { gtk_grab_add(drag_widget_); gtk_grab_remove(drag_widget_); MessageLoopForUI::current()->RemoveObserver(this); @@ -245,7 +245,7 @@ void WebDragSourceGtk::OnDragDataGet(GtkWidget* sender, CreateFileStreamForDrop( &file_path, GetContentClient()->browser()->GetNetLog())); - if (file_stream.get()) { + if (file_stream) { // Start downloading the file to the stream. scoped_refptr<DragDownloadFile> drag_file_downloader = new DragDownloadFile( diff --git a/content/browser/web_contents/web_drag_source_mac.mm b/content/browser/web_contents/web_drag_source_mac.mm index 5e3a4ea..621c813 100644 --- a/content/browser/web_contents/web_drag_source_mac.mm +++ b/content/browser/web_contents/web_drag_source_mac.mm @@ -150,7 +150,7 @@ void PromiseWriterHelper(const WebDropData& drop_data, "<meta http-equiv=\"Content-Type\" content=\"text/html;charset=UTF-8\">"); // Be extra paranoid; avoid crashing. - if (!dropData_.get()) { + if (!dropData_) { NOTREACHED(); return; } @@ -187,7 +187,7 @@ void PromiseWriterHelper(const WebDropData& drop_data, forType:kNSURLTitlePboardType]; // File contents. - } else if ([type isEqualToString:base::mac::CFToNSCast(fileUTI_.get())]) { + } else if ([type isEqualToString:base::mac::CFToNSCast(fileUTI_)]) { [pboard setData:[NSData dataWithBytes:dropData_->file_contents.data() length:dropData_->file_contents.length()] forType:base::mac::CFToNSCast(fileUTI_.get())]; @@ -315,7 +315,7 @@ void PromiseWriterHelper(const WebDropData& drop_data, - (NSString*)dragPromisedFileTo:(NSString*)path { // Be extra paranoid; avoid crashing. - if (!dropData_.get()) { + if (!dropData_) { NOTREACHED() << "No drag-and-drop data available for promised file."; return nil; } @@ -331,7 +331,7 @@ void PromiseWriterHelper(const WebDropData& drop_data, base::ThreadRestrictions::ScopedAllowIO allowIO; scoped_ptr<FileStream> fileStream(content::CreateFileStreamForDrop( &filePath, content::GetContentClient()->browser()->GetNetLog())); - if (!fileStream.get()) + if (!fileStream) return nil; if (downloadURL_.is_valid()) { diff --git a/content/browser/webui/url_data_manager_backend.cc b/content/browser/webui/url_data_manager_backend.cc index caf8281..4e2e979 100644 --- a/content/browser/webui/url_data_manager_backend.cc +++ b/content/browser/webui/url_data_manager_backend.cc @@ -283,7 +283,7 @@ void URLRequestChromeJob::DataAvailable(base::RefCountedMemory* bytes) { data_ = bytes; int bytes_read; - if (pending_buf_.get()) { + if (pending_buf_) { CHECK(pending_buf_->data()); CompleteRead(pending_buf_, pending_buf_size_, &bytes_read); pending_buf_ = NULL; @@ -298,7 +298,7 @@ void URLRequestChromeJob::DataAvailable(base::RefCountedMemory* bytes) { bool URLRequestChromeJob::ReadRawData(net::IOBuffer* buf, int buf_size, int* bytes_read) { - if (!data_.get()) { + if (!data_) { SetStatus(net::URLRequestStatus(net::URLRequestStatus::IO_PENDING, 0)); DCHECK(!pending_buf_.get()); CHECK(buf->data()); diff --git a/content/common/child_process.cc b/content/common/child_process.cc index 75c80ec..c66e4a4 100644 --- a/content/common/child_process.cc +++ b/content/common/child_process.cc @@ -98,7 +98,7 @@ void ChildProcess::ReleaseProcess() { if (--ref_count_) return; - if (main_thread_.get()) // null in unittests. + if (main_thread_) // null in unittests. main_thread_->OnProcessFinalRelease(); } diff --git a/content/common/child_process_host_impl.cc b/content/common/child_process_host_impl.cc index b5d1eda..bb0fdfd 100644 --- a/content/common/child_process_host_impl.cc +++ b/content/common/child_process_host_impl.cc @@ -149,7 +149,7 @@ ChildProcessHostImpl::~ChildProcessHostImpl() { void ChildProcessHostImpl::AddFilter(IPC::ChannelProxy::MessageFilter* filter) { filters_.push_back(filter); - if (channel_.get()) + if (channel_) filter->OnFilterAdded(channel_.get()); } @@ -189,7 +189,7 @@ int ChildProcessHostImpl::TakeClientFileDescriptor() { #endif bool ChildProcessHostImpl::Send(IPC::Message* message) { - if (!channel_.get()) { + if (!channel_) { delete message; return false; } diff --git a/content/common/child_thread.cc b/content/common/child_thread.cc index 4540b15..d1c8d39 100644 --- a/content/common/child_thread.cc +++ b/content/common/child_thread.cc @@ -166,7 +166,7 @@ void ChildThread::OnChannelError() { bool ChildThread::Send(IPC::Message* msg) { DCHECK(MessageLoop::current() == message_loop()); - if (!channel_.get()) { + if (!channel_) { delete msg; return false; } diff --git a/content/common/gpu/client/command_buffer_proxy_impl.cc b/content/common/gpu/client/command_buffer_proxy_impl.cc index fb10b42..d8f0d19 100644 --- a/content/common/gpu/client/command_buffer_proxy_impl.cc +++ b/content/common/gpu/client/command_buffer_proxy_impl.cc @@ -132,7 +132,7 @@ void CommandBufferProxyImpl::SetChannelErrorCallback( bool CommandBufferProxyImpl::Initialize() { shared_state_shm_.reset(channel_->factory()->AllocateSharedMemory( sizeof(*shared_state())).release()); - if (!shared_state_shm_.get()) + if (!shared_state_shm_) return false; if (!shared_state_shm_->Map(sizeof(*shared_state()))) @@ -255,7 +255,7 @@ gpu::Buffer CommandBufferProxyImpl::CreateTransferBuffer(size_t size, scoped_ptr<base::SharedMemory> shared_memory( channel_->factory()->AllocateSharedMemory(size)); - if (!shared_memory.get()) + if (!shared_memory) return gpu::Buffer(); DCHECK(!shared_memory->memory()); diff --git a/content/common/gpu/client/gl_helper.cc b/content/common/gpu/client/gl_helper.cc index 302dca6..cad3838 100644 --- a/content/common/gpu/client/gl_helper.cc +++ b/content/common/gpu/client/gl_helper.cc @@ -715,7 +715,7 @@ WebGLId GLHelper::CompileShaderFromSource( void GLHelper::InitCopyTextToImpl() { // Lazily initialize |copy_texture_to_impl_| - if (!copy_texture_to_impl_.get()) + if (!copy_texture_to_impl_) copy_texture_to_impl_.reset(new CopyTextureToImpl(context_, this)); } diff --git a/content/common/gpu/client/gpu_channel_host.cc b/content/common/gpu/client/gpu_channel_host.cc index d5bb6b3..bd84d26 100644 --- a/content/common/gpu/client/gpu_channel_host.cc +++ b/content/common/gpu/client/gpu_channel_host.cc @@ -111,7 +111,7 @@ bool GpuChannelHost::Send(IPC::Message* message) { // TODO: Can we just always use sync_filter_ since we setup the channel // without a main listener? if (factory_->IsMainThread()) { - if (channel_.get()) { + if (channel_) { // http://crbug.com/125264 base::ThreadRestrictions::ScopedAllowWait allow_wait; return channel_->Send(message); @@ -140,7 +140,7 @@ CommandBufferProxyImpl* GpuChannelHost::CreateViewCommandBuffer( AutoLock lock(context_lock_); // An error occurred. Need to get the host again to reinitialize it. - if (!channel_.get()) + if (!channel_) return NULL; GPUCreateCommandBufferConfig init_params; @@ -172,7 +172,7 @@ CommandBufferProxyImpl* GpuChannelHost::CreateOffscreenCommandBuffer( AutoLock lock(context_lock_); // An error occurred. Need to get the host again to reinitialize it. - if (!channel_.get()) + if (!channel_) return NULL; GPUCreateCommandBufferConfig init_params; @@ -254,7 +254,7 @@ base::SharedMemoryHandle GpuChannelHost::ShareToGpuProcess( base::SharedMemory* shared_memory) { AutoLock lock(context_lock_); - if (!channel_.get()) + if (!channel_) return base::SharedMemory::NULLHandle(); base::SharedMemoryHandle handle; diff --git a/content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.cc b/content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.cc index 90f7d9d..562f365 100644 --- a/content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.cc +++ b/content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.cc @@ -1000,7 +1000,7 @@ bool WebGraphicsContext3DCommandBufferImpl::getActiveAttrib( if (max_name_length < 0) return false; scoped_ptr<GLchar[]> name(new GLchar[max_name_length]); - if (!name.get()) { + if (!name) { synthesizeGLError(GL_OUT_OF_MEMORY); return false; } @@ -1026,7 +1026,7 @@ bool WebGraphicsContext3DCommandBufferImpl::getActiveUniform( if (max_name_length < 0) return false; scoped_ptr<GLchar[]> name(new GLchar[max_name_length]); - if (!name.get()) { + if (!name) { synthesizeGLError(GL_OUT_OF_MEMORY); return false; } @@ -1094,7 +1094,7 @@ WebKit::WebString WebGraphicsContext3DCommandBufferImpl::getProgramInfoLog( if (!logLength) return WebKit::WebString(); scoped_ptr<GLchar[]> log(new GLchar[logLength]); - if (!log.get()) + if (!log) return WebKit::WebString(); GLsizei returnedLogLength = 0; gl_->GetProgramInfoLog( @@ -1117,7 +1117,7 @@ WebKit::WebString WebGraphicsContext3DCommandBufferImpl::getShaderInfoLog( if (!logLength) return WebKit::WebString(); scoped_ptr<GLchar[]> log(new GLchar[logLength]); - if (!log.get()) + if (!log) return WebKit::WebString(); GLsizei returnedLogLength = 0; gl_->GetShaderInfoLog( @@ -1138,7 +1138,7 @@ WebKit::WebString WebGraphicsContext3DCommandBufferImpl::getShaderSource( if (!logLength) return WebKit::WebString(); scoped_ptr<GLchar[]> log(new GLchar[logLength]); - if (!log.get()) + if (!log) return WebKit::WebString(); GLsizei returnedLogLength = 0; gl_->GetShaderSource( @@ -1159,7 +1159,7 @@ WebKit::WebString WebGraphicsContext3DCommandBufferImpl:: if (!logLength) return WebKit::WebString(); scoped_ptr<GLchar[]> log(new GLchar[logLength]); - if (!log.get()) + if (!log) return WebKit::WebString(); GLsizei returnedLogLength = 0; gl_->GetTranslatedShaderSourceANGLE( diff --git a/content/common/gpu/gpu_channel.cc b/content/common/gpu/gpu_channel.cc index 7947ad6..c392a47 100644 --- a/content/common/gpu/gpu_channel.cc +++ b/content/common/gpu/gpu_channel.cc @@ -126,7 +126,7 @@ class GpuChannelMessageFilter : public IPC::ChannelProxy::MessageFilter { // All other messages get processed by the GpuChannel. if (!handled) { messages_forwarded_to_channel_++; - if (preempting_flag_.get()) + if (preempting_flag_) pending_messages_.push(PendingMessage(messages_forwarded_to_channel_)); UpdatePreemptionState(); } @@ -497,7 +497,7 @@ std::string GpuChannel::GetChannelName() { #if defined(OS_POSIX) int GpuChannel::TakeRendererFileDescriptor() { - if (!channel_.get()) { + if (!channel_) { NOTREACHED(); return -1; } @@ -561,7 +561,7 @@ bool GpuChannel::Send(IPC::Message* message) { << " with type " << message->type(); } - if (!channel_.get()) { + if (!channel_) { delete message; return false; } @@ -603,7 +603,7 @@ void GpuChannel::StubSchedulingChanged(bool scheduled) { bool a_stub_is_descheduled = num_stubs_descheduled_ > 0; if (a_stub_is_descheduled != a_stub_was_descheduled) { - if (preempting_flag_.get()) { + if (preempting_flag_) { io_message_loop_->PostTask( FROM_HERE, base::Bind(&GpuChannelMessageFilter::UpdateStubSchedulingState, @@ -654,7 +654,7 @@ void GpuChannel::CreateViewCommandBuffer( watchdog_, software_, init_params.active_url)); - if (preempted_flag_.get()) + if (preempted_flag_) stub->SetPreemptByFlag(preempted_flag_); router_.AddRoute(*route_id, stub.get()); stubs_.AddWithID(stub.release(), *route_id); @@ -721,7 +721,7 @@ void GpuChannel::RemoveRoute(int32 route_id) { } gpu::PreemptionFlag* GpuChannel::GetPreemptionFlag() { - if (!preempting_flag_.get()) { + if (!preempting_flag_) { preempting_flag_ = new gpu::PreemptionFlag; io_message_loop_->PostTask( FROM_HERE, base::Bind( @@ -742,7 +742,7 @@ void GpuChannel::SetPreemptByFlag( } GpuChannel::~GpuChannel() { - if (preempting_flag_.get()) + if (preempting_flag_) preempting_flag_->Reset(); } @@ -872,7 +872,7 @@ void GpuChannel::OnCreateOffscreenCommandBuffer( watchdog_, software_, init_params.active_url)); - if (preempted_flag_.get()) + if (preempted_flag_) stub->SetPreemptByFlag(preempted_flag_); router_.AddRoute(*route_id, stub.get()); stubs_.AddWithID(stub.release(), *route_id); @@ -942,7 +942,7 @@ void GpuChannel::OnCollectRenderingStatsForSurface( void GpuChannel::MessageProcessed() { messages_processed_++; - if (preempting_flag_.get()) { + if (preempting_flag_) { io_message_loop_->PostTask( FROM_HERE, base::Bind(&GpuChannelMessageFilter::MessageProcessed, diff --git a/content/common/gpu/gpu_channel_manager.cc b/content/common/gpu/gpu_channel_manager.cc index fc48010..aa89b7c 100644 --- a/content/common/gpu/gpu_channel_manager.cc +++ b/content/common/gpu/gpu_channel_manager.cc @@ -50,7 +50,7 @@ GpuChannelManager::GpuChannelManager(ChildThread* gpu_child_thread, GpuChannelManager::~GpuChannelManager() { gpu_channels_.clear(); - if (default_offscreen_surface_.get()) { + if (default_offscreen_surface_) { default_offscreen_surface_->Destroy(); default_offscreen_surface_ = NULL; } @@ -290,7 +290,7 @@ void GpuChannelManager::OnLoseAllContexts() { } gfx::GLSurface* GpuChannelManager::GetDefaultOffscreenSurface() { - if (!default_offscreen_surface_.get()) { + if (!default_offscreen_surface_) { default_offscreen_surface_ = gfx::GLSurface::CreateOffscreenGLSurface( false, gfx::Size(1, 1)); } diff --git a/content/common/gpu/gpu_command_buffer_stub.cc b/content/common/gpu/gpu_command_buffer_stub.cc index a1167c9..ceecbe4 100644 --- a/content/common/gpu/gpu_command_buffer_stub.cc +++ b/content/common/gpu/gpu_command_buffer_stub.cc @@ -243,7 +243,7 @@ void GpuCommandBufferStub::PollWork() { if (decoder_.get() && !MakeCurrent()) return; - if (scheduler_.get()) { + if (scheduler_) { bool fences_complete = scheduler_->PollUnscheduleFences(); // Perform idle work if all fences are complete. if (fences_complete) { @@ -274,7 +274,7 @@ void GpuCommandBufferStub::PollWork() { } bool GpuCommandBufferStub::HasUnprocessedCommands() { - if (command_buffer_.get()) { + if (command_buffer_) { gpu::CommandBuffer::State state = command_buffer_->GetLastState(); return state.put_offset != state.get_offset && !gpu::error::IsError(state.error); @@ -346,7 +346,7 @@ void GpuCommandBufferStub::Destroy() { while (!sync_points_.empty()) OnRetireSyncPoint(sync_points_.front()); - if (decoder_.get()) + if (decoder_) decoder_->set_engine(NULL); // The scheduler has raw references to the decoder and the command buffer so @@ -354,14 +354,14 @@ void GpuCommandBufferStub::Destroy() { scheduler_.reset(); bool have_context = false; - if (decoder_.get()) + if (decoder_) have_context = decoder_->MakeCurrent(); FOR_EACH_OBSERVER(DestructionObserver, destruction_observers_, OnWillDestroyStub(this)); scoped_refptr<gfx::GLContext> context; - if (decoder_.get()) { + if (decoder_) { context = decoder_->GetGLContext(); decoder_->Destroy(have_context); decoder_.reset(); @@ -408,7 +408,7 @@ void GpuCommandBufferStub::OnInitialize( scheduler_.reset(new gpu::GpuScheduler(command_buffer_.get(), decoder_.get(), decoder_.get())); - if (preemption_flag_.get()) + if (preemption_flag_) scheduler_->SetPreemptByFlag(preemption_flag_); decoder_->set_engine(scheduler_.get()); @@ -431,7 +431,7 @@ void GpuCommandBufferStub::OnInitialize( surface_ = manager->GetDefaultOffscreenSurface(); } - if (!surface_.get()) { + if (!surface_) { DLOG(ERROR) << "Failed to create surface.\n"; OnInitializeFailed(reply_message); return; @@ -480,7 +480,7 @@ void GpuCommandBufferStub::OnInitialize( return; } - if (!context->MakeCurrent(surface_.get())) { + if (!context->MakeCurrent(surface_)) { LOG(ERROR) << "Failed to make context current."; OnInitializeFailed(reply_message); return; @@ -580,7 +580,7 @@ void GpuCommandBufferStub::SetLatencyInfoCallback( void GpuCommandBufferStub::OnSetGetBuffer(int32 shm_id, IPC::Message* reply_message) { TRACE_EVENT0("gpu", "GpuCommandBufferStub::OnSetGetBuffer"); - if (command_buffer_.get()) + if (command_buffer_) command_buffer_->SetGetBuffer(shm_id); Send(reply_message); } @@ -595,7 +595,7 @@ void GpuCommandBufferStub::OnSetParent(int32 parent_route_id, } bool result = true; - if (scheduler_.get()) { + if (scheduler_) { gpu::gles2::GLES2Decoder* parent_decoder = parent_stub ? parent_stub->decoder_.get() : NULL; result = decoder_->SetParent(parent_decoder, parent_texture_id); @@ -613,7 +613,7 @@ void GpuCommandBufferStub::OnSetParent(int32 parent_route_id, void GpuCommandBufferStub::OnGetState(IPC::Message* reply_message) { TRACE_EVENT0("gpu", "GpuCommandBufferStub::OnGetState"); - if (command_buffer_.get()) { + if (command_buffer_) { gpu::CommandBuffer::State state = command_buffer_->GetState(); if (state.error == gpu::error::kLostContext && gfx::GLContext::LosesAllContextsOnContextLost()) @@ -689,14 +689,14 @@ void GpuCommandBufferStub::OnRegisterTransferBuffer( TRACE_EVENT0("gpu", "GpuCommandBufferStub::OnRegisterTransferBuffer"); base::SharedMemory shared_memory(transfer_buffer, false); - if (command_buffer_.get()) + if (command_buffer_) command_buffer_->RegisterTransferBuffer(id, &shared_memory, size); } void GpuCommandBufferStub::OnDestroyTransferBuffer(int32 id) { TRACE_EVENT0("gpu", "GpuCommandBufferStub::OnDestroyTransferBuffer"); - if (command_buffer_.get()) + if (command_buffer_) command_buffer_->DestroyTransferBuffer(id); } @@ -704,7 +704,7 @@ void GpuCommandBufferStub::OnGetTransferBuffer( int32 id, IPC::Message* reply_message) { TRACE_EVENT0("gpu", "GpuCommandBufferStub::OnGetTransferBuffer"); - if (command_buffer_.get()) { + if (command_buffer_) { base::SharedMemoryHandle transfer_buffer = base::SharedMemoryHandle(); uint32 size = 0; @@ -765,7 +765,7 @@ void GpuCommandBufferStub::OnCreateVideoDecoder( void GpuCommandBufferStub::OnSetSurfaceVisible(bool visible) { TRACE_EVENT0("gpu", "GpuCommandBufferStub::OnSetSurfaceVisible"); - if (memory_manager_client_state_.get()) + if (memory_manager_client_state_) memory_manager_client_state_->SetVisible(visible); } @@ -848,7 +848,7 @@ void GpuCommandBufferStub::OnReceivedClientManagedMemoryStats( TRACE_EVENT0( "gpu", "GpuCommandBufferStub::OnReceivedClientManagedMemoryStats"); - if (memory_manager_client_state_.get()) + if (memory_manager_client_state_) memory_manager_client_state_->SetManagedMemoryStats(stats); } @@ -858,7 +858,7 @@ void GpuCommandBufferStub::OnSetClientHasMemoryAllocationChangedCallback( "gpu", "GpuCommandBufferStub::OnSetClientHasMemoryAllocationChangedCallback"); if (has_callback) { - if (!memory_manager_client_state_.get()) { + if (!memory_manager_client_state_) { memory_manager_client_state_.reset(GetMemoryManager()->CreateClientState( this, surface_id_ != 0, true)); } @@ -897,7 +897,7 @@ void GpuCommandBufferStub::RemoveDestructionObserver( void GpuCommandBufferStub::SetPreemptByFlag( scoped_refptr<gpu::PreemptionFlag> flag) { preemption_flag_ = flag; - if (scheduler_.get()) + if (scheduler_) scheduler_->SetPreemptByFlag(preemption_flag_); } diff --git a/content/common/gpu/image_transport_surface.cc b/content/common/gpu/image_transport_surface.cc index 1378f90..f8f0742 100644 --- a/content/common/gpu/image_transport_surface.cc +++ b/content/common/gpu/image_transport_surface.cc @@ -171,13 +171,13 @@ void ImageTransportHelper::Suspend() { } gpu::GpuScheduler* ImageTransportHelper::Scheduler() { - if (!stub_.get()) + if (!stub_) return NULL; return stub_->scheduler(); } gpu::gles2::GLES2Decoder* ImageTransportHelper::Decoder() { - if (!stub_.get()) + if (!stub_) return NULL; return stub_->decoder(); } diff --git a/content/common/gpu/image_transport_surface_mac.cc b/content/common/gpu/image_transport_surface_mac.cc index 6b8762c..62c3265 100644 --- a/content/common/gpu/image_transport_surface_mac.cc +++ b/content/common/gpu/image_transport_surface_mac.cc @@ -217,7 +217,7 @@ void IOSurfaceImageTransportSurface::AdjustBufferAllocation() { io_surface_.get()) { UnrefIOSurface(); helper_->Suspend(); - } else if (backbuffer_suggested_allocation_ && !io_surface_.get()) { + } else if (backbuffer_suggested_allocation_ && !io_surface_) { CreateIOSurface(); } } diff --git a/content/common/gpu/image_transport_surface_win.cc b/content/common/gpu/image_transport_surface_win.cc index 5dbdcf3..5e27ba0 100644 --- a/content/common/gpu/image_transport_surface_win.cc +++ b/content/common/gpu/image_transport_surface_win.cc @@ -270,7 +270,7 @@ scoped_refptr<gfx::GLSurface> ImageTransportSurface::CreateNativeSurface( scoped_refptr<gfx::GLSurface> surface = gfx::GLSurface::CreateViewGLSurface(false, handle.handle); - if (!surface.get()) + if (!surface) return surface; return scoped_refptr<gfx::GLSurface>(new PassThroughImageTransportSurface( manager, stub, surface.get(), handle.is_transport())); diff --git a/content/common/gpu/image_transport_surface_x11.cc b/content/common/gpu/image_transport_surface_x11.cc index 86d78d2..b6aca42 100644 --- a/content/common/gpu/image_transport_surface_x11.cc +++ b/content/common/gpu/image_transport_surface_x11.cc @@ -16,7 +16,7 @@ scoped_refptr<gfx::GLSurface> ImageTransportSurface::CreateNativeSurface( handle.transport_type == gfx::NATIVE_TRANSPORT); scoped_refptr<gfx::GLSurface> surface = gfx::GLSurface::CreateViewGLSurface(false, handle.handle); - if (!surface.get()) + if (!surface) return surface; return scoped_refptr<gfx::GLSurface>(new PassThroughImageTransportSurface( manager, stub, surface.get(), handle.is_transport())); diff --git a/content/common/gpu/media/android_video_decode_accelerator.cc b/content/common/gpu/media/android_video_decode_accelerator.cc index 3e4dacd..d54c7ad 100644 --- a/content/common/gpu/media/android_video_decode_accelerator.cc +++ b/content/common/gpu/media/android_video_decode_accelerator.cc @@ -85,7 +85,7 @@ bool AndroidVideoDecodeAccelerator::Initialize( return false; } - if (!gl_decoder_.get()) { + if (!gl_decoder_) { LOG(ERROR) << "Failed to get gles2 decoder instance."; return false; } diff --git a/content/common/gpu/media/gpu_video_decode_accelerator.cc b/content/common/gpu/media/gpu_video_decode_accelerator.cc index 7e51777..1bce036 100644 --- a/content/common/gpu/media/gpu_video_decode_accelerator.cc +++ b/content/common/gpu/media/gpu_video_decode_accelerator.cc @@ -79,12 +79,12 @@ GpuVideoDecodeAccelerator::~GpuVideoDecodeAccelerator() { stub_->RemoveDestructionObserver(this); } - if (video_decode_accelerator_.get()) + if (video_decode_accelerator_) video_decode_accelerator_.release()->Destroy(); } bool GpuVideoDecodeAccelerator::OnMessageReceived(const IPC::Message& msg) { - if (!stub_ || !video_decode_accelerator_.get()) + if (!stub_ || !video_decode_accelerator_) return false; bool handled = true; IPC_BEGIN_MESSAGE_MAP(GpuVideoDecodeAccelerator, msg) @@ -349,7 +349,7 @@ void GpuVideoDecodeAccelerator::NotifyResetDone() { void GpuVideoDecodeAccelerator::OnWillDestroyStub(GpuCommandBufferStub* stub) { DCHECK_EQ(stub, stub_.get()); - if (video_decode_accelerator_.get()) + if (video_decode_accelerator_) video_decode_accelerator_.release()->Destroy(); if (stub_) { stub_->RemoveDestructionObserver(this); diff --git a/content/common/gpu/media/vaapi_h264_decoder.cc b/content/common/gpu/media/vaapi_h264_decoder.cc index 3b53dae..36c7ff3 100644 --- a/content/common/gpu/media/vaapi_h264_decoder.cc +++ b/content/common/gpu/media/vaapi_h264_decoder.cc @@ -479,7 +479,7 @@ bool VaapiH264Decoder::InitializeFBConfig() { scoped_ptr_malloc<GLXFBConfig, ScopedPtrXFree> glx_fb_configs( glXChooseFBConfig(x_display_, DefaultScreen(x_display_), fbconfig_attr, &num_fbconfigs)); - if (!glx_fb_configs.get()) + if (!glx_fb_configs) return false; if (!num_fbconfigs) return false; @@ -2018,7 +2018,7 @@ bool VaapiH264Decoder::FinishPicture() { if (!(*output_candidate)->ref) { // Current picture hasn't been inserted into DPB yet, so don't remove it // if we managed to output it immediately. - if (*output_candidate != pic.get()) + if (*output_candidate != pic) dpb_.RemoveByPOC((*output_candidate)->pic_order_cnt); // Mark as unused. UnassignSurfaceFromPoC((*output_candidate)->pic_order_cnt); diff --git a/content/common/gpu/texture_image_transport_surface.cc b/content/common/gpu/texture_image_transport_surface.cc index c78b083..4a56bbf 100644 --- a/content/common/gpu/texture_image_transport_surface.cc +++ b/content/common/gpu/texture_image_transport_surface.cc @@ -54,7 +54,7 @@ bool TextureImageTransportSurface::Initialize() { GpuChannelManager* manager = helper_->manager(); surface_ = manager->GetDefaultOffscreenSurface(); - if (!surface_.get()) + if (!surface_) return false; if (!helper_->Initialize()) @@ -71,7 +71,7 @@ bool TextureImageTransportSurface::Initialize() { } void TextureImageTransportSurface::Destroy() { - if (surface_.get()) + if (surface_) surface_ = NULL; helper_->Destroy(); @@ -329,7 +329,7 @@ void TextureImageTransportSurface::BufferPresentedImpl( // of the service ids. DCHECK(context_.get() && surface_.get()); uint32 service_id = backbuffer_->ReleaseServiceId(); - if (context_->MakeCurrent(surface_.get())) + if (context_->MakeCurrent(surface_)) glDeleteTextures(1, &service_id); return; diff --git a/content/common/np_channel_base.cc b/content/common/np_channel_base.cc index a85fdb5..a1a2338 100644 --- a/content/common/np_channel_base.cc +++ b/content/common/np_channel_base.cc @@ -141,7 +141,7 @@ bool NPChannelBase::Init(base::MessageLoopProxy* ipc_message_loop, } bool NPChannelBase::Send(IPC::Message* message) { - if (!channel_.get()) { + if (!channel_) { VLOG(1) << "Channel is NULL; dropping message"; delete message; return false; diff --git a/content/common/npobject_proxy.cc b/content/common/npobject_proxy.cc index 4203b13..eb01acb 100644 --- a/content/common/npobject_proxy.cc +++ b/content/common/npobject_proxy.cc @@ -70,7 +70,7 @@ NPObjectProxy::NPObjectProxy( } NPObjectProxy::~NPObjectProxy() { - if (channel_.get()) { + if (channel_) { // This NPObjectProxy instance is now invalid and should not be reused for // requests initiated by plugins. We may receive requests for the // same NPObject in the context of the outgoing NPObjectMsg_Release call. @@ -94,7 +94,7 @@ NPObject* NPObjectProxy::Create(NPChannelBase* channel, } bool NPObjectProxy::Send(IPC::Message* msg) { - if (channel_.get()) + if (channel_) return channel_->Send(msg); delete msg; diff --git a/content/common/resource_messages.cc b/content/common/resource_messages.cc index 5277b5a..ad4bd7f 100644 --- a/content/common/resource_messages.cc +++ b/content/common/resource_messages.cc @@ -138,7 +138,7 @@ void ParamTraits<webkit_base::DataElement>::Log( void ParamTraits<scoped_refptr<webkit_glue::ResourceDevToolsInfo> >::Write( Message* m, const param_type& p) { WriteParam(m, p.get() != NULL); - if (p.get()) { + if (p) { WriteParam(m, p->http_status_code); WriteParam(m, p->http_status_text); WriteParam(m, p->request_headers); diff --git a/content/common/sandbox_mac_fontloading_unittest.mm b/content/common/sandbox_mac_fontloading_unittest.mm index 959af35..77b211f 100644 --- a/content/common/sandbox_mac_fontloading_unittest.mm +++ b/content/common/sandbox_mac_fontloading_unittest.mm @@ -44,7 +44,7 @@ bool FontLoadingTestCase::BeforeSandboxInit() { } font_shmem_.reset(new base::SharedMemory); - if (!font_shmem_.get()) { + if (!font_shmem_) { LOG(ERROR) << "Failed to create shared memory object."; return false; } diff --git a/content/common/sandbox_mac_unittest_helper.mm b/content/common/sandbox_mac_unittest_helper.mm index 6417e68..4c64b55 100644 --- a/content/common/sandbox_mac_unittest_helper.mm +++ b/content/common/sandbox_mac_unittest_helper.mm @@ -139,7 +139,7 @@ MULTIPROCESS_TEST_MAIN(mac_sandbox_test_runner) { // Find Test Function to run; scoped_ptr<MacSandboxTestCase> test_case(SandboxTestForName(sandbox_test_name)); - if (!test_case.get()) { + if (!test_case) { LOG(ERROR) << "Invalid sandbox test name (" << sandbox_test_name << ")"; return -1; } diff --git a/content/gpu/gpu_child_thread.cc b/content/gpu/gpu_child_thread.cc index b8ce0a9..165d9dfc 100644 --- a/content/gpu/gpu_child_thread.cc +++ b/content/gpu/gpu_child_thread.cc @@ -159,7 +159,7 @@ void GpuChildThread::OnInitialize() { } void GpuChildThread::StopWatchdog() { - if (watchdog_thread_.get()) { + if (watchdog_thread_) { watchdog_thread_->Stop(); } } @@ -197,7 +197,7 @@ void GpuChildThread::OnCollectGraphicsInfo() { void GpuChildThread::OnGetVideoMemoryUsageStats() { GPUVideoMemoryUsageStats video_memory_usage_stats; - if (gpu_channel_manager_.get()) + if (gpu_channel_manager_) gpu_channel_manager_->gpu_memory_manager()->GetVideoMemoryUsageStats( &video_memory_usage_stats); Send(new GpuHostMsg_VideoMemoryUsageStats(video_memory_usage_stats)); @@ -205,7 +205,7 @@ void GpuChildThread::OnGetVideoMemoryUsageStats() { void GpuChildThread::OnClean() { VLOG(1) << "GPU: Removing all contexts"; - if (gpu_channel_manager_.get()) + if (gpu_channel_manager_) gpu_channel_manager_->LoseAllContexts(); } @@ -226,7 +226,7 @@ void GpuChildThread::OnHang() { void GpuChildThread::OnDisableWatchdog() { VLOG(1) << "GPU: Disabling watchdog thread"; - if (watchdog_thread_.get()) { + if (watchdog_thread_) { // Disarm the watchdog before shutting down the message loop. This prevents // the future posting of tasks to the message loop. if (watchdog_thread_->message_loop()) diff --git a/content/gpu/gpu_info_collector.cc b/content/gpu/gpu_info_collector.cc index 61d5c4a..1197812 100644 --- a/content/gpu/gpu_info_collector.cc +++ b/content/gpu/gpu_info_collector.cc @@ -21,7 +21,7 @@ namespace { scoped_refptr<gfx::GLSurface> InitializeGLSurface() { scoped_refptr<gfx::GLSurface> surface( gfx::GLSurface::CreateOffscreenGLSurface(false, gfx::Size(1, 1))); - if (!surface.get()) { + if (!surface) { LOG(ERROR) << "gfx::GLContext::CreateOffscreenGLSurface failed"; return NULL; } @@ -35,7 +35,7 @@ scoped_refptr<gfx::GLContext> InitializeGLContext(gfx::GLSurface* surface) { gfx::GLContext::CreateGLContext(NULL, surface, gfx::PreferIntegratedGpu)); - if (!context.get()) { + if (!context) { LOG(ERROR) << "gfx::GLContext::CreateGLContext failed"; return NULL; } @@ -85,11 +85,11 @@ bool CollectGraphicsInfoGL(content::GPUInfo* gpu_info) { } scoped_refptr<gfx::GLSurface> surface(InitializeGLSurface()); - if (!surface.get()) + if (!surface) return false; scoped_refptr<gfx::GLContext> context(InitializeGLContext(surface.get())); - if (!context.get()) + if (!context) return false; gpu_info->gl_renderer = GetGLString(GL_RENDERER); diff --git a/content/gpu/gpu_main.cc b/content/gpu/gpu_main.cc index 270a52b..98f1e9e 100644 --- a/content/gpu/gpu_main.cc +++ b/content/gpu/gpu_main.cc @@ -241,10 +241,10 @@ int GpuMain(const MainFunctionParams& parameters) { #endif if (do_init_sandbox) { - if (watchdog_thread.get()) + if (watchdog_thread) watchdog_thread->Stop(); gpu_info.sandboxed = LinuxSandbox::InitializeSandbox(); - if (watchdog_thread.get()) + if (watchdog_thread) watchdog_thread->Start(); } } @@ -290,7 +290,7 @@ namespace { void CreateDummyGlContext() { scoped_refptr<gfx::GLSurface> surface( gfx::GLSurface::CreateOffscreenGLSurface(false, gfx::Size(1, 1))); - if (!surface.get()) { + if (!surface) { VLOG(1) << "gfx::GLSurface::CreateOffscreenGLSurface failed"; return; } @@ -301,7 +301,7 @@ void CreateDummyGlContext() { gfx::GLContext::CreateGLContext(NULL, surface, gfx::PreferDiscreteGpu)); - if (!context.get()) { + if (!context) { VLOG(1) << "gfx::GLContext::CreateGLContext failed"; return; } diff --git a/content/plugin/plugin_channel.cc b/content/plugin/plugin_channel.cc index 8569a3d..3a27e61 100644 --- a/content/plugin/plugin_channel.cc +++ b/content/plugin/plugin_channel.cc @@ -302,7 +302,7 @@ void PluginChannel::OnClearSiteData(const std::string& site, base::FilePath path = command_line->GetSwitchValuePath(switches::kPluginPath); scoped_refptr<webkit::npapi::PluginLib> plugin_lib( webkit::npapi::PluginLib::CreatePluginLib(path)); - if (plugin_lib.get()) { + if (plugin_lib) { NPError err = plugin_lib->NP_Initialize(); if (err == NPERR_NO_ERROR) { const char* site_str = site.empty() ? NULL : site.c_str(); diff --git a/content/plugin/plugin_thread.cc b/content/plugin/plugin_thread.cc index ea0cbc1..9d3af8c 100644 --- a/content/plugin/plugin_thread.cc +++ b/content/plugin/plugin_thread.cc @@ -117,7 +117,7 @@ PluginThread::PluginThread() scoped_refptr<webkit::npapi::PluginLib> plugin( webkit::npapi::PluginLib::CreatePluginLib(plugin_path)); - if (plugin.get()) { + if (plugin) { plugin->NP_Initialize(); // For OOP plugins the plugin dll will be unloaded during process shutdown // time. @@ -170,7 +170,7 @@ void PluginThread::OnCreateChannel(int renderer_id, scoped_refptr<PluginChannel> channel(PluginChannel::GetPluginChannel( renderer_id, ChildProcess::current()->io_message_loop_proxy())); IPC::ChannelHandle channel_handle; - if (channel.get()) { + if (channel) { channel_handle.name = channel->channel_handle().name; #if defined(OS_POSIX) // On POSIX, pass the renderer-side FD. diff --git a/content/plugin/webplugin_delegate_stub.cc b/content/plugin/webplugin_delegate_stub.cc index 0adb0f9..e1e1e00 100644 --- a/content/plugin/webplugin_delegate_stub.cc +++ b/content/plugin/webplugin_delegate_stub.cc @@ -38,7 +38,7 @@ static void DestroyWebPluginAndDelegate( WebPlugin* webplugin) { // The plugin may not expect us to try to release the scriptable object // after calling NPP_Destroy on the instance, so delete the stub now. - if (scriptable_object.get()) + if (scriptable_object) scriptable_object->DeleteSoon(); // WebPlugin must outlive WebPluginDelegate. if (delegate) diff --git a/content/plugin/webplugin_proxy.cc b/content/plugin/webplugin_proxy.cc index 5ac898d..56daa82 100644 --- a/content/plugin/webplugin_proxy.cc +++ b/content/plugin/webplugin_proxy.cc @@ -102,7 +102,7 @@ WebPluginProxy::~WebPluginProxy() { #if defined(OS_MACOSX) // Destroy the surface early, since it may send messages during cleanup. - if (accelerated_surface_.get()) + if (accelerated_surface_) accelerated_surface_.reset(); #endif @@ -275,7 +275,7 @@ WebPluginResourceClient* WebPluginProxy::GetResourceClient(int id) { } int WebPluginProxy::GetRendererId() { - if (channel_.get()) + if (channel_) return channel_->renderer_id(); return -1; } @@ -629,7 +629,7 @@ void WebPluginProxy::StartIme() { WebPluginAcceleratedSurface* WebPluginProxy::GetAcceleratedSurface( gfx::GpuPreference gpu_preference) { - if (!accelerated_surface_.get()) + if (!accelerated_surface_) accelerated_surface_.reset( WebPluginAcceleratedSurfaceProxy::Create(this, gpu_preference)); return accelerated_surface_.get(); diff --git a/content/public/test/mock_render_thread.cc b/content/public/test/mock_render_thread.cc index a5d8e13..c680760 100644 --- a/content/public/test/mock_render_thread.cc +++ b/content/public/test/mock_render_thread.cc @@ -39,7 +39,7 @@ bool MockRenderThread::Send(IPC::Message* msg) { // through this function messages, messages with reply and reply messages. // We can only handle one synchronous message at a time. if (msg->is_reply()) { - if (reply_deserializer_.get()) { + if (reply_deserializer_) { reply_deserializer_->SerializeOutputParameters(*msg); reply_deserializer_.reset(); } diff --git a/content/public/test/render_view_test.cc b/content/public/test/render_view_test.cc index deec4da..0b5cafa 100644 --- a/content/public/test/render_view_test.cc +++ b/content/public/test/render_view_test.cc @@ -133,7 +133,7 @@ void RenderViewTest::SetUp() { // Subclasses can set render_thread_ with their own implementation before // calling RenderViewTest::SetUp(). - if (!render_thread_.get()) + if (!render_thread_) render_thread_.reset(new MockRenderThread()); render_thread_->set_routing_id(kRouteId); render_thread_->set_surface_id(kSurfaceId); diff --git a/content/public/test/test_browser_context.cc b/content/public/test/test_browser_context.cc index b3aa752..c410d42 100644 --- a/content/public/test/test_browser_context.cc +++ b/content/public/test/test_browser_context.cc @@ -70,7 +70,7 @@ DownloadManagerDelegate* TestBrowserContext::GetDownloadManagerDelegate() { } net::URLRequestContextGetter* TestBrowserContext::GetRequestContext() { - if (!request_context_.get()) { + if (!request_context_) { request_context_ = new TestContextURLRequestContextGetter( GetResourceContext()->GetRequestContext()); } @@ -100,7 +100,7 @@ TestBrowserContext::GetMediaRequestContextForStoragePartition( } ResourceContext* TestBrowserContext::GetResourceContext() { - if (!resource_context_.get()) + if (!resource_context_) resource_context_.reset(new MockResourceContext()); return resource_context_.get(); } diff --git a/content/public/test/test_renderer_host.cc b/content/public/test/test_renderer_host.cc index a6d8334..9a1cc85 100644 --- a/content/public/test/test_renderer_host.cc +++ b/content/public/test/test_renderer_host.cc @@ -125,7 +125,7 @@ WebContents* RenderViewHostTestHarness::CreateTestWebContents() { #endif // See comment above browser_context_ decl for why we check for NULL here. - if (!browser_context_.get()) + if (!browser_context_) browser_context_.reset(new TestBrowserContext()); // This will be deleted when the WebContentsImpl goes away. @@ -175,7 +175,7 @@ void RenderViewHostTestHarness::TearDown() { base::RunLoop().RunUntilIdle(); // Delete any RenderProcessHosts before the BrowserContext goes away. - if (rvh_test_enabler_.rph_factory_.get()) + if (rvh_test_enabler_.rph_factory_) rvh_test_enabler_.rph_factory_.reset(); // Release the browser context on the UI thread. diff --git a/content/renderer/active_notification_tracker.cc b/content/renderer/active_notification_tracker.cc index 5f4a40e..11e16c2 100644 --- a/content/renderer/active_notification_tracker.cc +++ b/content/renderer/active_notification_tracker.cc @@ -55,7 +55,7 @@ void ActiveNotificationTracker::UnregisterNotification(int id) { scoped_ptr<WebNotification> notification(notification_table_.Lookup(id)); notification_table_.Remove(id); DCHECK(notification.get()); - if (notification.get()) + if (notification) reverse_notification_table_.erase(*notification); } diff --git a/content/renderer/browser_plugin/browser_plugin.cc b/content/renderer/browser_plugin/browser_plugin.cc index 62c973318..23fd9dc 100644 --- a/content/renderer/browser_plugin/browser_plugin.cc +++ b/content/renderer/browser_plugin/browser_plugin.cc @@ -418,7 +418,7 @@ bool BrowserPlugin::UsesDamageBuffer( bool BrowserPlugin::UsesPendingDamageBuffer( const BrowserPluginMsg_UpdateRect_Params& params) { - if (!pending_damage_buffer_.get()) + if (!pending_damage_buffer_) return false; return damage_buffer_sequence_id_ == params.damage_buffer_sequence_id; } @@ -1183,7 +1183,7 @@ void BrowserPlugin::destroy() { } NPObject* BrowserPlugin::scriptableObject() { - if (!bindings_.get()) + if (!bindings_) return NULL; NPObject* browser_plugin_np_object(bindings_->np_object()); @@ -1344,7 +1344,7 @@ void BrowserPlugin::PopulateResizeGuestParameters( params->damage_buffer_size = size; pending_damage_buffer_.reset( CreateDamageBuffer(size, ¶ms->damage_buffer_handle)); - if (!pending_damage_buffer_.get()) + if (!pending_damage_buffer_) NOTREACHED(); params->damage_buffer_sequence_id = ++damage_buffer_sequence_id_; } @@ -1370,7 +1370,7 @@ base::SharedMemory* BrowserPlugin::CreateDamageBuffer( content::RenderThread::Get()->HostAllocateSharedMemoryBuffer( size).release()); - if (shared_buf.get()) { + if (shared_buf) { if (shared_buf->Map(size)) { // Insert the magic word. *static_cast<unsigned int*>(shared_buf->memory()) = 0xdeadbeef; diff --git a/content/renderer/browser_plugin/mock_browser_plugin_manager.cc b/content/renderer/browser_plugin/mock_browser_plugin_manager.cc index 7c314c4..a1d9abd 100644 --- a/content/renderer/browser_plugin/mock_browser_plugin_manager.cc +++ b/content/renderer/browser_plugin/mock_browser_plugin_manager.cc @@ -50,7 +50,7 @@ bool MockBrowserPluginManager::Send(IPC::Message* msg) { // through this function messages, messages with reply and reply messages. // We can only handle one synchronous message at a time. if (msg->is_reply()) { - if (reply_deserializer_.get()) { + if (reply_deserializer_) { reply_deserializer_->SerializeOutputParameters(*msg); reply_deserializer_.reset(); } diff --git a/content/renderer/gpu/stream_texture_host_android.cc b/content/renderer/gpu/stream_texture_host_android.cc index a924ddc..2f75998 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_.get()) { + if (channel_) { 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 30039aa..04802df5 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_.get()) { + if (channel_) { return true; } diff --git a/content/renderer/media/media_stream_dependency_factory.cc b/content/renderer/media/media_stream_dependency_factory.cc index 9045b71..aa9b7dc 100644 --- a/content/renderer/media/media_stream_dependency_factory.cc +++ b/content/renderer/media/media_stream_dependency_factory.cc @@ -420,14 +420,14 @@ bool MediaStreamDependencyFactory::RemoveNativeMediaStreamTrack( bool MediaStreamDependencyFactory::CreatePeerConnectionFactory() { DVLOG(1) << "MediaStreamDependencyFactory::CreatePeerConnectionFactory()"; - if (!pc_factory_.get()) { + if (!pc_factory_) { DCHECK(!audio_device_); audio_device_ = new WebRtcAudioDeviceImpl(); scoped_refptr<webrtc::PeerConnectionFactoryInterface> factory( webrtc::CreatePeerConnectionFactory(worker_thread_, signaling_thread_, audio_device_)); - if (factory.get()) + if (factory) pc_factory_ = factory; else audio_device_ = NULL; @@ -653,7 +653,7 @@ bool MediaStreamDependencyFactory::EnsurePeerConnectionFactory() { event.Wait(); } - if (!socket_factory_.get()) { + if (!socket_factory_) { socket_factory_.reset( new IpcPacketSocketFactory(p2p_socket_dispatcher_)); } diff --git a/content/renderer/media/media_stream_dispatcher.cc b/content/renderer/media/media_stream_dispatcher.cc index d5eafe8..122fb43 100644 --- a/content/renderer/media/media_stream_dispatcher.cc +++ b/content/renderer/media/media_stream_dispatcher.cc @@ -130,7 +130,7 @@ void MediaStreamDispatcher::EnumerateDevices( &audio_enumeration_state_ : &video_enumeration_state_); state->requests.push_back(EnumerationRequest(event_handler, request_id)); - if (state->cached_devices.get()) { + if (state->cached_devices) { event_handler->OnDevicesEnumerated( request_id, state->cached_devices->devices); } else if (state->ipc_id < 0) { @@ -165,7 +165,7 @@ void MediaStreamDispatcher::RemoveEnumerationRequest( it != requests->end(); ++it) { if (it->request_id == request_id && it->handler == event_handler) { requests->erase(it); - if (requests->empty() && state->cached_devices.get()) { + if (requests->empty() && state->cached_devices) { // No more request and has a label, try to stop the label // and invalidate the state. Send(new MediaStreamHostMsg_StopGeneratedStream( diff --git a/content/renderer/media/peer_connection_tracker.cc b/content/renderer/media/peer_connection_tracker.cc index 203ba8b..b2d15ac 100644 --- a/content/renderer/media/peer_connection_tracker.cc +++ b/content/renderer/media/peer_connection_tracker.cc @@ -181,14 +181,14 @@ static DictionaryValue* GetDictValue(const webrtc::StatsReport& report) { scoped_ptr<DictionaryValue> stats, result; stats.reset(GetDictValueStats(report)); - if (!stats.get()) + if (!stats) return NULL; result.reset(new DictionaryValue()); - if (!result.get()) + if (!result) return NULL; - if (stats.get()) + if (stats) result->Set("stats", stats.release()); result->SetString("id", report.id); result->SetString("type", report.type); diff --git a/content/renderer/media/pepper_platform_video_decoder_impl.cc b/content/renderer/media/pepper_platform_video_decoder_impl.cc index ab444e8..1c257b1 100644 --- a/content/renderer/media/pepper_platform_video_decoder_impl.cc +++ b/content/renderer/media/pepper_platform_video_decoder_impl.cc @@ -26,7 +26,7 @@ PlatformVideoDecoderImpl::~PlatformVideoDecoderImpl() {} bool PlatformVideoDecoderImpl::Initialize(media::VideoCodecProfile profile) { // TODO(vrk): Support multiple decoders. - if (decoder_.get()) + if (decoder_) return true; RenderThreadImpl* render_thread = RenderThreadImpl::current(); @@ -76,7 +76,7 @@ void PlatformVideoDecoderImpl::Reset() { } void PlatformVideoDecoderImpl::Destroy() { - if (decoder_.get()) + if (decoder_) decoder_.release()->Destroy(); client_ = NULL; delete this; diff --git a/content/renderer/media/rtc_peer_connection_handler.cc b/content/renderer/media/rtc_peer_connection_handler.cc index c14e48b..7b7eca88 100644 --- a/content/renderer/media/rtc_peer_connection_handler.cc +++ b/content/renderer/media/rtc_peer_connection_handler.cc @@ -490,7 +490,7 @@ bool RTCPeerConnectionHandler::addICECandidate( UTF16ToUTF8(candidate.sdpMid()), candidate.sdpMLineIndex(), UTF16ToUTF8(candidate.candidate()))); - if (!native_candidate.get()) { + if (!native_candidate) { LOG(ERROR) << "Could not create native ICE candidate."; return false; } diff --git a/content/renderer/p2p/port_allocator.cc b/content/renderer/p2p/port_allocator.cc index 7380113..575d8e7 100644 --- a/content/renderer/p2p/port_allocator.cc +++ b/content/renderer/p2p/port_allocator.cc @@ -199,7 +199,7 @@ void P2PPortAllocatorSession::AllocateLegacyRelaySession() { relay_session_request_.reset( allocator_->web_frame_->createAssociatedURLLoader(options)); - if (!relay_session_request_.get()) { + if (!relay_session_request_) { LOG(ERROR) << "Failed to create URL loader."; return; } diff --git a/content/renderer/pepper/pepper_audio_input_host.cc b/content/renderer/pepper/pepper_audio_input_host.cc index 413675a..a848592 100644 --- a/content/renderer/pepper/pepper_audio_input_host.cc +++ b/content/renderer/pepper/pepper_audio_input_host.cc @@ -94,7 +94,7 @@ int32_t PepperAudioInputHost::OnOpen( const std::string& device_id, PP_AudioSampleRate sample_rate, uint32_t sample_frame_count) { - if (open_context_.get()) + if (open_context_) return PP_ERROR_INPROGRESS; if (audio_input_) return PP_ERROR_FAILED; @@ -143,7 +143,7 @@ void PepperAudioInputHost::OnOpenComplete( base::SyncSocket scoped_socket(socket_handle); base::SharedMemory scoped_shared_memory(shared_memory_handle, false); - if (!open_context_.get()) { + if (!open_context_) { NOTREACHED(); return; } @@ -208,7 +208,7 @@ void PepperAudioInputHost::Close() { audio_input_->ShutDown(); audio_input_ = NULL; - if (open_context_.get()) { + if (open_context_) { open_context_->params.set_result(PP_ERROR_ABORTED); host()->SendReply(*open_context_, PpapiPluginMsg_AudioInput_OpenReply()); open_context_.reset(); diff --git a/content/renderer/pepper/pepper_broker_impl.cc b/content/renderer/pepper/pepper_broker_impl.cc index d814dda..550c3be 100644 --- a/content/renderer/pepper/pepper_broker_impl.cc +++ b/content/renderer/pepper/pepper_broker_impl.cc @@ -226,7 +226,7 @@ void PepperBrokerImpl::OnBrokerPermissionResult( return; } - if (dispatcher_.get()) { + if (dispatcher_) { ConnectPluginToBroker(client); pending_connects_.erase(entry); return; diff --git a/content/renderer/pepper/pepper_device_enumeration_host_helper.cc b/content/renderer/pepper/pepper_device_enumeration_host_helper.cc index 4b21565..26788f8 100644 --- a/content/renderer/pepper/pepper_device_enumeration_host_helper.cc +++ b/content/renderer/pepper/pepper_device_enumeration_host_helper.cc @@ -133,7 +133,7 @@ int32_t PepperDeviceEnumerationHostHelper::InternalHandleResourceMessage( int32_t PepperDeviceEnumerationHostHelper::OnEnumerateDevices( HostMessageContext* context) { - if (enumerate_devices_context_.get()) + if (enumerate_devices_context_) return PP_ERROR_INPROGRESS; enumerate_.reset(new ScopedRequest( diff --git a/content/renderer/pepper/pepper_file_io_host.cc b/content/renderer/pepper/pepper_file_io_host.cc index 419a866..7f91cc0 100644 --- a/content/renderer/pepper/pepper_file_io_host.cc +++ b/content/renderer/pepper/pepper_file_io_host.cc @@ -286,7 +286,7 @@ int32_t PepperFileIOHost::OnHostMsgWrite( if (rv != PP_OK) return rv; - if (quota_file_io_.get()) { + if (quota_file_io_) { if (!quota_file_io_->Write( offset, buffer.c_str(), buffer.size(), base::Bind(&PepperFileIOHost::ExecutePlatformWriteCallback, @@ -387,7 +387,7 @@ int32_t PepperFileIOHost::OnHostMsgWillWrite( if (rv != PP_OK) return rv; - if (!quota_file_io_.get()) + if (!quota_file_io_) return PP_OK; if (!quota_file_io_->WillWrite( @@ -409,7 +409,7 @@ int32_t PepperFileIOHost::OnHostMsgWillSetLength( if (rv != PP_OK) return rv; - if (!quota_file_io_.get()) + if (!quota_file_io_) return PP_OK; if (!quota_file_io_->WillSetLength( diff --git a/content/renderer/pepper/pepper_platform_context_3d_impl.cc b/content/renderer/pepper/pepper_platform_context_3d_impl.cc index 2a839ae..77e9cf2 100644 --- a/content/renderer/pepper/pepper_platform_context_3d_impl.cc +++ b/content/renderer/pepper/pepper_platform_context_3d_impl.cc @@ -53,7 +53,7 @@ bool PlatformContext3DImpl::Init(const int32* attrib_list, channel_ = render_thread->EstablishGpuChannelSync( CAUSE_FOR_GPU_LAUNCH_PEPPERPLATFORMCONTEXT3DIMPL_INITIALIZE); - if (!channel_.get()) + if (!channel_) return false; DCHECK(channel_->state() == GpuChannelHost::kConnected); diff --git a/content/renderer/pepper/pepper_platform_image_2d_impl.cc b/content/renderer/pepper/pepper_platform_image_2d_impl.cc index dcad9ce..4a0b4f1 100644 --- a/content/renderer/pepper/pepper_platform_image_2d_impl.cc +++ b/content/renderer/pepper/pepper_platform_image_2d_impl.cc @@ -22,7 +22,7 @@ PepperPlatformImage2DImpl::PepperPlatformImage2DImpl(int width, // On Mac, we have to tell the browser to free the transport DIB. PepperPlatformImage2DImpl::~PepperPlatformImage2DImpl() { #if defined(OS_MACOSX) - if (dib_.get()) { + if (dib_) { RenderThreadImpl::current()->Send( new ViewHostMsg_FreeTransportDIB(dib_->id())); } diff --git a/content/renderer/pepper/pepper_plugin_delegate_impl.cc b/content/renderer/pepper/pepper_plugin_delegate_impl.cc index f3edfb4..42bcf50 100644 --- a/content/renderer/pepper/pepper_plugin_delegate_impl.cc +++ b/content/renderer/pepper/pepper_plugin_delegate_impl.cc @@ -929,9 +929,9 @@ PepperPluginDelegateImpl::ConnectToBroker( scoped_refptr<PepperBrokerImpl> broker = static_cast<PepperBrokerImpl*>(plugin_module->GetBroker()); - if (!broker.get()) { + if (!broker) { broker = CreateBroker(plugin_module); - if (!broker.get()) + if (!broker) return NULL; } @@ -1379,7 +1379,7 @@ bool PepperPluginDelegateImpl::IsInFullscreenMode() { } void PepperPluginDelegateImpl::SampleGamepads(WebKit::WebGamepads* data) { - if (!gamepad_shared_memory_reader_.get()) + if (!gamepad_shared_memory_reader_) gamepad_shared_memory_reader_.reset(new GamepadSharedMemoryReader); gamepad_shared_memory_reader_->SampleGamepads(*data); } diff --git a/content/renderer/pepper/pepper_truetype_font_mac.mm b/content/renderer/pepper/pepper_truetype_font_mac.mm index 0d3b4dc..0c396a3 100644 --- a/content/renderer/pepper/pepper_truetype_font_mac.mm +++ b/content/renderer/pepper/pepper_truetype_font_mac.mm @@ -266,7 +266,7 @@ int32_t PepperTrueTypeFontMac::Describe( int32_t PepperTrueTypeFontMac::GetTableTags(std::vector<uint32_t>* tags) { base::mac::ScopedCFTypeRef<CFArrayRef> tag_array( CTFontCopyAvailableTables(font_ref_, kCTFontTableOptionNoOptions)); - if (!tag_array.get()) + if (!tag_array) return PP_ERROR_FAILED; CFIndex length = CFArrayGetCount(tag_array); tags->resize(length); @@ -285,7 +285,7 @@ int32_t PepperTrueTypeFontMac::GetTable(uint32_t table_tag, base::mac::ScopedCFTypeRef<CFDataRef> table_ref( CTFontCopyTable(font_ref_, static_cast<CTFontTableTag>(table_tag), kCTFontTableOptionNoOptions)); - if (!table_ref.get()) + if (!table_ref) return PP_ERROR_FAILED; CFIndex table_size = CFDataGetLength(table_ref); diff --git a/content/renderer/pepper/pepper_video_capture_host.cc b/content/renderer/pepper/pepper_video_capture_host.cc index f79a42e..a147dbe 100644 --- a/content/renderer/pepper/pepper_video_capture_host.cc +++ b/content/renderer/pepper/pepper_video_capture_host.cc @@ -251,7 +251,7 @@ int32_t PepperVideoCaptureHost::OnOpen( const std::string& device_id, const PP_VideoCaptureDeviceInfo_Dev& requested_info, uint32_t buffer_count) { - if (platform_video_capture_.get()) + if (platform_video_capture_) return PP_ERROR_FAILED; webkit::ppapi::PluginDelegate* plugin_delegate = GetPluginDelegate(); @@ -323,7 +323,7 @@ int32_t PepperVideoCaptureHost::StopCapture() { } int32_t PepperVideoCaptureHost::Close() { - if (!platform_video_capture_.get()) + if (!platform_video_capture_) return PP_OK; StopCapture(); @@ -361,7 +361,7 @@ void PepperVideoCaptureHost::SetRequestedInfo( } void PepperVideoCaptureHost::DetachPlatformVideoCapture() { - if (platform_video_capture_.get()) { + if (platform_video_capture_) { platform_video_capture_->DetachEventHandler(); platform_video_capture_ = NULL; } diff --git a/content/renderer/pepper/pepper_websocket_host.cc b/content/renderer/pepper/pepper_websocket_host.cc index d473e84..e2ab15a 100644 --- a/content/renderer/pepper/pepper_websocket_host.cc +++ b/content/renderer/pepper/pepper_websocket_host.cc @@ -43,7 +43,7 @@ PepperWebSocketHost::PepperWebSocketHost( } PepperWebSocketHost::~PepperWebSocketHost() { - if (websocket_.get()) + if (websocket_) websocket_->disconnect(); } @@ -67,7 +67,7 @@ int32_t PepperWebSocketHost::OnResourceMessageReceived( void PepperWebSocketHost::didConnect() { std::string protocol; - if (websocket_.get()) + if (websocket_) protocol = websocket_->subprotocol().utf8(); connecting_ = false; connect_reply_.params.set_result(PP_OK); @@ -169,7 +169,7 @@ void PepperWebSocketHost::didClose(unsigned long unhandled_buffered_amount, } // Disconnect. - if (websocket_.get()) + if (websocket_) websocket_->disconnect(); } @@ -233,7 +233,7 @@ int32_t PepperWebSocketHost::OnHostMsgConnect( WebDocument document = container->element().document(); websocket_.reset(WebSocket::create(document, this)); DCHECK(websocket_.get()); - if (!websocket_.get()) + if (!websocket_) return PP_ERROR_NOTSUPPORTED; // Set receiving binary object type. @@ -249,7 +249,7 @@ int32_t PepperWebSocketHost::OnHostMsgClose( ppapi::host::HostMessageContext* context, int32_t code, const std::string& reason) { - if (!websocket_.get()) + if (!websocket_) return PP_ERROR_FAILED; close_reply_ = context->MakeReplyMessageContext(); initiating_close_ = true; @@ -261,7 +261,7 @@ int32_t PepperWebSocketHost::OnHostMsgClose( int32_t PepperWebSocketHost::OnHostMsgSendText( ppapi::host::HostMessageContext* context, const std::string& message) { - if (websocket_.get()) { + if (websocket_) { WebString web_message = WebString::fromUTF8(message); websocket_->sendText(web_message); } @@ -282,7 +282,7 @@ int32_t PepperWebSocketHost::OnHostMsgSendBinary( int32_t PepperWebSocketHost::OnHostMsgFail( ppapi::host::HostMessageContext* context, const std::string& message) { - if (websocket_.get()) + if (websocket_) websocket_->fail(WebString::fromUTF8(message)); return PP_OK; } diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc index 563b049..14278b9 100644 --- a/content/renderer/render_thread_impl.cc +++ b/content/renderer/render_thread_impl.cc @@ -410,11 +410,11 @@ RenderThreadImpl::~RenderThreadImpl() { RenderProcessObserver, observers_, OnRenderProcessShutdown()); // Wait for all databases to be closed. - if (web_database_observer_impl_.get()) + if (web_database_observer_impl_) web_database_observer_impl_->WaitForAllDatabasesToClose(); // Shutdown in reverse of the initialization order. - if (devtools_agent_message_filter_.get()) { + if (devtools_agent_message_filter_) { RemoveFilter(devtools_agent_message_filter_.get()); devtools_agent_message_filter_ = NULL; } @@ -431,21 +431,21 @@ RenderThreadImpl::~RenderThreadImpl() { db_message_filter_ = NULL; // Shutdown the file thread if it's running. - if (file_thread_.get()) + if (file_thread_) file_thread_->Stop(); - if (compositor_output_surface_filter_.get()) { + if (compositor_output_surface_filter_) { RemoveFilter(compositor_output_surface_filter_.get()); compositor_output_surface_filter_ = NULL; } compositor_thread_.reset(); - if (input_handler_manager_.get()) { + if (input_handler_manager_) { RemoveFilter(input_handler_manager_->GetMessageFilter()); input_handler_manager_.reset(); } - if (webkit_platform_support_.get()) + if (webkit_platform_support_) WebKit::shutdown(); lazy_tls.Pointer()->Set(NULL); @@ -621,7 +621,7 @@ void RenderThreadImpl::WidgetRestored() { } void RenderThreadImpl::EnsureWebKitInitialized() { - if (webkit_platform_support_.get()) + if (webkit_platform_support_) return; webkit_platform_support_.reset(new RendererWebKitPlatformSupportImpl); @@ -924,7 +924,7 @@ void RenderThreadImpl::PostponeIdleNotification() { void RenderThreadImpl::OnGpuVDAContextLoss() { RenderThreadImpl* self = RenderThreadImpl::current(); DCHECK(self); - if (!self->gpu_vda_context3d_.get()) + if (!self->gpu_vda_context3d_) return; if (self->compositor_message_loop_proxy()) { self->compositor_message_loop_proxy()->DeleteSoon( @@ -936,12 +936,12 @@ void RenderThreadImpl::OnGpuVDAContextLoss() { WebGraphicsContext3DCommandBufferImpl* RenderThreadImpl::GetGpuVDAContext3D() { - if (!gpu_vda_context3d_.get()) { + if (!gpu_vda_context3d_) { gpu_vda_context3d_.reset( WebGraphicsContext3DCommandBufferImpl::CreateOffscreenContext( this, WebKit::WebGraphicsContext3D::Attributes(), GURL("chrome://gpu/RenderThreadImpl::GetGpuVDAContext3D"))); - if (gpu_vda_context3d_.get()) + if (gpu_vda_context3d_) gpu_vda_context3d_->setContextLostCallback(context_lost_cb_.get()); } return gpu_vda_context3d_.get(); @@ -991,7 +991,7 @@ RenderThreadImpl::OffscreenContextProviderForCompositorThread() { } AudioRendererMixerManager* RenderThreadImpl::GetAudioRendererMixerManager() { - if (!audio_renderer_mixer_manager_.get()) { + if (!audio_renderer_mixer_manager_) { audio_renderer_mixer_manager_.reset(new AudioRendererMixerManager( GetAudioHardwareConfig())); } @@ -1170,7 +1170,7 @@ GpuChannelHost* RenderThreadImpl::EstablishGpuChannelSync( CauseForGpuLaunch cause_for_gpu_launch) { TRACE_EVENT0("gpu", "RenderThreadImpl::EstablishGpuChannelSync"); - if (gpu_channel_.get()) { + if (gpu_channel_) { // Do nothing if we already have a GPU channel or are already // establishing one. if (gpu_channel_->state() == GpuChannelHost::kUnconnected || @@ -1232,7 +1232,7 @@ WebKit::WebMediaStreamCenter* RenderThreadImpl::CreateMediaStreamCenter( MediaStreamDependencyFactory* RenderThreadImpl::GetMediaStreamDependencyFactory() { #if defined(ENABLE_WEBRTC) - if (!media_stream_factory_.get()) { + if (!media_stream_factory_) { media_stream_factory_.reset(new MediaStreamDependencyFactory( vc_manager_, p2p_socket_dispatcher_)); } @@ -1241,7 +1241,7 @@ RenderThreadImpl::GetMediaStreamDependencyFactory() { } GpuChannelHost* RenderThreadImpl::GetGpuChannel() { - if (!gpu_channel_.get()) + if (!gpu_channel_) return NULL; if (gpu_channel_->state() != GpuChannelHost::kConnected) @@ -1280,7 +1280,7 @@ void RenderThreadImpl::OnSetWebKitSharedTimersSuspended(bool suspend) { scoped_refptr<base::MessageLoopProxy> RenderThreadImpl::GetFileThreadMessageLoopProxy() { DCHECK(message_loop() == MessageLoop::current()); - if (!file_thread_.get()) { + if (!file_thread_) { file_thread_.reset(new base::Thread("Renderer::FILE")); file_thread_->Start(); } diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc index 5698ee8..7e0f9cb 100644 --- a/content/renderer/render_view_impl.cc +++ b/content/renderer/render_view_impl.cc @@ -2019,7 +2019,7 @@ WebExternalPopupMenu* RenderViewImpl::createExternalPopupMenu( // By returning NULL in that case, we instruct WebKit to cancel that new // popup. So from the user perspective, only the first one will show, and // will have to close the first one before another one can be shown. - if (external_popup_menu_.get()) + if (external_popup_menu_) return NULL; external_popup_menu_.reset( new ExternalPopupMenu(this, popup_menu_info, popup_menu_client)); @@ -3122,7 +3122,7 @@ void RenderViewImpl::willSubmitForm(WebFrame* frame, // from the form contents already stored by |willSendSubmitEvent| into the // dataSource's NavigationState (as opposed to the provisionalDataSource's, // which is what we're storing into now.) - if (password_form_data.get()) { + if (password_form_data) { DocumentState* old_document_state = DocumentState::FromDataSource(frame->dataSource()); if (old_document_state) { @@ -3624,7 +3624,7 @@ void RenderViewImpl::didClearWindowObject(WebFrame* frame) { DidClearWindowObject(frame)); if (enabled_bindings_ & BINDINGS_POLICY_DOM_AUTOMATION) { - if (!dom_automation_controller_.get()) + if (!dom_automation_controller_) dom_automation_controller_.reset(new DomAutomationController()); dom_automation_controller_->set_message_sender( static_cast<RenderView*>(this)); @@ -6434,7 +6434,7 @@ void RenderViewImpl::OnSelectPopupMenuItems( // a select faster than it takes for the show-select-popup IPC message to make // it to the browser UI thread. Ignore the extra-messages. // TODO(jcivelli): http:/b/5793321 Implement a better fix, as detailed in bug. - if (!external_popup_menu_.get()) + if (!external_popup_menu_) return; external_popup_menu_->DidSelectItems(canceled, selected_indices); @@ -6532,7 +6532,7 @@ bool RenderViewImpl::didTapMultipleTargets( scoped_ptr<skia::PlatformCanvas> canvas( RenderProcess::current()->GetDrawingCanvas(&transport_dib, gfx::Rect(canvas_size))); - if (!canvas.get()) + if (!canvas) return false; // TODO(trchen): Cleanup the device scale factor mess. diff --git a/content/renderer/render_widget.cc b/content/renderer/render_widget.cc index 01f9089..2f44c79 100644 --- a/content/renderer/render_widget.cc +++ b/content/renderer/render_widget.cc @@ -616,7 +616,7 @@ void RenderWidget::OnViewContextSwapBuffersPosted() { // pending_update_params_ can be NULL if the swap doesn't correspond to an // DoDeferredUpdate compositing pass, hence doesn't require an UpdateRect // message. - if (pending_update_params_.get()) { + if (pending_update_params_) { msg = new ViewHostMsg_UpdateRect(routing_id_, *pending_update_params_); pending_update_params_.reset(); } @@ -767,7 +767,7 @@ void RenderWidget::OnHandleInputEvent(const WebKit::WebInputEvent* input_event, if (event_type_gets_rate_limited && is_input_throttled && !is_hidden_) { // We want to rate limit the input events in this case, so we'll wait for // painting to finish before ACKing this message. - if (pending_input_event_ack_.get()) { + if (pending_input_event_ack_) { // As two different kinds of events could cause us to postpone an ack // we send it now, if we have one pending. The Browser should never // send us the same kind of event we are delaying the ack for. @@ -1036,7 +1036,7 @@ void RenderWidget::InvalidationCallback() { void RenderWidget::DoDeferredUpdateAndSendInputAck() { DoDeferredUpdate(); - if (pending_input_event_ack_.get()) + if (pending_input_event_ack_) Send(pending_input_event_ack_.release()); } @@ -1195,7 +1195,7 @@ void RenderWidget::DoDeferredUpdate() { scoped_ptr<skia::PlatformCanvas> canvas( RenderProcess::current()->GetDrawingCanvas(¤t_paint_buf_, pixel_bounds)); - if (!canvas.get()) { + if (!canvas) { NOTREACHED(); return; } @@ -1251,14 +1251,14 @@ void RenderWidget::DoDeferredUpdate() { // UpdateReply message so we can receive another input event before the // UpdateRect_ACK on platforms where the UpdateRect_ACK is sent from within // the UpdateRect IPC message handler. - if (pending_input_event_ack_.get()) + if (pending_input_event_ack_) Send(pending_input_event_ack_.release()); // If Composite() called SwapBuffers, pending_update_params_ will be reset (in // OnSwapBuffersPosted), meaning a message has been added to the // updates_pending_swap_ queue, that will be sent later. Otherwise, we send // the message now. - if (pending_update_params_.get()) { + if (pending_update_params_) { // sending an ack to browser process that the paint is complete... update_reply_pending_ = pending_update_params_->needs_ack; Send(new ViewHostMsg_UpdateRect(routing_id_, *pending_update_params_)); @@ -1463,7 +1463,7 @@ void RenderWidget::willBeginCompositorFrame() { void RenderWidget::didBecomeReadyForAdditionalInput() { TRACE_EVENT0("renderer", "RenderWidget::didBecomeReadyForAdditionalInput"); - if (pending_input_event_ack_.get()) + if (pending_input_event_ack_) Send(pending_input_event_ack_.release()); } @@ -1795,7 +1795,7 @@ void RenderWidget::OnPaintAtSize(const TransportDIB::Handle& dib_handle, scoped_ptr<skia::PlatformCanvas> canvas( paint_at_size_buffer->GetPlatformCanvas(canvas_size.width(), canvas_size.height())); - if (!canvas.get()) { + if (!canvas) { NOTREACHED(); return; } @@ -1853,7 +1853,7 @@ bool RenderWidget::OnSnapshotHelper(const gfx::Rect& src_subrect, true, NULL, skia::RETURN_NULL_ON_FAILURE)); - if (!canvas.get()) + if (!canvas) return false; canvas->save(); diff --git a/content/renderer/renderer_clipboard_client.cc b/content/renderer/renderer_clipboard_client.cc index 57ddfac..b21db02 100644 --- a/content/renderer/renderer_clipboard_client.cc +++ b/content/renderer/renderer_clipboard_client.cc @@ -47,14 +47,14 @@ void RendererClipboardWriteContext::WriteBitmapFromPixels( const void* pixels, const gfx::Size& size) { // Do not try to write a bitmap more than once - if (shared_buf_.get()) + if (shared_buf_) return; uint32 buf_size = 4 * size.width() * size.height(); // Allocate a shared memory buffer to hold the bitmap bits. shared_buf_.reset(ChildThread::current()->AllocateSharedMemory(buf_size)); - if (!shared_buf_.get()) + if (!shared_buf_) return; // Copy the bits into shared memory @@ -80,7 +80,7 @@ void RendererClipboardWriteContext::WriteBitmapFromPixels( // Flushes the objects to the clipboard with an IPC. void RendererClipboardWriteContext::Flush( const ui::Clipboard::ObjectMap& objects) { - if (shared_buf_.get()) { + if (shared_buf_) { RenderThreadImpl::current()->Send( new ClipboardHostMsg_WriteObjectsSync(objects, shared_buf_->handle())); } else { diff --git a/content/renderer/renderer_webkitplatformsupport_impl.cc b/content/renderer/renderer_webkitplatformsupport_impl.cc index d2ba1c4..fa10df6 100644 --- a/content/renderer/renderer_webkitplatformsupport_impl.cc +++ b/content/renderer/renderer_webkitplatformsupport_impl.cc @@ -228,7 +228,7 @@ WebKit::WebMimeRegistry* RendererWebKitPlatformSupportImpl::mimeRegistry() { WebKit::WebFileUtilities* RendererWebKitPlatformSupportImpl::fileUtilities() { - if (!file_utilities_.get()) { + if (!file_utilities_) { file_utilities_.reset(new FileUtilities(thread_safe_sender_)); file_utilities_->set_sandbox_enabled(sandboxEnabled()); } @@ -357,7 +357,7 @@ RendererWebKitPlatformSupportImpl::createLocalStorageNamespace( //------------------------------------------------------------------------------ WebIDBFactory* RendererWebKitPlatformSupportImpl::idbFactory() { - if (!web_idb_factory_.get()) { + if (!web_idb_factory_) { if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kSingleProcess)) web_idb_factory_.reset(WebIDBFactory::create()); else @@ -369,7 +369,7 @@ WebIDBFactory* RendererWebKitPlatformSupportImpl::idbFactory() { //------------------------------------------------------------------------------ WebFileSystem* RendererWebKitPlatformSupportImpl::fileSystem() { - if (!web_file_system_.get()) + if (!web_file_system_) web_file_system_.reset(new WebFileSystemImpl()); return web_file_system_.get(); } @@ -470,9 +470,9 @@ bool RendererWebKitPlatformSupportImpl::Hyphenator::canHyphenate( // Create a hyphenator object and attach it to the render thread so it can // receive a dictionary file opened by a browser. - if (!hyphenator_.get()) { + if (!hyphenator_) { hyphenator_.reset(new content::Hyphenator(base::kInvalidPlatformFileValue)); - if (!hyphenator_.get()) + if (!hyphenator_) return false; return hyphenator_->Attach(RenderThreadImpl::current(), locale); } @@ -759,7 +759,7 @@ void RendererWebKitPlatformSupportImpl::screenColorProfile( WebBlobRegistry* RendererWebKitPlatformSupportImpl::blobRegistry() { // thread_safe_sender_ can be NULL when running some tests. - if (!blob_registry_.get() && thread_safe_sender_.get()) + if (!blob_registry_.get() && thread_safe_sender_) blob_registry_.reset(new WebBlobRegistryImpl(thread_safe_sender_)); return blob_registry_.get(); } @@ -768,7 +768,7 @@ WebBlobRegistry* RendererWebKitPlatformSupportImpl::blobRegistry() { void RendererWebKitPlatformSupportImpl::sampleGamepads(WebGamepads& gamepads) { if (g_test_gamepads == 0) { - if (!gamepad_shared_memory_reader_.get()) + if (!gamepad_shared_memory_reader_) gamepad_shared_memory_reader_.reset(new GamepadSharedMemoryReader); gamepad_shared_memory_reader_->SampleGamepads(gamepads); } else { diff --git a/content/renderer/v8_value_converter_impl.cc b/content/renderer/v8_value_converter_impl.cc index b1a063c..e8b2563 100644 --- a/content/renderer/v8_value_converter_impl.cc +++ b/content/renderer/v8_value_converter_impl.cc @@ -263,12 +263,12 @@ base::BinaryValue* V8ValueConverterImpl::FromV8Buffer( scoped_ptr<WebKit::WebArrayBuffer> array_buffer( WebKit::WebArrayBuffer::createFromV8Value(val)); scoped_ptr<WebKit::WebArrayBufferView> view; - if (array_buffer.get()) { + if (array_buffer) { data = reinterpret_cast<char*>(array_buffer->data()); length = array_buffer->byteLength(); } else { view.reset(WebKit::WebArrayBufferView::createFromV8Value(val)); - if (view.get()) { + if (view) { data = reinterpret_cast<char*>(view->baseAddress()) + view->byteOffset(); length = view->byteLength(); } @@ -322,7 +322,7 @@ Value* V8ValueConverterImpl::FromV8Object( } scoped_ptr<base::Value> child(FromV8ValueImpl(child_v8, unique_map)); - if (!child.get()) + if (!child) // JSON.stringify skips properties whose values don't serialize, for // example undefined and functions. Emulate that behavior. continue; diff --git a/content/renderer/v8_value_converter_impl_unittest.cc b/content/renderer/v8_value_converter_impl_unittest.cc index 1f6b9bf..8a6a757 100644 --- a/content/renderer/v8_value_converter_impl_unittest.cc +++ b/content/renderer/v8_value_converter_impl_unittest.cc @@ -147,7 +147,7 @@ class V8ValueConverterImplTest : public testing::Test { scoped_ptr<base::Value> expected_value) { scoped_ptr<base::Value> raw(converter.FromV8Value(val, context_)); - if (expected_value.get()) { + if (expected_value) { ASSERT_TRUE(raw.get()); EXPECT_TRUE(expected_value->Equals(raw.get())); EXPECT_EQ(expected_type, raw->GetType()); @@ -162,7 +162,7 @@ class V8ValueConverterImplTest : public testing::Test { converter.FromV8Value(object, context_))); ASSERT_TRUE(dictionary.get()); - if (expected_value.get()) { + if (expected_value) { base::Value* temp = NULL; ASSERT_TRUE(dictionary->Get("test", &temp)); EXPECT_EQ(expected_type, temp->GetType()); @@ -176,7 +176,7 @@ class V8ValueConverterImplTest : public testing::Test { scoped_ptr<base::ListValue> list( static_cast<base::ListValue*>(converter.FromV8Value(array, context_))); ASSERT_TRUE(list.get()); - if (expected_value.get()) { + if (expected_value) { base::Value* temp = NULL; ASSERT_TRUE(list->Get(0, &temp)); EXPECT_EQ(expected_type, temp->GetType()); diff --git a/content/renderer/webplugin_delegate_proxy.cc b/content/renderer/webplugin_delegate_proxy.cc index 1421d63..bc0f057 100644 --- a/content/renderer/webplugin_delegate_proxy.cc +++ b/content/renderer/webplugin_delegate_proxy.cc @@ -333,7 +333,7 @@ bool WebPluginDelegateProxy::Initialize( channel_host = PluginChannelHost::GetPluginChannelHost( channel_handle, ChildProcess::current()->io_message_loop_proxy()); - if (!channel_host.get()) { + if (!channel_host) { LOG(ERROR) << "Couldn't get PluginChannelHost"; continue; } @@ -537,12 +537,12 @@ void WebPluginDelegateProxy::SendUpdateGeometry( if (bitmaps_changed) #endif { - if (transport_stores_[0].dib.get()) + if (transport_stores_[0].dib) CopyTransportDIBHandleForMessage(transport_stores_[0].dib->handle(), ¶m.windowless_buffer0, channel_host_->peer_pid()); - if (transport_stores_[1].dib.get()) + if (transport_stores_[1].dib) CopyTransportDIBHandleForMessage(transport_stores_[1].dib->handle(), ¶m.windowless_buffer1, channel_host_->peer_pid()); diff --git a/content/shell/shell.cc b/content/shell/shell.cc index 21b3136..521c9c5 100644 --- a/content/shell/shell.cc +++ b/content/shell/shell.cc @@ -208,7 +208,7 @@ void Shell::CloseDevTools() { } gfx::NativeView Shell::GetContentView() { - if (!web_contents_.get()) + if (!web_contents_) return NULL; return web_contents_->GetView()->GetNativeView(); } @@ -281,7 +281,7 @@ void Shell::DidNavigateMainFramePostCommit(WebContents* web_contents) { } JavaScriptDialogManager* Shell::GetJavaScriptDialogManager() { - if (!dialog_manager_.get()) + if (!dialog_manager_) dialog_manager_.reset(new ShellJavaScriptDialogManager()); return dialog_manager_.get(); } diff --git a/content/shell/shell_browser_context.cc b/content/shell/shell_browser_context.cc index 81af960..5eb0f6d 100644 --- a/content/shell/shell_browser_context.cc +++ b/content/shell/shell_browser_context.cc @@ -62,7 +62,7 @@ ShellBrowserContext::ShellBrowserContext(bool off_the_record) } ShellBrowserContext::~ShellBrowserContext() { - if (resource_context_.get()) { + if (resource_context_) { BrowserThread::DeleteSoon( BrowserThread::IO, FROM_HERE, resource_context_.release()); } @@ -113,7 +113,7 @@ bool ShellBrowserContext::IsOffTheRecord() const { DownloadManagerDelegate* ShellBrowserContext::GetDownloadManagerDelegate() { DownloadManager* manager = BrowserContext::GetDownloadManager(this); - if (!download_manager_delegate_.get()) { + if (!download_manager_delegate_) { download_manager_delegate_ = new ShellDownloadManagerDelegate(); download_manager_delegate_->SetDownloadManager(manager); CommandLine* cmd_line = CommandLine::ForCurrentProcess(); diff --git a/content/shell/shell_gtk.cc b/content/shell/shell_gtk.cc index 98def95..22d6b33 100644 --- a/content/shell/shell_gtk.cc +++ b/content/shell/shell_gtk.cc @@ -209,7 +209,7 @@ void Shell::PlatformSetContents() { void Shell::SizeTo(int width, int height) { content_width_ = width; content_height_ = height; - if (web_contents_.get()) { + if (web_contents_) { gtk_widget_set_size_request(web_contents_->GetView()->GetNativeView(), width, height); } diff --git a/content/shell/shell_javascript_dialog_manager.cc b/content/shell/shell_javascript_dialog_manager.cc index 17f5b6b..4ef5e2b 100644 --- a/content/shell/shell_javascript_dialog_manager.cc +++ b/content/shell/shell_javascript_dialog_manager.cc @@ -46,7 +46,7 @@ void ShellJavaScriptDialogManager::RunJavaScriptDialog( #if defined(OS_MACOSX) || defined(OS_WIN) || defined(TOOLKIT_GTK) *did_suppress_message = false; - if (dialog_.get()) { + if (dialog_) { // One dialog at a time, please. *did_suppress_message = true; return; @@ -89,7 +89,7 @@ void ShellJavaScriptDialogManager::RunBeforeUnloadDialog( } #if defined(OS_MACOSX) || defined(OS_WIN) || defined(TOOLKIT_GTK) - if (dialog_.get()) { + if (dialog_) { // Seriously!? callback.Run(true, string16()); return; @@ -118,7 +118,7 @@ void ShellJavaScriptDialogManager::RunBeforeUnloadDialog( void ShellJavaScriptDialogManager::ResetJavaScriptState( WebContents* web_contents) { #if defined(OS_MACOSX) || defined(OS_WIN) || defined(TOOLKIT_GTK) - if (dialog_.get()) { + if (dialog_) { dialog_->Cancel(); dialog_.reset(); } diff --git a/content/shell/shell_url_request_context_getter.cc b/content/shell/shell_url_request_context_getter.cc index 8235052..e3f6bd5 100644 --- a/content/shell/shell_url_request_context_getter.cc +++ b/content/shell/shell_url_request_context_getter.cc @@ -84,7 +84,7 @@ ShellURLRequestContextGetter::~ShellURLRequestContextGetter() { net::URLRequestContext* ShellURLRequestContextGetter::GetURLRequestContext() { DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); - if (!url_request_context_.get()) { + if (!url_request_context_) { const CommandLine& command_line = *CommandLine::ForCurrentProcess(); url_request_context_.reset(new net::URLRequestContext()); diff --git a/content/shell/webkit_test_runner.cc b/content/shell/webkit_test_runner.cc index d229b24..e9eafa6 100644 --- a/content/shell/webkit_test_runner.cc +++ b/content/shell/webkit_test_runner.cc @@ -521,7 +521,7 @@ void WebKitTestRunner::captureHistoryForWindow( WebMediaPlayer* WebKitTestRunner::createWebMediaPlayer( WebFrame* frame, const WebURL& url, WebMediaPlayerClient* client) { - if (!test_media_stream_client_.get()) { + if (!test_media_stream_client_) { test_media_stream_client_.reset( new webkit_glue::TestMediaStreamClient()); } diff --git a/content/test/layout_browsertest.cc b/content/test/layout_browsertest.cc index 431e890..3425ac6 100644 --- a/content/test/layout_browsertest.cc +++ b/content/test/layout_browsertest.cc @@ -73,7 +73,7 @@ InProcessBrowserLayoutTest::InProcessBrowserLayoutTest( } InProcessBrowserLayoutTest::~InProcessBrowserLayoutTest() { - if (test_http_server_.get()) + if (test_http_server_) CHECK(test_http_server_->Stop()); } diff --git a/content/test/webrtc_audio_device_test.cc b/content/test/webrtc_audio_device_test.cc index 0ebed12..e37679c 100644 --- a/content/test/webrtc_audio_device_test.cc +++ b/content/test/webrtc_audio_device_test.cc @@ -285,13 +285,13 @@ bool WebRTCAudioDeviceTest::OnMessageReceived(const IPC::Message& message) { return true; } - if (audio_render_host_.get()) { + if (audio_render_host_) { bool message_was_ok = false; if (audio_render_host_->OnMessageReceived(message, &message_was_ok)) return true; } - if (audio_input_renderer_host_.get()) { + if (audio_input_renderer_host_) { bool message_was_ok = false; if (audio_input_renderer_host_->OnMessageReceived(message, &message_was_ok)) return true; @@ -317,7 +317,7 @@ void WebRTCAudioDeviceTest::WaitForIOThreadCompletion() { } void WebRTCAudioDeviceTest::WaitForAudioManagerCompletion() { - if (audio_manager_.get()) + if (audio_manager_) WaitForMessageLoopCompletion(audio_manager_->GetMessageLoop()); } diff --git a/content/worker/worker_webkitplatformsupport_impl.cc b/content/worker/worker_webkitplatformsupport_impl.cc index b81990d..f6a9a20 100644 --- a/content/worker/worker_webkitplatformsupport_impl.cc +++ b/content/worker/worker_webkitplatformsupport_impl.cc @@ -89,13 +89,13 @@ WebMimeRegistry* WorkerWebKitPlatformSupportImpl::mimeRegistry() { } WebFileSystem* WorkerWebKitPlatformSupportImpl::fileSystem() { - if (!web_file_system_.get()) + if (!web_file_system_) web_file_system_.reset(new WebFileSystemImpl()); return web_file_system_.get(); } WebFileUtilities* WorkerWebKitPlatformSupportImpl::fileUtilities() { - if (!file_utilities_.get()) { + if (!file_utilities_) { file_utilities_.reset(new FileUtilities(thread_safe_sender_)); file_utilities_->set_sandbox_enabled(sandboxEnabled()); } @@ -195,7 +195,7 @@ long long WorkerWebKitPlatformSupportImpl::databaseGetSpaceAvailableForOrigin( } WebKit::WebIDBFactory* WorkerWebKitPlatformSupportImpl::idbFactory() { - if (!web_idb_factory_.get()) + if (!web_idb_factory_) web_idb_factory_.reset(new RendererWebIDBFactoryImpl()); return web_idb_factory_.get(); } @@ -282,7 +282,7 @@ WebString WorkerWebKitPlatformSupportImpl::preferredExtensionForMIMEType( } WebBlobRegistry* WorkerWebKitPlatformSupportImpl::blobRegistry() { - if (!blob_registry_.get() && thread_safe_sender_.get()) + if (!blob_registry_.get() && thread_safe_sender_) blob_registry_.reset(new WebBlobRegistryImpl(thread_safe_sender_)); return blob_registry_.get(); } |