diff options
Diffstat (limited to 'content/browser')
13 files changed, 39 insertions, 32 deletions
diff --git a/content/browser/fileapi/fileapi_message_filter_unittest.cc b/content/browser/fileapi/fileapi_message_filter_unittest.cc index 98d8949..0a9c8fc 100644 --- a/content/browser/fileapi/fileapi_message_filter_unittest.cc +++ b/content/browser/fileapi/fileapi_message_filter_unittest.cc @@ -67,7 +67,7 @@ TEST_F(FileAPIMessageFilterTest, BuildEmptyBlob) { // channel proxy. Since OnMessageReceived is hidden on FileAPIMessageFilter, // cast it. IPC::ChannelProxy::MessageFilter* casted_filter = - static_cast<IPC::ChannelProxy::MessageFilter*>(filter); + static_cast<IPC::ChannelProxy::MessageFilter*>(filter.get()); BlobHostMsg_StartBuildingBlob start_message(kUrl); EXPECT_TRUE(casted_filter->OnMessageReceived(start_message)); diff --git a/content/browser/indexed_db/indexed_db_browsertest.cc b/content/browser/indexed_db/indexed_db_browsertest.cc index c2683be..68bbfb0 100644 --- a/content/browser/indexed_db/indexed_db_browsertest.cc +++ b/content/browser/indexed_db/indexed_db_browsertest.cc @@ -112,7 +112,7 @@ class IndexedDBBrowserTest : public ContentBrowserTest { base::Bind(&IndexedDBBrowserTest::DidGetDiskUsage, this)); scoped_refptr<base::ThreadTestHelper> helper(new base::ThreadTestHelper( BrowserMainLoop::GetInstance()->indexed_db_thread() - ->message_loop_proxy())); + ->message_loop_proxy().get())); EXPECT_TRUE(helper->Run()); // Wait for DidGetDiskUsage to be called. base::MessageLoop::current()->RunUntilIdle(); @@ -258,7 +258,7 @@ class IndexedDBBrowserTestWithPreexistingLevelDB : public IndexedDBBrowserTest { &CopyLevelDBToProfile, shell(), context, EnclosingLevelDBDir())); scoped_refptr<base::ThreadTestHelper> helper(new base::ThreadTestHelper( BrowserMainLoop::GetInstance()->indexed_db_thread() - ->message_loop_proxy())); + ->message_loop_proxy().get())); ASSERT_TRUE(helper->Run()); } diff --git a/content/browser/indexed_db/indexed_db_quota_client_unittest.cc b/content/browser/indexed_db/indexed_db_quota_client_unittest.cc index 0873ff9..9ec3951 100644 --- a/content/browser/indexed_db/indexed_db_quota_client_unittest.cc +++ b/content/browser/indexed_db/indexed_db_quota_client_unittest.cc @@ -47,15 +47,15 @@ class IndexedDBQuotaClientTest : public testing::Test { new quota::MockQuotaManager( false /*in_memory*/, browser_context_->GetPath(), - base::MessageLoop::current()->message_loop_proxy(), - base::MessageLoop::current()->message_loop_proxy(), + base::MessageLoop::current()->message_loop_proxy().get(), + base::MessageLoop::current()->message_loop_proxy().get(), browser_context_->GetSpecialStoragePolicy()); idb_context_ = new IndexedDBContextImpl(browser_context_->GetPath(), browser_context_->GetSpecialStoragePolicy(), quota_manager->proxy(), - task_runner_); + task_runner_.get()); base::MessageLoop::current()->RunUntilIdle(); setup_temp_dir(); } diff --git a/content/browser/indexed_db/indexed_db_unittest.cc b/content/browser/indexed_db/indexed_db_unittest.cc index 7ee9253..c0904e5 100644 --- a/content/browser/indexed_db/indexed_db_unittest.cc +++ b/content/browser/indexed_db/indexed_db_unittest.cc @@ -62,9 +62,9 @@ TEST_F(IndexedDBTest, ClearSessionOnlyDatabases) { { scoped_refptr<IndexedDBContextImpl> idb_context = new IndexedDBContextImpl(temp_dir.path(), - special_storage_policy_, + special_storage_policy_.get(), NULL, - task_runner_); + task_runner_.get()); normal_path = idb_context->GetFilePathForTesting( webkit_database::GetIdentifierFromOrigin(kNormalOrigin)); @@ -96,9 +96,9 @@ TEST_F(IndexedDBTest, SetForceKeepSessionState) { // With the levelDB backend, these are directories. scoped_refptr<IndexedDBContextImpl> idb_context = new IndexedDBContextImpl(temp_dir.path(), - special_storage_policy_, + special_storage_policy_.get(), NULL, - task_runner_); + task_runner_.get()); // Save session state. This should bypass the destruction-time deletion. idb_context->SetForceKeepSessionState(); @@ -155,9 +155,9 @@ TEST_F(IndexedDBTest, ForceCloseOpenDatabasesOnDelete) { scoped_refptr<IndexedDBContextImpl> idb_context = new IndexedDBContextImpl(temp_dir.path(), - special_storage_policy_, + special_storage_policy_.get(), NULL, - task_runner_); + task_runner_.get()); test_path = idb_context->GetFilePathForTesting( webkit_database::GetIdentifierFromOrigin(kTestOrigin)); diff --git a/content/browser/renderer_host/media/media_stream_manager.cc b/content/browser/renderer_host/media/media_stream_manager.cc index 62a3517..5752d88 100644 --- a/content/browser/renderer_host/media/media_stream_manager.cc +++ b/content/browser/renderer_host/media/media_stream_manager.cc @@ -148,7 +148,7 @@ MediaStreamManager::MediaStreamManager(media::AudioManager* audio_manager) MediaStreamManager::~MediaStreamManager() { DCHECK(requests_.empty()); - DCHECK(!device_loop_); + DCHECK(!device_loop_.get()); DCHECK(!io_loop_); } @@ -585,15 +585,15 @@ void MediaStreamManager::HandleRequest(const std::string& label) { void MediaStreamManager::InitializeDeviceManagersOnIOThread() { DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); - if (device_loop_) + if (device_loop_.get()) return; device_loop_ = audio_manager_->GetMessageLoop(); audio_input_device_manager_ = new AudioInputDeviceManager(audio_manager_); - audio_input_device_manager_->Register(this, device_loop_); + audio_input_device_manager_->Register(this, device_loop_.get()); video_capture_manager_ = new VideoCaptureManager(); - video_capture_manager_->Register(this, device_loop_); + video_capture_manager_->Register(this, device_loop_.get()); // We want to be notified of IO message loop destruction to delete the thread // and the device managers. @@ -937,7 +937,7 @@ void MediaStreamManager::UseFakeUI(scoped_ptr<FakeMediaStreamUIProxy> fake_ui) { void MediaStreamManager::WillDestroyCurrentMessageLoop() { DCHECK_EQ(base::MessageLoop::current(), io_loop_); DCHECK(requests_.empty()); - if (device_loop_) { + if (device_loop_.get()) { StopMonitoring(); video_capture_manager_->Unregister(); diff --git a/content/browser/renderer_host/p2p/socket_dispatcher_host.cc b/content/browser/renderer_host/p2p/socket_dispatcher_host.cc index 253475c..f1249d5 100644 --- a/content/browser/renderer_host/p2p/socket_dispatcher_host.cc +++ b/content/browser/renderer_host/p2p/socket_dispatcher_host.cc @@ -191,7 +191,7 @@ void P2PSocketDispatcherHost::OnCreateSocket( } scoped_ptr<P2PSocketHost> socket( - P2PSocketHost::Create(this, socket_id, type, url_context_)); + P2PSocketHost::Create(this, socket_id, type, url_context_.get())); if (!socket) { Send(new P2PMsg_OnError(socket_id)); diff --git a/content/browser/renderer_host/pepper/pepper_external_file_ref_backend.cc b/content/browser/renderer_host/pepper/pepper_external_file_ref_backend.cc index edae57e..877428e 100644 --- a/content/browser/renderer_host/pepper/pepper_external_file_ref_backend.cc +++ b/content/browser/renderer_host/pepper/pepper_external_file_ref_backend.cc @@ -43,11 +43,15 @@ int32_t PepperExternalFileRefBackend::Touch( PP_Time last_access_time, PP_Time last_modified_time) { IPC::Message reply_msg = PpapiPluginMsg_FileRef_TouchReply(); - base::FileUtilProxy::Touch(task_runner_, path_, + base::FileUtilProxy::Touch( + task_runner_.get(), + path_, ppapi::PPTimeToTime(last_access_time), ppapi::PPTimeToTime(last_modified_time), base::Bind(&PepperExternalFileRefBackend::DidFinish, - weak_factory_.GetWeakPtr(), reply_context, reply_msg)); + weak_factory_.GetWeakPtr(), + reply_context, + reply_msg)); return PP_OK_COMPLETIONPENDING; } @@ -66,9 +70,12 @@ int32_t PepperExternalFileRefBackend::Rename( int32_t PepperExternalFileRefBackend::Query( ppapi::host::ReplyMessageContext reply_context) { - bool ok = base::FileUtilProxy::GetFileInfo(task_runner_, path_, + bool ok = base::FileUtilProxy::GetFileInfo( + task_runner_.get(), + path_, base::Bind(&PepperExternalFileRefBackend::GetMetadataComplete, - weak_factory_.GetWeakPtr(), reply_context)); + weak_factory_.GetWeakPtr(), + reply_context)); DCHECK(ok); return PP_OK_COMPLETIONPENDING; } diff --git a/content/browser/renderer_host/pepper/pepper_file_system_browser_host.cc b/content/browser/renderer_host/pepper/pepper_file_system_browser_host.cc index 96180cb..4189741 100644 --- a/content/browser/renderer_host/pepper/pepper_file_system_browser_host.cc +++ b/content/browser/renderer_host/pepper/pepper_file_system_browser_host.cc @@ -66,7 +66,7 @@ PepperFileSystemBrowserHost::PepperFileSystemBrowserHost(BrowserPpapiHost* host, } PepperFileSystemBrowserHost::~PepperFileSystemBrowserHost() { - if (fs_context_) + if (fs_context_.get()) fs_context_->operation_runner()->Shutdown(); } @@ -137,9 +137,9 @@ void PepperFileSystemBrowserHost::GotFileSystemContext( ppapi::host::ReplyMessageContext reply_context, fileapi::FileSystemType file_system_type, scoped_refptr<fileapi::FileSystemContext> fs_context) { - if (!fs_context) { - OpenFileSystemComplete(reply_context, base::PLATFORM_FILE_ERROR_FAILED, - std::string(), GURL()); + if (!fs_context.get()) { + OpenFileSystemComplete( + reply_context, base::PLATFORM_FILE_ERROR_FAILED, std::string(), GURL()); return; } GURL origin = browser_ppapi_host_->GetDocumentURLForInstance( diff --git a/content/browser/renderer_host/pepper/pepper_internal_file_ref_backend.cc b/content/browser/renderer_host/pepper/pepper_internal_file_ref_backend.cc index 17c7cf6..0526347 100644 --- a/content/browser/renderer_host/pepper/pepper_internal_file_ref_backend.cc +++ b/content/browser/renderer_host/pepper/pepper_internal_file_ref_backend.cc @@ -245,7 +245,7 @@ int32_t PepperInternalFileRefBackend::GetAbsolutePath( int32_t PepperInternalFileRefBackend::HasPermissions(int permissions) const { base::PlatformFileError error; - CheckFileSystemPermissionsForProcess(GetFileSystemContext(), + CheckFileSystemPermissionsForProcess(GetFileSystemContext().get(), render_process_id_, GetFileSystemURL(), permissions, diff --git a/content/browser/renderer_host/pepper/pepper_network_proxy_host.cc b/content/browser/renderer_host/pepper/pepper_network_proxy_host.cc index 8ea4241..6042bad 100644 --- a/content/browser/renderer_host/pepper/pepper_network_proxy_host.cc +++ b/content/browser/renderer_host/pepper/pepper_network_proxy_host.cc @@ -93,7 +93,7 @@ PepperNetworkProxyHost::GetUIThreadDataOnUIThread(int render_process_id, void PepperNetworkProxyHost::DidGetUIThreadData( const UIThreadData& ui_thread_data) { is_allowed_ = ui_thread_data.is_allowed; - if (ui_thread_data.context_getter && + if (ui_thread_data.context_getter.get() && ui_thread_data.context_getter->GetURLRequestContext()) { proxy_service_ = ui_thread_data.context_getter->GetURLRequestContext()->proxy_service(); diff --git a/content/browser/speech/speech_recognizer_impl.cc b/content/browser/speech/speech_recognizer_impl.cc index aefeda3..333d0e2 100644 --- a/content/browser/speech/speech_recognizer_impl.cc +++ b/content/browser/speech/speech_recognizer_impl.cc @@ -568,7 +568,7 @@ SpeechRecognizerImpl::StartRecording(const FSMEventArgs&) { audio_controller_ = AudioInputController::Create( audio_manager, this, input_parameters, device_id_); - if (!audio_controller_) { + if (!audio_controller_.get()) { return Abort(SpeechRecognitionError(SPEECH_RECOGNITION_ERROR_AUDIO)); } diff --git a/content/browser/storage_partition_impl.cc b/content/browser/storage_partition_impl.cc index ec838a2..8b3000e 100644 --- a/content/browser/storage_partition_impl.cc +++ b/content/browser/storage_partition_impl.cc @@ -231,8 +231,8 @@ StoragePartitionImpl* StoragePartitionImpl::Create( base::SequencedTaskRunner* idb_task_runner = BrowserThread::CurrentlyOn(BrowserThread::UI) && BrowserMainLoop::GetInstance() - ? BrowserMainLoop::GetInstance()->indexed_db_thread()-> - message_loop_proxy() + ? BrowserMainLoop::GetInstance()->indexed_db_thread() + ->message_loop_proxy().get() : NULL; scoped_refptr<IndexedDBContextImpl> indexed_db_context = new IndexedDBContextImpl(path, diff --git a/content/browser/worker_host/worker_process_host.cc b/content/browser/worker_host/worker_process_host.cc index a8e2c33..3d38520 100644 --- a/content/browser/worker_host/worker_process_host.cc +++ b/content/browser/worker_host/worker_process_host.cc @@ -469,7 +469,7 @@ void WorkerProcessHost::RelayMessage( } void WorkerProcessHost::ShutdownSocketStreamDispatcherHostIfNecessary() { - if (!instances_.size() && socket_stream_dispatcher_host_) { + if (!instances_.size() && socket_stream_dispatcher_host_.get()) { // We can assume that this object is going to delete, because // currently a WorkerInstance will never be added to a WorkerProcessHost // once it is initialized. |