diff options
28 files changed, 64 insertions, 62 deletions
diff --git a/apps/app_shim/app_shim_host_mac.cc b/apps/app_shim/app_shim_host_mac.cc index 7ae2dd6..3b4423b 100644 --- a/apps/app_shim/app_shim_host_mac.cc +++ b/apps/app_shim/app_shim_host_mac.cc @@ -28,9 +28,12 @@ AppShimHost::~AppShimHost() { void AppShimHost::ServeChannel(const IPC::ChannelHandle& handle) { DCHECK(CalledOnValidThread()); DCHECK(!channel_.get()); - channel_.reset(new IPC::ChannelProxy(handle, IPC::Channel::MODE_SERVER, this, + channel_.reset(new IPC::ChannelProxy( + handle, + IPC::Channel::MODE_SERVER, + this, content::BrowserThread::GetMessageLoopProxyForThread( - content::BrowserThread::IO))); + content::BrowserThread::IO).get())); } Profile* AppShimHost::GetProfile() const { diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc index f6c95e4..c00b8ff 100644 --- a/chrome/browser/chrome_content_browser_client.cc +++ b/chrome/browser/chrome_content_browser_client.cc @@ -2205,7 +2205,7 @@ void ChromeContentBrowserClient::GetAdditionalFileSystemMountPointProviders( additional_providers->push_back(new MediaFileSystemMountPointProvider( storage_partition_path, pool->GetSequencedTaskRunner(pool->GetNamedSequenceToken( - MediaFileSystemMountPointProvider::kMediaTaskRunnerName)))); + MediaFileSystemMountPointProvider::kMediaTaskRunnerName)).get())); #endif } diff --git a/chrome/browser/media_galleries/fileapi/media_file_validator_unittest.cc b/chrome/browser/media_galleries/fileapi/media_file_validator_unittest.cc index cea58e6..0e5c553 100644 --- a/chrome/browser/media_galleries/fileapi/media_file_validator_unittest.cc +++ b/chrome/browser/media_galleries/fileapi/media_file_validator_unittest.cc @@ -91,10 +91,9 @@ class MediaFileValidatorTest : public InProcessBrowserTest { ScopedVector<fileapi::FileSystemMountPointProvider> additional_providers; additional_providers.push_back(new fileapi::TestMountPointProvider( - base::MessageLoopProxy::current(), src_path)); - additional_providers.push_back( - new MediaFileSystemMountPointProvider( - base, base::MessageLoopProxy::current())); + base::MessageLoopProxy::current().get(), src_path)); + additional_providers.push_back(new MediaFileSystemMountPointProvider( + base, base::MessageLoopProxy::current().get())); file_system_context_ = fileapi::CreateFileSystemContextWithAdditionalProvidersForTesting( NULL, additional_providers.Pass(), base); diff --git a/chrome/browser/media_galleries/fileapi/native_media_file_util_unittest.cc b/chrome/browser/media_galleries/fileapi/native_media_file_util_unittest.cc index d876be3..3e8f6f1 100644 --- a/chrome/browser/media_galleries/fileapi/native_media_file_util_unittest.cc +++ b/chrome/browser/media_galleries/fileapi/native_media_file_util_unittest.cc @@ -128,7 +128,7 @@ class NativeMediaFileUtilTest : public testing::Test { ScopedVector<fileapi::FileSystemMountPointProvider> additional_providers; additional_providers.push_back(new MediaFileSystemMountPointProvider( - data_dir_.path(), base::MessageLoopProxy::current())); + data_dir_.path(), base::MessageLoopProxy::current().get())); file_system_context_ = new fileapi::FileSystemContext( fileapi::FileSystemTaskRunners::CreateMockTaskRunners(), diff --git a/chrome/browser/media_galleries/fileapi/picasa/picasa_file_util_unittest.cc b/chrome/browser/media_galleries/fileapi/picasa/picasa_file_util_unittest.cc index acb3f72..e794f61 100644 --- a/chrome/browser/media_galleries/fileapi/picasa/picasa_file_util_unittest.cc +++ b/chrome/browser/media_galleries/fileapi/picasa/picasa_file_util_unittest.cc @@ -146,13 +146,12 @@ class TestPicasaFileUtil : public PicasaFileUtil { class TestMediaFileSystemMountPointProvider : public chrome::MediaFileSystemMountPointProvider { public: - TestMediaFileSystemMountPointProvider( - const base::FilePath& profile_path, - PicasaFileUtil* picasa_file_util) + TestMediaFileSystemMountPointProvider(const base::FilePath& profile_path, + PicasaFileUtil* picasa_file_util) : chrome::MediaFileSystemMountPointProvider( - profile_path, base::MessageLoopProxy::current()), - test_file_util_(picasa_file_util) { - } + profile_path, + base::MessageLoopProxy::current().get()), + test_file_util_(picasa_file_util) {} virtual fileapi::AsyncFileUtil* GetAsyncFileUtil(fileapi::FileSystemType type) OVERRIDE { diff --git a/chrome/browser/net/connection_tester.cc b/chrome/browser/net/connection_tester.cc index 43755d0..71c5b2d 100644 --- a/chrome/browser/net/connection_tester.cc +++ b/chrome/browser/net/connection_tester.cc @@ -223,9 +223,8 @@ class ExperimentURLRequestContext : public net::URLRequestContext { // construction needs ot happen on the UI thread. return net::ERR_NOT_IMPLEMENTED; #else - config_service->reset( - net::ProxyService::CreateSystemProxyConfigService( - base::ThreadTaskRunnerHandle::Get(), NULL)); + config_service->reset(net::ProxyService::CreateSystemProxyConfigService( + base::ThreadTaskRunnerHandle::Get().get(), NULL)); return net::OK; #endif } diff --git a/chrome/browser/printing/print_job_unittest.cc b/chrome/browser/printing/print_job_unittest.cc index 3b98e4b..f9dfe8c 100644 --- a/chrome/browser/printing/print_job_unittest.cc +++ b/chrome/browser/printing/print_job_unittest.cc @@ -104,7 +104,7 @@ TEST_F(PrintJobTest, SimplePrint) { EXPECT_EQ(base::MessageLoop::current(), job->message_loop()); scoped_refptr<TestOwner> owner(new TestOwner); TestSource source; - job->Initialize(owner, &source, 1); + job->Initialize(owner.get(), &source, 1); job->Stop(); EXPECT_FALSE(job->is_stopped()); EXPECT_TRUE(job->is_stopping()); diff --git a/chrome/browser/sync/glue/autofill_data_type_controller.cc b/chrome/browser/sync/glue/autofill_data_type_controller.cc index a9d666a..6703779 100644 --- a/chrome/browser/sync/glue/autofill_data_type_controller.cc +++ b/chrome/browser/sync/glue/autofill_data_type_controller.cc @@ -59,7 +59,7 @@ bool AutofillDataTypeController::StartModels() { DCHECK_EQ(MODEL_STARTING, state()); autofill::AutofillWebDataService* web_data_service = - autofill::AutofillWebDataService::FromBrowserContext(profile()); + autofill::AutofillWebDataService::FromBrowserContext(profile()).get(); if (!web_data_service) return false; diff --git a/chrome/browser/sync/glue/autofill_profile_data_type_controller.cc b/chrome/browser/sync/glue/autofill_profile_data_type_controller.cc index a480737..a508a84 100644 --- a/chrome/browser/sync/glue/autofill_profile_data_type_controller.cc +++ b/chrome/browser/sync/glue/autofill_profile_data_type_controller.cc @@ -51,7 +51,7 @@ void AutofillProfileDataTypeController::OnPersonalDataChanged() { personal_data_->RemoveObserver(this); autofill::AutofillWebDataService* web_data_service = - autofill::AutofillWebDataService::FromBrowserContext(profile()); + autofill::AutofillWebDataService::FromBrowserContext(profile()).get(); if (!web_data_service) return; @@ -88,7 +88,7 @@ bool AutofillProfileDataTypeController::StartModels() { } autofill::AutofillWebDataService* web_data_service = - AutofillWebDataService::FromBrowserContext(profile()); + AutofillWebDataService::FromBrowserContext(profile()).get(); if (!web_data_service) return false; diff --git a/chrome/browser/sync/test/integration/sync_app_helper.cc b/chrome/browser/sync/test/integration/sync_app_helper.cc index e1eb6c1..81145034 100644 --- a/chrome/browser/sync/test/integration/sync_app_helper.cc +++ b/chrome/browser/sync/test/integration/sync_app_helper.cc @@ -61,7 +61,7 @@ AppStateMap GetAppStates(Profile* profile) { extension_service->GenerateInstalledExtensionsSet()); for (ExtensionSet::const_iterator it = extensions->begin(); it != extensions->end(); ++it) { - if (extensions::sync_helper::IsSyncableApp(*it)) { + if (extensions::sync_helper::IsSyncableApp(it->get())) { const std::string& id = (*it)->id(); LoadApp(extension_service, id, &(app_state_map[id])); } diff --git a/chrome/browser/ui/app_list/search/app_search_provider.cc b/chrome/browser/ui/app_list/search/app_search_provider.cc index b976f56..dbf777d 100644 --- a/chrome/browser/ui/app_list/search/app_search_provider.cc +++ b/chrome/browser/ui/app_list/search/app_search_provider.cc @@ -80,7 +80,7 @@ void AppSearchProvider::RefreshApps() { apps_.clear(); for (ExtensionSet::const_iterator iter = extensions->begin(); iter != extensions->end(); ++iter) { - const extensions::Extension* app = *iter; + const extensions::Extension* app = iter->get(); if (!app->ShouldDisplayInAppLauncher()) continue; diff --git a/chrome/browser/ui/app_list/search/history.cc b/chrome/browser/ui/app_list/search/history.cc index eeb8b97..ec8fd00 100644 --- a/chrome/browser/ui/app_list/search/history.cc +++ b/chrome/browser/ui/app_list/search/history.cc @@ -34,7 +34,8 @@ History::History(content::BrowserContext* context) const base::FilePath data_file = browser_context_->GetPath().AppendASCII(kStoreDataFileName); store_ = new HistoryDataStore(data_file); - data_.reset(new HistoryData(store_, kMaxQueryEntries, kMaxSecondaryQueries)); + data_.reset( + new HistoryData(store_.get(), kMaxQueryEntries, kMaxSecondaryQueries)); data_->AddObserver(this); } diff --git a/chrome/browser/ui/app_list/search/history_data_store.cc b/chrome/browser/ui/app_list/search/history_data_store.cc index 0036b0e..b52598f 100644 --- a/chrome/browser/ui/app_list/search/history_data_store.cc +++ b/chrome/browser/ui/app_list/search/history_data_store.cc @@ -123,7 +123,8 @@ HistoryDataStore::HistoryDataStore(const base::FilePath& data_file) file_task_runner_ = pool->GetSequencedTaskRunnerWithShutdownBehavior( pool->GetNamedSequenceToken(token), base::SequencedWorkerPool::SKIP_ON_SHUTDOWN); - writer_.reset(new base::ImportantFileWriter(data_file, file_task_runner_)); + writer_.reset( + new base::ImportantFileWriter(data_file, file_task_runner_.get())); cached_json_.reset(new base::DictionaryValue); cached_json_->SetString(kKeyVersion, kCurrentVersion); @@ -148,7 +149,7 @@ void HistoryDataStore::Flush(const OnFlushedCallback& on_flushed) { void HistoryDataStore::Load( const HistoryDataStore::OnLoadedCallback& on_loaded) { base::PostTaskAndReplyWithResult( - file_task_runner_, + file_task_runner_.get(), FROM_HERE, base::Bind(&HistoryDataStore::LoadOnBlockingPool, this), on_loaded); diff --git a/chrome/browser/ui/sync/profile_signin_confirmation_helper.cc b/chrome/browser/ui/sync/profile_signin_confirmation_helper.cc index dfb51cdf..1ebf284 100644 --- a/chrome/browser/ui/sync/profile_signin_confirmation_helper.cc +++ b/chrome/browser/ui/sync/profile_signin_confirmation_helper.cc @@ -78,7 +78,7 @@ bool HasSyncedExtensions(Profile* profile) { // The webstore is synced so that it stays put on the new tab // page, but since it's installed by default we don't want to // consider it when determining if the profile is dirty. - if (extensions::sync_helper::IsSyncable(*iter) && + if (extensions::sync_helper::IsSyncable(iter->get()) && (*iter)->id() != extension_misc::kWebStoreAppId) { VLOG(1) << "ProfileSigninConfirmationHelper: " << "profile contains a synced extension: " << (*iter)->id(); diff --git a/chrome/browser/ui/webui/options/content_settings_handler.cc b/chrome/browser/ui/webui/options/content_settings_handler.cc index 627905b..d2530d0 100644 --- a/chrome/browser/ui/webui/options/content_settings_handler.cc +++ b/chrome/browser/ui/webui/options/content_settings_handler.cc @@ -225,7 +225,7 @@ void AddExceptionsGrantedByHostedApps( for (ExtensionSet::const_iterator extension = extensions->begin(); extension != extensions->end(); ++extension) { - if (!app_filter(**extension, profile)) + if (!app_filter(*extension->get(), profile)) continue; extensions::URLPatternSet web_extent = (*extension)->web_extent(); @@ -236,11 +236,12 @@ void AddExceptionsGrantedByHostedApps( AddExceptionForHostedApp(url_pattern, *extension->get(), exceptions); } // Retrieve the launch URL. - GURL launch_url = extensions::AppLaunchInfo::GetLaunchWebURL(*extension); + GURL launch_url = + extensions::AppLaunchInfo::GetLaunchWebURL(extension->get()); // Skip adding the launch URL if it is part of the web extent. if (web_extent.MatchesURL(launch_url)) continue; - AddExceptionForHostedApp(launch_url.spec(), **extension, exceptions); + AddExceptionForHostedApp(launch_url.spec(), *extension->get(), exceptions); } } diff --git a/chrome/common/service_process_util_unittest.cc b/chrome/common/service_process_util_unittest.cc index 5139d9c..c436cde 100644 --- a/chrome/common/service_process_util_unittest.cc +++ b/chrome/common/service_process_util_unittest.cc @@ -271,8 +271,7 @@ class ServiceProcessStateFileManipulationTest : public ::testing::Test { new Launchd::ScopedInstance(mock_launchd_.get())); ASSERT_TRUE(service_process_state_.Initialize()); ASSERT_TRUE(service_process_state_.SignalReady( - io_thread_.message_loop_proxy(), - base::Closure())); + io_thread_.message_loop_proxy().get(), base::Closure())); loop_.PostDelayedTask(FROM_HERE, base::MessageLoop::QuitClosure(), TestTimeouts::action_max_timeout()); diff --git a/content/browser/fileapi/browser_file_system_helper.cc b/content/browser/fileapi/browser_file_system_helper.cc index df2b5f6..3466d3b 100644 --- a/content/browser/fileapi/browser_file_system_helper.cc +++ b/content/browser/fileapi/browser_file_system_helper.cc @@ -53,8 +53,9 @@ scoped_refptr<fileapi::FileSystemContext> CreateFileSystemContext( quota::QuotaManagerProxy* quota_manager_proxy) { scoped_ptr<fileapi::FileSystemTaskRunners> task_runners( new fileapi::FileSystemTaskRunners( - BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO), - BrowserThread::GetMessageLoopProxyForThread(BrowserThread::FILE))); + BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO).get(), + BrowserThread::GetMessageLoopProxyForThread(BrowserThread::FILE) + .get())); // Setting up additional mount point providers. ScopedVector<fileapi::FileSystemMountPointProvider> additional_providers; diff --git a/content/common/gpu/image_transport_surface_mac.cc b/content/common/gpu/image_transport_surface_mac.cc index 00bc86c..ceb6964 100644 --- a/content/common/gpu/image_transport_surface_mac.cc +++ b/content/common/gpu/image_transport_surface_mac.cc @@ -495,7 +495,7 @@ scoped_refptr<gfx::GLSurface> ImageTransportSurface::CreateNativeSurface( return scoped_refptr<gfx::GLSurface>(); } scoped_refptr<gfx::GLSurface> surface(new DRTSurfaceOSMesa()); - if (!surface || !surface->Initialize()) + if (!surface.get() || !surface->Initialize()) return surface; return scoped_refptr<gfx::GLSurface>(new PassThroughImageTransportSurface( manager, stub, surface.get(), false)); diff --git a/media/audio/audio_manager_base.cc b/media/audio/audio_manager_base.cc index 220e0b6..7ffc7d3 100644 --- a/media/audio/audio_manager_base.cc +++ b/media/audio/audio_manager_base.cc @@ -92,7 +92,7 @@ AudioManagerBase::AudioManagerBase() // TODO(dalecurtis): We should require the message loop to be passed in. const CommandLine* cmd_line = CommandLine::ForCurrentProcess(); if (!cmd_line->HasSwitch(switches::kDisableMainThreadAudio) && - base::MessageLoopProxy::current() && + base::MessageLoopProxy::current().get() && base::MessageLoop::current()->IsType(base::MessageLoop::TYPE_UI)) { message_loop_ = base::MessageLoopProxy::current(); return; diff --git a/net/proxy/proxy_config_service_mac.cc b/net/proxy/proxy_config_service_mac.cc index 013fb12..7b5e797 100644 --- a/net/proxy/proxy_config_service_mac.cc +++ b/net/proxy/proxy_config_service_mac.cc @@ -205,7 +205,7 @@ ProxyConfigServiceMac::ProxyConfigServiceMac( has_fetched_config_(false), helper_(new Helper(this)), io_thread_task_runner_(io_thread_task_runner) { - DCHECK(io_thread_task_runner_); + DCHECK(io_thread_task_runner_.get()); config_watcher_.reset(new NetworkConfigWatcherMac(&forwarder_)); } diff --git a/net/socket/ssl_client_socket_nss.cc b/net/socket/ssl_client_socket_nss.cc index 54758e2..c5b9089 100644 --- a/net/socket/ssl_client_socket_nss.cc +++ b/net/socket/ssl_client_socket_nss.cc @@ -1403,7 +1403,7 @@ SECStatus SSLClientSocketNSS::Core::PlatformClientAuthHandler( return SECWouldBlock; #elif defined(OS_MACOSX) if (core->ssl_config_.send_client_cert) { - if (core->ssl_config_.client_cert) { + if (core->ssl_config_.client_cert.get()) { OSStatus os_error = noErr; SecIdentityRef identity = NULL; SecKeyRef private_key = NULL; diff --git a/net/ssl/client_cert_store_impl_mac.cc b/net/ssl/client_cert_store_impl_mac.cc index ecc707e..5fa42de 100644 --- a/net/ssl/client_cert_store_impl_mac.cc +++ b/net/ssl/client_cert_store_impl_mac.cc @@ -83,7 +83,7 @@ OSStatus CopyCertChain(SecCertificateRef cert_handle, bool IsIssuedByInKeychain(const std::vector<std::string>& valid_issuers, scoped_refptr<X509Certificate>* cert) { DCHECK(cert); - DCHECK(*cert); + DCHECK(cert->get()); X509Certificate::OSCertHandle cert_handle = (*cert)->os_cert_handle(); CFArrayRef cert_chain = NULL; @@ -128,7 +128,7 @@ bool GetClientCertsImpl(const scoped_refptr<X509Certificate>& preferred_cert, bool query_keychain, CertificateList* selected_certs) { CertificateList preliminary_list; - if (preferred_cert) + if (preferred_cert.get()) preliminary_list.push_back(preferred_cert); preliminary_list.insert(preliminary_list.end(), regular_certs.begin(), regular_certs.end()); @@ -162,9 +162,8 @@ bool GetClientCertsImpl(const scoped_refptr<X509Certificate>& preferred_cert, // sorting. CertificateList::iterator sort_begin = selected_certs->begin(); CertificateList::iterator sort_end = selected_certs->end(); - if (preferred_cert && - sort_begin != sort_end && - *sort_begin == preferred_cert) { + if (preferred_cert.get() && sort_begin != sort_end && + sort_begin->get() == preferred_cert.get()) { ++sort_begin; } sort(sort_begin, sort_end, x509_util::ClientCertSorter()); @@ -231,7 +230,7 @@ bool ClientCertStoreImpl::GetClientCerts(const SSLCertRequestInfo& request, if (preferred_identity && CFEqual(preferred_identity, identity)) { // Only one certificate should match. - DCHECK(!preferred_cert); + DCHECK(!preferred_cert.get()); preferred_cert = cert; } else { regular_certs.push_back(cert); diff --git a/net/ssl/client_cert_store_impl_unittest.cc b/net/ssl/client_cert_store_impl_unittest.cc index 7b05ef2..500e156 100644 --- a/net/ssl/client_cert_store_impl_unittest.cc +++ b/net/ssl/client_cert_store_impl_unittest.cc @@ -124,7 +124,7 @@ TEST_F(ClientCertStoreImplTest, CertAuthorityFiltering) { TEST_F(ClientCertStoreImplTest, FilterOutThePreferredCert) { scoped_refptr<X509Certificate> cert_1( ImportCertFromFile(GetTestCertsDirectory(), "client_1.pem")); - ASSERT_TRUE(cert_1); + ASSERT_TRUE(cert_1.get()); std::vector<std::string> authority_2( 1, std::string(reinterpret_cast<const char*>(kAuthority2DN), @@ -136,8 +136,8 @@ TEST_F(ClientCertStoreImplTest, FilterOutThePreferredCert) { request->cert_authorities = authority_2; std::vector<scoped_refptr<X509Certificate> > selected_certs; - bool rv = - SelectClientCertsGivenPreferred(cert_1, certs, *request, &selected_certs); + bool rv = SelectClientCertsGivenPreferred( + cert_1, certs, *request.get(), &selected_certs); EXPECT_TRUE(rv); EXPECT_EQ(0u, selected_certs.size()); } @@ -147,22 +147,22 @@ TEST_F(ClientCertStoreImplTest, FilterOutThePreferredCert) { TEST_F(ClientCertStoreImplTest, PreferredCertGoesFirst) { scoped_refptr<X509Certificate> cert_1( ImportCertFromFile(GetTestCertsDirectory(), "client_1.pem")); - ASSERT_TRUE(cert_1); + ASSERT_TRUE(cert_1.get()); scoped_refptr<X509Certificate> cert_2( ImportCertFromFile(GetTestCertsDirectory(), "client_2.pem")); - ASSERT_TRUE(cert_2); + ASSERT_TRUE(cert_2.get()); std::vector<scoped_refptr<X509Certificate> > certs; certs.push_back(cert_2); scoped_refptr<SSLCertRequestInfo> request(new SSLCertRequestInfo()); std::vector<scoped_refptr<X509Certificate> > selected_certs; - bool rv = - SelectClientCertsGivenPreferred(cert_1, certs, *request, &selected_certs); + bool rv = SelectClientCertsGivenPreferred( + cert_1, certs, *request.get(), &selected_certs); EXPECT_TRUE(rv); ASSERT_EQ(2u, selected_certs.size()); - EXPECT_TRUE(selected_certs[0]->Equals(cert_1)); - EXPECT_TRUE(selected_certs[1]->Equals(cert_2)); + EXPECT_TRUE(selected_certs[0]->Equals(cert_1.get())); + EXPECT_TRUE(selected_certs[1]->Equals(cert_2.get())); } #endif diff --git a/net/url_request/url_request_context_builder.cc b/net/url_request/url_request_context_builder.cc index ee35572..39680f8 100644 --- a/net/url_request/url_request_context_builder.cc +++ b/net/url_request/url_request_context_builder.cc @@ -223,7 +223,7 @@ URLRequestContext* URLRequestContextBuilder::Build() { #else ProxyConfigService* proxy_config_service = ProxyService::CreateSystemProxyConfigService( - base::ThreadTaskRunnerHandle::Get(), + base::ThreadTaskRunnerHandle::Get().get(), context->file_message_loop()); #endif // defined(OS_LINUX) || defined(OS_ANDROID) storage->set_proxy_service( diff --git a/webkit/browser/fileapi/file_system_task_runners.cc b/webkit/browser/fileapi/file_system_task_runners.cc index 19d81c5..5543fb8 100644 --- a/webkit/browser/fileapi/file_system_task_runners.cc +++ b/webkit/browser/fileapi/file_system_task_runners.cc @@ -19,9 +19,9 @@ FileSystemTaskRunners::FileSystemTaskRunners( // static scoped_ptr<FileSystemTaskRunners> FileSystemTaskRunners::CreateMockTaskRunners() { - return make_scoped_ptr(new FileSystemTaskRunners( - base::MessageLoopProxy::current(), - base::MessageLoopProxy::current())); + return make_scoped_ptr( + new FileSystemTaskRunners(base::MessageLoopProxy::current().get(), + base::MessageLoopProxy::current().get())); } FileSystemTaskRunners::~FileSystemTaskRunners() { diff --git a/webkit/browser/fileapi/obfuscated_file_util_unittest.cc b/webkit/browser/fileapi/obfuscated_file_util_unittest.cc index 46ea96e..22adfd5 100644 --- a/webkit/browser/fileapi/obfuscated_file_util_unittest.cc +++ b/webkit/browser/fileapi/obfuscated_file_util_unittest.cc @@ -2260,7 +2260,7 @@ TEST_F(ObfuscatedFileUtilTest, TestQuotaOnOpen) { TEST_F(ObfuscatedFileUtilTest, MaybeDropDatabasesAliveCase) { ObfuscatedFileUtil file_util(NULL, data_dir_path(), - base::MessageLoopProxy::current()); + base::MessageLoopProxy::current().get()); file_util.InitOriginDatabase(true /*create*/); ASSERT_TRUE(file_util.origin_database_ != NULL); @@ -2278,7 +2278,7 @@ TEST_F(ObfuscatedFileUtilTest, MaybeDropDatabasesAlreadyDeletedCase) { { ObfuscatedFileUtil file_util(NULL, data_dir_path(), - base::MessageLoopProxy::current()); + base::MessageLoopProxy::current().get()); file_util.InitOriginDatabase(true /*create*/); file_util.db_flush_delay_seconds_ = 0; file_util.MarkUsed(); diff --git a/webkit/plugins/npapi/plugin_host.cc b/webkit/plugins/npapi/plugin_host.cc index cfa8f04..96491c3 100644 --- a/webkit/plugins/npapi/plugin_host.cc +++ b/webkit/plugins/npapi/plugin_host.cc @@ -773,7 +773,7 @@ NPError NPN_GetValue(NPP id, NPNVariable variable, void* value) { case NPNVpluginDrawingModel: { // return the drawing model that was negotiated when we initialized. scoped_refptr<PluginInstance> plugin(FindInstance(id)); - if (!plugin) { + if (!plugin.get()) { NOTREACHED(); return NPERR_INVALID_INSTANCE_ERROR; } diff --git a/webkit/plugins/npapi/webplugin_impl.cc b/webkit/plugins/npapi/webplugin_impl.cc index 63413f4..c57e13c 100644 --- a/webkit/plugins/npapi/webplugin_impl.cc +++ b/webkit/plugins/npapi/webplugin_impl.cc @@ -804,7 +804,7 @@ void WebPluginImpl::AcceleratedPluginSwappedIOSurface() { // through. More investigation is needed. http://crbug.com/105346 if (next_io_surface_allocated_) { if (next_io_surface_id_) { - if (!io_surface_layer_) { + if (!io_surface_layer_.get()) { io_surface_layer_ = cc::IOSurfaceLayer::Create(); web_layer_.reset(new webkit::WebLayerImpl(io_surface_layer_)); container_->setWebLayer(web_layer_.get()); @@ -819,7 +819,7 @@ void WebPluginImpl::AcceleratedPluginSwappedIOSurface() { } next_io_surface_allocated_ = false; } else { - if (io_surface_layer_) + if (io_surface_layer_.get()) io_surface_layer_->SetNeedsDisplay(); } } |