summaryrefslogtreecommitdiffstats
path: root/content
diff options
context:
space:
mode:
authorscottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-02-26 20:07:33 +0000
committerscottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-02-26 20:07:33 +0000
commit5fbbea663fc24e43833c007eabc6719df3bf5278 (patch)
treecb4db8daaec3b0538682e93acab3c16b2b29e4ea /content
parent7e113153950a5da7fc622bdad78573a10603839a (diff)
downloadchromium_src-5fbbea663fc24e43833c007eabc6719df3bf5278.zip
chromium_src-5fbbea663fc24e43833c007eabc6719df3bf5278.tar.gz
chromium_src-5fbbea663fc24e43833c007eabc6719df3bf5278.tar.bz2
Less determined statement termination
No intended behaviour change. TBR=owners BUG=none Review URL: https://codereview.chromium.org/180873004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@253570 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
-rw-r--r--content/browser/renderer_host/media/audio_renderer_host.cc2
-rw-r--r--content/browser/renderer_host/media/video_capture_controller_unittest.cc2
-rw-r--r--content/browser/renderer_host/render_process_host_impl.cc2
-rw-r--r--content/common/gpu/media/vaapi_h264_decoder.cc2
4 files changed, 4 insertions, 4 deletions
diff --git a/content/browser/renderer_host/media/audio_renderer_host.cc b/content/browser/renderer_host/media/audio_renderer_host.cc
index af87aa5..01eef90 100644
--- a/content/browser/renderer_host/media/audio_renderer_host.cc
+++ b/content/browser/renderer_host/media/audio_renderer_host.cc
@@ -329,7 +329,7 @@ void AudioRendererHost::OnCreateStream(
// Create the shared memory and share with the renderer process.
// For synchronized I/O (if input_channels > 0) then we allocate
// extra memory after the output data for the input data.
- uint32 shared_memory_size = AudioBus::CalculateMemorySize(params);;
+ uint32 shared_memory_size = AudioBus::CalculateMemorySize(params);
scoped_ptr<base::SharedMemory> shared_memory(new base::SharedMemory());
if (!shared_memory->CreateAndMapAnonymous(shared_memory_size)) {
SendErrorMessage(stream_id);
diff --git a/content/browser/renderer_host/media/video_capture_controller_unittest.cc b/content/browser/renderer_host/media/video_capture_controller_unittest.cc
index b4de263..3c5eb18 100644
--- a/content/browser/renderer_host/media/video_capture_controller_unittest.cc
+++ b/content/browser/renderer_host/media/video_capture_controller_unittest.cc
@@ -138,7 +138,7 @@ TEST_F(VideoCaptureControllerTest, AddAndRemoveClients) {
session_100);
// Clients in controller: [A/1]
ASSERT_EQ(1, controller_->GetClientCount())
- << "Adding client A/1 should bump client count.";;
+ << "Adding client A/1 should bump client count.";
controller_->AddClient(client_a_route_2,
client_a_.get(),
base::kNullProcessHandle,
diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc
index e1d92c6..046ff75 100644
--- a/content/browser/renderer_host/render_process_host_impl.cc
+++ b/content/browser/renderer_host/render_process_host_impl.cc
@@ -591,7 +591,7 @@ bool RenderProcessHostImpl::Init() {
void RenderProcessHostImpl::CreateMessageFilters() {
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
AddFilter(new ResourceSchedulerFilter(GetID()));
- MediaInternals* media_internals = MediaInternals::GetInstance();;
+ MediaInternals* media_internals = MediaInternals::GetInstance();
media::AudioManager* audio_manager =
BrowserMainLoop::GetInstance()->audio_manager();
// Add BrowserPluginMessageFilter to ensure it gets the first stab at messages
diff --git a/content/common/gpu/media/vaapi_h264_decoder.cc b/content/common/gpu/media/vaapi_h264_decoder.cc
index 768a023..5f062370 100644
--- a/content/common/gpu/media/vaapi_h264_decoder.cc
+++ b/content/common/gpu/media/vaapi_h264_decoder.cc
@@ -1633,7 +1633,7 @@ VaapiH264Decoder::DecResult VaapiH264Decoder::Decode() {
}
default:
- DVLOG(4) << "Skipping NALU type: " << nalu.nal_unit_type;;
+ DVLOG(4) << "Skipping NALU type: " << nalu.nal_unit_type;
break;
}
}