diff options
author | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-29 20:32:22 +0000 |
---|---|---|
committer | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-29 20:32:22 +0000 |
commit | b6413b49b4a1bf216bbc70cc330e905c42db5c5b (patch) | |
tree | 1ea76480a59217bd06dadcb071dad2d8150a6518 /chrome/browser/renderer_host | |
parent | a6c642112b067d998e699e09302d8c48649b108f (diff) | |
download | chromium_src-b6413b49b4a1bf216bbc70cc330e905c42db5c5b.zip chromium_src-b6413b49b4a1bf216bbc70cc330e905c42db5c5b.tar.gz chromium_src-b6413b49b4a1bf216bbc70cc330e905c42db5c5b.tar.bz2 |
shared_memory: remove wstrings, fix callers.
BUG=23581
TEST=compiles
Review URL: http://codereview.chromium.org/3555002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@60985 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/renderer_host')
5 files changed, 5 insertions, 5 deletions
diff --git a/chrome/browser/renderer_host/async_resource_handler.cc b/chrome/browser/renderer_host/async_resource_handler.cc index 803b91b..f9517a2 100644 --- a/chrome/browser/renderer_host/async_resource_handler.cc +++ b/chrome/browser/renderer_host/async_resource_handler.cc @@ -46,7 +46,7 @@ class SharedIOBuffer : public net::IOBuffer { buffer_size_(buffer_size) {} bool Init() { - if (shared_memory_.Create(std::wstring(), false, false, buffer_size_) && + if (shared_memory_.Create(std::string(), false, false, buffer_size_) && shared_memory_.Map(buffer_size_)) { data_ = reinterpret_cast<char*>(shared_memory_.memory()); DCHECK(data_); diff --git a/chrome/browser/renderer_host/audio_renderer_host.cc b/chrome/browser/renderer_host/audio_renderer_host.cc index 13ca7aa..96b4999 100644 --- a/chrome/browser/renderer_host/audio_renderer_host.cc +++ b/chrome/browser/renderer_host/audio_renderer_host.cc @@ -331,7 +331,7 @@ void AudioRendererHost::OnCreateStream( scoped_ptr<AudioEntry> entry(new AudioEntry()); // Create the shared memory and share with the renderer process. - if (!entry->shared_memory.Create(L"", false, false, hardware_packet_size) || + if (!entry->shared_memory.Create("", false, false, hardware_packet_size) || !entry->shared_memory.Map(entry->shared_memory.max_size())) { // If creation of shared memory failed then send an error message. SendErrorMessage(msg.routing_id(), stream_id); diff --git a/chrome/browser/renderer_host/render_sandbox_host_linux.cc b/chrome/browser/renderer_host/render_sandbox_host_linux.cc index bcd63d8..5292d95 100644 --- a/chrome/browser/renderer_host/render_sandbox_host_linux.cc +++ b/chrome/browser/renderer_host/render_sandbox_host_linux.cc @@ -360,7 +360,7 @@ class SandboxIPCProcess { return; int shm_fd = -1; base::SharedMemory shm; - if (shm.Create(L"", false, false, shm_size)) + if (shm.Create("", false, false, shm_size)) shm_fd = shm.handle().fd; Pickle reply; SendRendererReply(fds, reply, shm_fd); diff --git a/chrome/browser/renderer_host/render_widget_helper.cc b/chrome/browser/renderer_host/render_widget_helper.cc index 718a723..286fa42 100644 --- a/chrome/browser/renderer_host/render_widget_helper.cc +++ b/chrome/browser/renderer_host/render_widget_helper.cc @@ -290,7 +290,7 @@ TransportDIB* RenderWidgetHelper::MapTransportDIB(TransportDIB::Id dib_id) { void RenderWidgetHelper::AllocTransportDIB( size_t size, bool cache_in_browser, TransportDIB::Handle* result) { scoped_ptr<base::SharedMemory> shared_memory(new base::SharedMemory()); - if (!shared_memory->Create(L"", false /* read write */, + if (!shared_memory->Create("", false /* read write */, false /* do not open existing */, size)) { result->fd = -1; result->auto_close = false; diff --git a/chrome/browser/renderer_host/resource_message_filter.cc b/chrome/browser/renderer_host/resource_message_filter.cc index 21264f2..1bfe307 100644 --- a/chrome/browser/renderer_host/resource_message_filter.cc +++ b/chrome/browser/renderer_host/resource_message_filter.cc @@ -1035,7 +1035,7 @@ void ResourceMessageFilter::OnAllocateSharedMemoryBuffer( uint32 buffer_size, base::SharedMemoryHandle* handle) { base::SharedMemory shared_buf; - shared_buf.Create(L"", false, false, buffer_size); + shared_buf.Create("", false, false, buffer_size); if (!shared_buf.Map(buffer_size)) { *handle = base::SharedMemory::NULLHandle(); NOTREACHED() << "Cannot map shared memory buffer"; |