diff options
author | thestig <thestig@chromium.org> | 2016-01-04 12:35:03 -0800 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2016-01-04 20:35:47 +0000 |
commit | 8d34e46c9a294b4d9a5f74e97d9e6536d34555c2 (patch) | |
tree | 01f00566b53cd84f04339c75bd0290deb40529a1 | |
parent | 75e2fba8610567c6b903ecd929707660570d3197 (diff) | |
download | chromium_src-8d34e46c9a294b4d9a5f74e97d9e6536d34555c2.zip chromium_src-8d34e46c9a294b4d9a5f74e97d9e6536d34555c2.tar.gz chromium_src-8d34e46c9a294b4d9a5f74e97d9e6536d34555c2.tar.bz2 |
Cleanup: Remove double semicolons.
Found with: git grep -l ';;$' | egrep '\.(cc|h)$' | grep -v third_party
Review URL: https://codereview.chromium.org/1558633002
Cr-Commit-Position: refs/heads/master@{#367361}
25 files changed, 63 insertions, 61 deletions
diff --git a/base/metrics/statistics_recorder_unittest.cc b/base/metrics/statistics_recorder_unittest.cc index f14d713..af5c1e7 100644 --- a/base/metrics/statistics_recorder_unittest.cc +++ b/base/metrics/statistics_recorder_unittest.cc @@ -74,7 +74,7 @@ TEST_F(StatisticsRecorderTest, NotInitialized) { DeleteHistogram(histogram); // RegisterOrDeleteDuplicateRanges is a no-op. - BucketRanges* ranges = new BucketRanges(3);; + BucketRanges* ranges = new BucketRanges(3); ranges->ResetChecksum(); EXPECT_EQ(ranges, StatisticsRecorder::RegisterOrDeleteDuplicateRanges(ranges)); @@ -85,9 +85,9 @@ TEST_F(StatisticsRecorderTest, NotInitialized) { TEST_F(StatisticsRecorderTest, RegisterBucketRanges) { std::vector<const BucketRanges*> registered_ranges; - BucketRanges* ranges1 = new BucketRanges(3);; + BucketRanges* ranges1 = new BucketRanges(3); ranges1->ResetChecksum(); - BucketRanges* ranges2 = new BucketRanges(4);; + BucketRanges* ranges2 = new BucketRanges(4); ranges2->ResetChecksum(); // Register new ranges. @@ -111,7 +111,7 @@ TEST_F(StatisticsRecorderTest, RegisterBucketRanges) { EXPECT_EQ(0, ranges1->range(2)); // Register ranges with same values. - BucketRanges* ranges3 = new BucketRanges(3);; + BucketRanges* ranges3 = new BucketRanges(3); ranges3->ResetChecksum(); EXPECT_EQ(ranges1, // returning ranges1 StatisticsRecorder::RegisterOrDeleteDuplicateRanges(ranges3)); diff --git a/base/process/launch_win.cc b/base/process/launch_win.cc index 54b0667..612b77e 100644 --- a/base/process/launch_win.cc +++ b/base/process/launch_win.cc @@ -300,7 +300,7 @@ Process LaunchProcess(const string16& cmdline, DestroyEnvironmentBlock(enviroment_block); if (!launched) { DPLOG(ERROR) << "Command line:" << std::endl << UTF16ToUTF8(cmdline) - << std::endl;; + << std::endl; return Process(); } } else { @@ -309,7 +309,7 @@ Process LaunchProcess(const string16& cmdline, inherit_handles, flags, NULL, NULL, startup_info, &temp_process_info)) { DPLOG(ERROR) << "Command line:" << std::endl << UTF16ToUTF8(cmdline) - << std::endl;; + << std::endl; return Process(); } } diff --git a/cc/layers/ui_resource_layer_impl_unittest.cc b/cc/layers/ui_resource_layer_impl_unittest.cc index 18759a6..9241945 100644 --- a/cc/layers/ui_resource_layer_impl_unittest.cc +++ b/cc/layers/ui_resource_layer_impl_unittest.cc @@ -70,7 +70,7 @@ TEST(UIResourceLayerImplTest, VerifyDrawQuads) { // Make sure we're appending quads when there are valid values. gfx::Size bitmap_size(100, 100); - gfx::Size layer_size(100, 100);; + gfx::Size layer_size(100, 100); size_t expected_quad_size = 1; bool opaque = true; UIResourceId uid = 1; @@ -117,7 +117,7 @@ TEST(UIResourceLayerImplTest, VerifySetOpaqueOnSkBitmap) { host_impl.InitializeRenderer(output_surface.get()); gfx::Size bitmap_size(100, 100); - gfx::Size layer_size(100, 100);; + gfx::Size layer_size(100, 100); bool opaque = false; UIResourceId uid = 1; scoped_ptr<UIResourceLayerImpl> layer = GenerateUIResourceLayer(&host_impl, diff --git a/chrome/browser/extensions/api/passwords_private/passwords_private_apitest.cc b/chrome/browser/extensions/api/passwords_private/passwords_private_apitest.cc index 125a099..3c49342 100644 --- a/chrome/browser/extensions/api/passwords_private/passwords_private_apitest.cc +++ b/chrome/browser/extensions/api/passwords_private/passwords_private_apitest.cc @@ -57,7 +57,7 @@ class TestDelegate : public PasswordsPrivateDelegate { TestDelegate() : observers_(new base::ObserverListThreadSafe<Observer>()) { // Create mock data. for (size_t i = 0; i < kNumMocks; i++) { - current_entries_.push_back(CreateEntry(i));; + current_entries_.push_back(CreateEntry(i)); current_exceptions_.push_back(CreateException(i)); } } diff --git a/chrome/browser/sync_file_system/drive_backend/sync_task_manager.h b/chrome/browser/sync_file_system/drive_backend/sync_task_manager.h index 688c3d9..3388d75 100644 --- a/chrome/browser/sync_file_system/drive_backend/sync_task_manager.h +++ b/chrome/browser/sync_file_system/drive_backend/sync_task_manager.h @@ -206,7 +206,7 @@ class SyncTaskManager { scoped_refptr<base::SequencedWorkerPool> worker_pool_; base::SequenceChecker sequence_checker_; - base::WeakPtrFactory<SyncTaskManager> weak_ptr_factory_;; + base::WeakPtrFactory<SyncTaskManager> weak_ptr_factory_; DISALLOW_COPY_AND_ASSIGN(SyncTaskManager); }; diff --git a/cloud_print/service/win/chrome_launcher.cc b/cloud_print/service/win/chrome_launcher.cc index 8966a20..5c9013a 100644 --- a/cloud_print/service/win/chrome_launcher.cc +++ b/cloud_print/service/win/chrome_launcher.cc @@ -13,7 +13,6 @@ #include "base/json/json_reader.h" #include "base/json/json_writer.h" #include "base/process/process.h" -#include "base/process/process.h" #include "base/values.h" #include "base/win/registry.h" #include "base/win/scoped_handle.h" @@ -201,8 +200,8 @@ void ChromeLauncher::Run() { const base::TimeDelta default_time_out = base::TimeDelta::FromSeconds(1); const base::TimeDelta max_time_out = base::TimeDelta::FromHours(1); - for (base::TimeDelta time_out = default_time_out;; - time_out = std::min(time_out * 2, max_time_out)) { + base::TimeDelta time_out = default_time_out; + while (1) { base::FilePath chrome_path = chrome_launcher_support::GetAnyChromePath(false /* is_sxs */); @@ -254,6 +253,8 @@ void ChromeLauncher::Run() { } if (stop_event_.TimedWait(time_out)) break; + + time_out = std::min(time_out * 2, max_time_out); } } diff --git a/components/gcm_driver/instance_id/instance_id_driver_unittest.cc b/components/gcm_driver/instance_id/instance_id_driver_unittest.cc index 4f70037..8997296 100644 --- a/components/gcm_driver/instance_id/instance_id_driver_unittest.cc +++ b/components/gcm_driver/instance_id/instance_id_driver_unittest.cc @@ -143,7 +143,7 @@ base::Time InstanceIDDriverTest::GetCreationTime(InstanceID* instance_id) { InstanceID::Result InstanceIDDriverTest::DeleteID(InstanceID* instance_id) { async_operation_completed_ = false; - result_ = InstanceID::UNKNOWN_ERROR;; + result_ = InstanceID::UNKNOWN_ERROR; instance_id->DeleteID(base::Bind(&InstanceIDDriverTest::DeleteIDCompleted, base::Unretained(this))); WaitForAsyncOperation(); @@ -157,7 +157,7 @@ std::string InstanceIDDriverTest::GetToken( const std::map<std::string, std::string>& options) { async_operation_completed_ = false; token_.clear(); - result_ = InstanceID::UNKNOWN_ERROR;; + result_ = InstanceID::UNKNOWN_ERROR; instance_id->GetToken( authorized_entity, scope, @@ -173,7 +173,7 @@ InstanceID::Result InstanceIDDriverTest::DeleteToken( const std::string& authorized_entity, const std::string& scope) { async_operation_completed_ = false; - result_ = InstanceID::UNKNOWN_ERROR;; + result_ = InstanceID::UNKNOWN_ERROR; instance_id->DeleteToken( authorized_entity, scope, @@ -209,7 +209,7 @@ void InstanceIDDriverTest::DeleteIDCompleted(InstanceID::Result result) { } void InstanceIDDriverTest::GetTokenCompleted( - const std::string& token, InstanceID::Result result){ + const std::string& token, InstanceID::Result result) { DCHECK(!async_operation_completed_); async_operation_completed_ = true; token_ = token; @@ -357,4 +357,4 @@ TEST_F(InstanceIDDriverTest, DeleteToken) { GetToken(instance_id, kAuthorizedEntity2, kScope1, options)); } -} // instance_id +} // namespace instance_id diff --git a/components/sync_driver/model_association_manager.cc b/components/sync_driver/model_association_manager.cc index b31f4ab..d7522980 100644 --- a/components/sync_driver/model_association_manager.cc +++ b/components/sync_driver/model_association_manager.cc @@ -364,7 +364,7 @@ void ModelAssociationManager::TypeStartCallback( base::TimeDelta association_wait_time = std::max(base::TimeDelta(), type_start_time - association_start_time_); base::TimeDelta association_time = - base::TimeTicks::Now() - type_start_time;; + base::TimeTicks::Now() - type_start_time; syncer::DataTypeAssociationStats stats = BuildAssociationStatsFromMergeResults(local_merge_result, syncer_merge_result, diff --git a/components/variations/study_filtering_unittest.cc b/components/variations/study_filtering_unittest.cc index 6d4c18f..0715432 100644 --- a/components/variations/study_filtering_unittest.cc +++ b/components/variations/study_filtering_unittest.cc @@ -120,7 +120,7 @@ TEST(VariationsStudyFilteringTest, CheckStudyFormFactor) { } if (i < arraysize(form_factors)) { - const int index = arraysize(form_factors) - i - 1;; + const int index = arraysize(form_factors) - i - 1; filter.add_form_factor(form_factors[index]); form_factor_added[index] = true; } diff --git a/content/browser/accessibility/browser_accessibility_win_unittest.cc b/content/browser/accessibility/browser_accessibility_win_unittest.cc index 4b0bb62..f8d5347 100644 --- a/content/browser/accessibility/browser_accessibility_win_unittest.cc +++ b/content/browser/accessibility/browser_accessibility_win_unittest.cc @@ -1082,11 +1082,11 @@ TEST_F(BrowserAccessibilityTest, TestCaretAndSelectionInSimpleFields) { LONG selection_end = -2; // Test get_caretOffset. - HRESULT hr = combo_box_accessible->get_caretOffset(&caret_offset);; + HRESULT hr = combo_box_accessible->get_caretOffset(&caret_offset); EXPECT_EQ(S_OK, hr); EXPECT_EQ(1L, caret_offset); // The caret should be at the end of the selection. - hr = text_field_accessible->get_caretOffset(&caret_offset);; + hr = text_field_accessible->get_caretOffset(&caret_offset); EXPECT_EQ(S_OK, hr); EXPECT_EQ(2L, caret_offset); @@ -1098,27 +1098,27 @@ TEST_F(BrowserAccessibilityTest, TestCaretAndSelectionInSimpleFields) { manager->GetFocus(root_accessible)->ToBrowserAccessibilityWin()); // The caret should not have moved. - hr = text_field_accessible->get_caretOffset(&caret_offset);; + hr = text_field_accessible->get_caretOffset(&caret_offset); EXPECT_EQ(S_OK, hr); EXPECT_EQ(2L, caret_offset); // Test get_nSelections. - hr = combo_box_accessible->get_nSelections(&n_selections);; + hr = combo_box_accessible->get_nSelections(&n_selections); EXPECT_EQ(S_OK, hr); EXPECT_EQ(0L, n_selections); - hr = text_field_accessible->get_nSelections(&n_selections);; + hr = text_field_accessible->get_nSelections(&n_selections); EXPECT_EQ(S_OK, hr); EXPECT_EQ(1L, n_selections); // Test get_selection. hr = combo_box_accessible->get_selection( - 0L /* selection_index */, &selection_start, &selection_end);; + 0L /* selection_index */, &selection_start, &selection_end); EXPECT_EQ(E_INVALIDARG, hr); // No selections available. // Invalid in_args should not modify out_args. EXPECT_EQ(-2L, selection_start); EXPECT_EQ(-2L, selection_end); hr = text_field_accessible->get_selection( - 0L /* selection_index */, &selection_start, &selection_end);; + 0L /* selection_index */, &selection_start, &selection_end); EXPECT_EQ(S_OK, hr); EXPECT_EQ(1L, selection_start); EXPECT_EQ(2L, selection_end); @@ -1228,7 +1228,7 @@ TEST_F(BrowserAccessibilityTest, TestCaretInContentEditables) { hr = div_editable_accessible->get_nSelections(&n_selections); EXPECT_EQ(S_OK, hr); EXPECT_EQ(0L, n_selections); - hr = div_editable_accessible->get_caretOffset(&caret_offset);; + hr = div_editable_accessible->get_caretOffset(&caret_offset); EXPECT_EQ(S_OK, hr); EXPECT_EQ(6L, caret_offset); @@ -1239,10 +1239,10 @@ TEST_F(BrowserAccessibilityTest, TestCaretInContentEditables) { EXPECT_EQ(S_OK, hr); EXPECT_EQ(0L, n_selections); - hr = link_accessible->get_caretOffset(&caret_offset);; + hr = link_accessible->get_caretOffset(&caret_offset); EXPECT_EQ(S_OK, hr); EXPECT_EQ(1L, caret_offset); - hr = link_text_accessible->get_caretOffset(&caret_offset);; + hr = link_text_accessible->get_caretOffset(&caret_offset); EXPECT_EQ(S_OK, hr); EXPECT_EQ(1L, caret_offset); @@ -1330,46 +1330,46 @@ TEST_F(BrowserAccessibilityTest, TestSelectionInContentEditables) { ASSERT_NE(nullptr, link_text_accessible); // get_nSelections should work on all objects. - HRESULT hr = div_editable_accessible->get_nSelections(&n_selections);; + HRESULT hr = div_editable_accessible->get_nSelections(&n_selections); EXPECT_EQ(S_OK, hr); EXPECT_EQ(1L, n_selections); - hr = text_accessible->get_nSelections(&n_selections);; + hr = text_accessible->get_nSelections(&n_selections); EXPECT_EQ(S_OK, hr); EXPECT_EQ(1L, n_selections); - hr = link_accessible->get_nSelections(&n_selections);; + hr = link_accessible->get_nSelections(&n_selections); EXPECT_EQ(S_OK, hr); EXPECT_EQ(1L, n_selections); - hr = link_text_accessible->get_nSelections(&n_selections);; + hr = link_text_accessible->get_nSelections(&n_selections); EXPECT_EQ(S_OK, hr); EXPECT_EQ(1L, n_selections); // get_selection should be unaffected by focus placement. hr = div_editable_accessible->get_selection( - 0L /* selection_index */, &selection_start, &selection_end);; + 0L /* selection_index */, &selection_start, &selection_end); EXPECT_EQ(S_OK, hr); EXPECT_EQ(1L, selection_start); // selection_end should be after embedded object character. EXPECT_EQ(7L, selection_end); hr = text_accessible->get_selection( - 0L /* selection_index */, &selection_start, &selection_end);; + 0L /* selection_index */, &selection_start, &selection_end); EXPECT_EQ(S_OK, hr); EXPECT_EQ(1L, selection_start); // No embedded character on this object, only the first part of the text. EXPECT_EQ(6L, selection_end); hr = link_accessible->get_selection( - 0L /* selection_index */, &selection_start, &selection_end);; + 0L /* selection_index */, &selection_start, &selection_end); EXPECT_EQ(S_OK, hr); EXPECT_EQ(0L, selection_start); EXPECT_EQ(4L, selection_end); hr = link_text_accessible->get_selection( - 0L /* selection_index */, &selection_start, &selection_end);; + 0L /* selection_index */, &selection_start, &selection_end); EXPECT_EQ(S_OK, hr); EXPECT_EQ(0L, selection_start); EXPECT_EQ(4L, selection_end); // The caret should be at the focus (the end) of the selection. - hr = div_editable_accessible->get_caretOffset(&caret_offset);; + hr = div_editable_accessible->get_caretOffset(&caret_offset); EXPECT_EQ(S_OK, hr); EXPECT_EQ(7L, caret_offset); @@ -1380,21 +1380,21 @@ TEST_F(BrowserAccessibilityTest, TestSelectionInContentEditables) { manager->GetFocus(root_accessible)->ToBrowserAccessibilityWin()); // The caret should not have moved. - hr = div_editable_accessible->get_caretOffset(&caret_offset);; + hr = div_editable_accessible->get_caretOffset(&caret_offset); EXPECT_EQ(S_OK, hr); EXPECT_EQ(7L, caret_offset); // The caret offset should reflect the position of the selection's focus in // any given object. - hr = link_accessible->get_caretOffset(&caret_offset);; + hr = link_accessible->get_caretOffset(&caret_offset); EXPECT_EQ(S_OK, hr); EXPECT_EQ(4L, caret_offset); - hr = link_text_accessible->get_caretOffset(&caret_offset);; + hr = link_text_accessible->get_caretOffset(&caret_offset); EXPECT_EQ(S_OK, hr); EXPECT_EQ(4L, caret_offset); hr = div_editable_accessible->get_selection( - 0L /* selection_index */, &selection_start, &selection_end);; + 0L /* selection_index */, &selection_start, &selection_end); EXPECT_EQ(S_OK, hr); EXPECT_EQ(1L, selection_start); EXPECT_EQ(7L, selection_end); diff --git a/content/browser/geolocation/mock_location_arbitrator.cc b/content/browser/geolocation/mock_location_arbitrator.cc index f48915e..154fcae 100644 --- a/content/browser/geolocation/mock_location_arbitrator.cc +++ b/content/browser/geolocation/mock_location_arbitrator.cc @@ -15,7 +15,7 @@ MockLocationArbitrator::MockLocationArbitrator() } void MockLocationArbitrator::StartProviders(bool use_high_accuracy) { - providers_started_ = true;; + providers_started_ = true; } void MockLocationArbitrator::StopProviders() { diff --git a/content/browser/loader/async_resource_handler_browsertest.cc b/content/browser/loader/async_resource_handler_browsertest.cc index 8cee365..456c31a 100644 --- a/content/browser/loader/async_resource_handler_browsertest.cc +++ b/content/browser/loader/async_resource_handler_browsertest.cc @@ -49,10 +49,10 @@ scoped_ptr<net::test_server::HttpResponse> HandlePostAndRedirectURLs( base::CompareCase::SENSITIVE)) { http_response->set_code(net::HTTP_TEMPORARY_REDIRECT); http_response->AddCustomHeader("Location", kPostPath); - EXPECT_EQ(request.content.length(), kPayloadSize);; + EXPECT_EQ(request.content.length(), kPayloadSize); return std::move(http_response); - } else if(base::StartsWith(request.relative_url, kPostPath, - base::CompareCase::SENSITIVE)) { + } else if (base::StartsWith(request.relative_url, kPostPath, + base::CompareCase::SENSITIVE)) { http_response->set_content("hello"); http_response->set_content_type("text/plain"); EXPECT_EQ(request.content.length(), kPayloadSize); diff --git a/content/browser/media/capture/desktop_capture_device_unittest.cc b/content/browser/media/capture/desktop_capture_device_unittest.cc index 8a51a80..c7b7877 100644 --- a/content/browser/media/capture/desktop_capture_device_unittest.cc +++ b/content/browser/media/capture/desktop_capture_device_unittest.cc @@ -112,7 +112,7 @@ class MockDeviceClient : public media::VideoCaptureDevice::Client { // kFakePixelValueFirst, and the rest of the bytes set to kFakePixelValue, for // UnpackedFrame and InvertedFrame verification. webrtc::BasicDesktopFrame* CreateBasicFrame(const webrtc::DesktopSize& size) { - webrtc::BasicDesktopFrame* frame = new webrtc::BasicDesktopFrame(size);; + webrtc::BasicDesktopFrame* frame = new webrtc::BasicDesktopFrame(size); DCHECK_EQ(frame->size().width() * webrtc::DesktopFrame::kBytesPerPixel, frame->stride()); memset(frame->data(), @@ -168,6 +168,7 @@ class UnpackedDesktopFrame : public webrtc::DesktopFrame { delete[] data_; } + private: DISALLOW_COPY_AND_ASSIGN(UnpackedDesktopFrame); }; @@ -202,7 +203,7 @@ class FakeScreenCapturer : public webrtc::ScreenCapturer { } frame_index_++; - webrtc::DesktopFrame* frame = CreateBasicFrame(size);; + webrtc::DesktopFrame* frame = CreateBasicFrame(size); if (generate_inverted_frames_) { frame = new InvertedDesktopFrame(frame); diff --git a/content/browser/service_worker/service_worker_url_request_job_unittest.cc b/content/browser/service_worker/service_worker_url_request_job_unittest.cc index bb3936d..48a1fdd 100644 --- a/content/browser/service_worker/service_worker_url_request_job_unittest.cc +++ b/content/browser/service_worker/service_worker_url_request_job_unittest.cc @@ -749,7 +749,7 @@ TEST_F(ServiceWorkerURLRequestJobTest, StreamResponse_Flush) { expected_response.reserve((sizeof(kTestData) - 1) * 1024); for (int i = 0; i < 1024; ++i) { expected_response += kTestData; - stream->AddData(kTestData, sizeof(kTestData) - 1);; + stream->AddData(kTestData, sizeof(kTestData) - 1); stream->Flush(); base::RunLoop().RunUntilIdle(); EXPECT_EQ(expected_response, url_request_delegate_.response_data()); diff --git a/content/common/dwrite_font_platform_win.cc b/content/common/dwrite_font_platform_win.cc index 25755f5..dec1c16 100644 --- a/content/common/dwrite_font_platform_win.cc +++ b/content/common/dwrite_font_platform_win.cc @@ -933,7 +933,7 @@ bool FontCollectionLoader::IsFileCached(UINT32 font_key) { } CacheMap::iterator iter = cache_map_.find( GetFontNameFromKey(font_key).c_str()); - return iter != cache_map_.end();; + return iter != cache_map_.end(); } bool FontCollectionLoader::LoadCacheFile() { diff --git a/content/public/browser/host_zoom_map.h b/content/public/browser/host_zoom_map.h index 22ab44a..aa7ef23 100644 --- a/content/public/browser/host_zoom_map.h +++ b/content/public/browser/host_zoom_map.h @@ -164,7 +164,7 @@ class HostZoomMap { // Get/Set the default zoom level for pages that don't override it. virtual double GetDefaultZoomLevel() const = 0; - virtual void SetDefaultZoomLevel(double level) = 0;; + virtual void SetDefaultZoomLevel(double level) = 0; typedef base::Callback<void(const ZoomLevelChange&)> ZoomLevelChangedCallback; typedef base::CallbackList<void(const ZoomLevelChange&)>::Subscription diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc index 2de2879..9ea32c4 100644 --- a/content/renderer/render_frame_impl.cc +++ b/content/renderer/render_frame_impl.cc @@ -1067,7 +1067,7 @@ void RenderFrameImpl::PepperCancelComposition( PepperPluginInstanceImpl* instance) { if (instance != render_view_->focused_pepper_plugin()) return; - Send(new InputHostMsg_ImeCancelComposition(render_view_->GetRoutingID()));; + Send(new InputHostMsg_ImeCancelComposition(render_view_->GetRoutingID())); #if defined(OS_MACOSX) || defined(USE_AURA) GetRenderWidget()->UpdateCompositionInfo(true); #endif diff --git a/content/shell/browser/layout_test/layout_test_permission_manager.cc b/content/shell/browser/layout_test/layout_test_permission_manager.cc index bdd8ba7..55e788f 100644 --- a/content/shell/browser/layout_test/layout_test_permission_manager.cc +++ b/content/shell/browser/layout_test/layout_test_permission_manager.cc @@ -114,7 +114,7 @@ void LayoutTestPermissionManager::ResetPermission( PermissionDescription(permission, requesting_origin, embedding_origin)); if (it == permissions_.end()) return; - permissions_.erase(it);; + permissions_.erase(it); } PermissionStatus LayoutTestPermissionManager::GetPermissionStatus( diff --git a/extensions/shell/browser/shell_extensions_browser_client.cc b/extensions/shell/browser/shell_extensions_browser_client.cc index c104d1c..fd6bfd4 100644 --- a/extensions/shell/browser/shell_extensions_browser_client.cc +++ b/extensions/shell/browser/shell_extensions_browser_client.cc @@ -84,7 +84,7 @@ BrowserContext* ShellExtensionsBrowserClient::GetOriginalContext( #if defined(OS_CHROMEOS) std::string ShellExtensionsBrowserClient::GetUserIdHashFromContext( content::BrowserContext* context) { - return chromeos::LoginState::Get()->primary_user_hash();; + return chromeos::LoginState::Get()->primary_user_hash(); } #endif diff --git a/gin/isolate_holder.cc b/gin/isolate_holder.cc index d2e494c..c05cd1e 100644 --- a/gin/isolate_holder.cc +++ b/gin/isolate_holder.cc @@ -85,7 +85,7 @@ void IsolateHolder::Initialize(ScriptMode mode, void IsolateHolder::AddRunMicrotasksObserver() { DCHECK(!task_observer_.get()); - task_observer_.reset(new RunMicrotasksObserver(isolate_));; + task_observer_.reset(new RunMicrotasksObserver(isolate_)); base::MessageLoop::current()->AddTaskObserver(task_observer_.get()); } diff --git a/gpu/command_buffer/tests/gl_program_unittest.cc b/gpu/command_buffer/tests/gl_program_unittest.cc index 55e1d9e..1c4b54a 100644 --- a/gpu/command_buffer/tests/gl_program_unittest.cc +++ b/gpu/command_buffer/tests/gl_program_unittest.cc @@ -177,7 +177,7 @@ TEST_F(GLProgramTest, UniformsInCurrentProgram) { uniform vec4 u_color; void main() { - gl_FragColor = u_color;; + gl_FragColor = u_color; } ); diff --git a/storage/browser/fileapi/quota/quota_reservation_manager.cc b/storage/browser/fileapi/quota/quota_reservation_manager.cc index b6d2387..c61b3b9 100644 --- a/storage/browser/fileapi/quota/quota_reservation_manager.cc +++ b/storage/browser/fileapi/quota/quota_reservation_manager.cc @@ -85,7 +85,7 @@ scoped_refptr<QuotaReservation> QuotaReservationManager::CreateReservation( const GURL& origin, FileSystemType type) { DCHECK(origin.is_valid()); - return GetReservationBuffer(origin, type)->CreateReservation();; + return GetReservationBuffer(origin, type)->CreateReservation(); } } // namespace storage diff --git a/sync/internal_api/sync_backup_manager_unittest.cc b/sync/internal_api/sync_backup_manager_unittest.cc index 4a986b1..919356d 100644 --- a/sync/internal_api/sync_backup_manager_unittest.cc +++ b/sync/internal_api/sync_backup_manager_unittest.cc @@ -39,7 +39,7 @@ class SyncBackupManagerTest : public syncer::SyncManager::Observer, void(const sessions::SyncSessionSnapshot&)); MOCK_METHOD1(OnConnectionStatusChange, void(ConnectionStatus)); MOCK_METHOD1(OnActionableError, void(const SyncProtocolError&)); - MOCK_METHOD1(OnMigrationRequested, void(ModelTypeSet));; + MOCK_METHOD1(OnMigrationRequested, void(ModelTypeSet)); MOCK_METHOD1(OnProtocolEvent, void(const ProtocolEvent&)); MOCK_METHOD4(OnInitializationComplete, void(const WeakHandle<JsBackend>&, diff --git a/sync/internal_api/sync_rollback_manager_unittest.cc b/sync/internal_api/sync_rollback_manager_unittest.cc index 55c5f43..400cebc 100644 --- a/sync/internal_api/sync_rollback_manager_unittest.cc +++ b/sync/internal_api/sync_rollback_manager_unittest.cc @@ -85,7 +85,7 @@ class SyncRollbackManagerTest : public testing::Test, const WeakHandle<DataTypeDebugInfoListener>&, bool, ModelTypeSet)); MOCK_METHOD1(OnActionableError, void(const SyncProtocolError&)); - MOCK_METHOD1(OnMigrationRequested, void(ModelTypeSet));; + MOCK_METHOD1(OnMigrationRequested, void(ModelTypeSet)); MOCK_METHOD1(OnProtocolEvent, void(const ProtocolEvent&)); void OnConfigDone(bool success) { diff --git a/ui/views/widget/widget_interactive_uitest.cc b/ui/views/widget/widget_interactive_uitest.cc index 01cc4d8..5d368bd 100644 --- a/ui/views/widget/widget_interactive_uitest.cc +++ b/ui/views/widget/widget_interactive_uitest.cc @@ -850,7 +850,7 @@ TEST_F(WidgetTestInteractive, MAYBE_SystemModalWindowReleasesCapture) { ASSERT_FALSE(focus_listener.focus_changes().empty()); EXPECT_EQ(top_level_widget.GetNativeView(), - focus_listener.focus_changes().back());; + focus_listener.focus_changes().back()); EXPECT_FALSE(top_level_widget.HasCapture()); top_level_widget.SetCapture(NULL); |