Proper spacing for end-of-namespace comments.

BUG=
R=mflodman@webrtc.org, tina.legrand@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/1760006

git-svn-id: http://webrtc.googlecode.com/svn/trunk/webrtc@4293 4adac7df-926f-26a2-2b94-8c16560cd09d

59 files changed, 83 insertions, 83 deletions

diff --git a/voice_engine/channel.cc b/voice_engine/channel.cc
index 6bfb259a..dbcccf1a 100644
--- a/voice_engine/channel.cc
+++ b/voice_engine/channel.cc
@@ -5324,5 +5324,5 @@ int Channel::SetRedPayloadType(int red_payload_type) {
   return 0;
 }
 
-} // namespace voe
-} // namespace webrtc
+}  // namespace voe
+}  // namespace webrtc
diff --git a/voice_engine/channel.h b/voice_engine/channel.h
index d05cd21a..a1e16feb 100644
--- a/voice_engine/channel.h
+++ b/voice_engine/channel.h
@@ -551,8 +551,8 @@ private:
     bool _rxNsIsEnabled;
 };
 
-} // namespace voe
+}  // namespace voe
 
-} // namespace webrtc
+}  // namespace webrtc
 
 #endif  // WEBRTC_VOICE_ENGINE_CHANNEL_H
diff --git a/voice_engine/channel_manager.cc b/voice_engine/channel_manager.cc
index 5adfcbef..4b203176 100644
--- a/voice_engine/channel_manager.cc
+++ b/voice_engine/channel_manager.cc
@@ -156,6 +156,6 @@ Channel* ScopedChannel::GetNextChannel(void*& iterator) const
     return static_cast<Channel*> (it->GetItem());
 }
 
-} // namespace voe
+}  // namespace voe
 
-} // namespace webrtc
+}  // namespace webrtc
diff --git a/voice_engine/channel_manager.h b/voice_engine/channel_manager.h
index 49e7bf76..723ff043 100644
--- a/voice_engine/channel_manager.h
+++ b/voice_engine/channel_manager.h
@@ -82,8 +82,8 @@ private:
     MapWrapper _channels;
 };
 
-} // namespace voe
+}  // namespace voe
 
-} // namespace webrtc
+}  // namespace webrtc
 
 #endif  // WEBRTC_VOICE_ENGINE_CHANNEL_MANAGER_H
diff --git a/voice_engine/channel_manager_base.cc b/voice_engine/channel_manager_base.cc
index 25d40586..440a0ea9 100644
--- a/voice_engine/channel_manager_base.cc
+++ b/voice_engine/channel_manager_base.cc
@@ -222,6 +222,6 @@ void ChannelManagerBase::GetChannels(MapWrapper& channels) const
     }
 }
 
-} // namespace voe
+}  // namespace voe
 
-} // namespace webrtc
+}  // namespace webrtc
diff --git a/voice_engine/channel_manager_base.h b/voice_engine/channel_manager_base.h
index a61bf5a7..1db19033 100644
--- a/voice_engine/channel_manager_base.h
+++ b/voice_engine/channel_manager_base.h
@@ -80,8 +80,8 @@ private:
     RWLockWrapper* _itemsRWLockPtr;
 };
 
-} // namespace voe
+}  // namespace voe
 
-} // namespace webrtc
+}  // namespace webrtc
 
 #endif  // WEBRTC_VOICE_ENGINE_CHANNEL_MANAGER_BASE_H
diff --git a/voice_engine/dtmf_inband.h b/voice_engine/dtmf_inband.h
index c867143c..eb045c92 100644
--- a/voice_engine/dtmf_inband.h
+++ b/voice_engine/dtmf_inband.h
@@ -82,6 +82,6 @@ private:
     uint32_t _delaySinceLastToneMS; // time since last generated tone [ms]
 };
 
-}   // namespace webrtc
+}  // namespace webrtc
 
 #endif // #ifndef WEBRTC_VOICE_ENGINE_DTMF_INBAND_H_
diff --git a/voice_engine/dtmf_inband_queue.h b/voice_engine/dtmf_inband_queue.h
index fa4967ab..5ca3f9c5 100644
--- a/voice_engine/dtmf_inband_queue.h
+++ b/voice_engine/dtmf_inband_queue.h
@@ -45,6 +45,6 @@ private:
     uint8_t _DtmfLevel[kDtmfInbandMax];
 };
 
-}   // namespace webrtc
+}  // namespace webrtc
 
 #endif  // WEBRTC_VOICE_ENGINE_DTMF_INBAND_QUEUE_H
diff --git a/voice_engine/include/voe_audio_processing.h b/voice_engine/include/voe_audio_processing.h
index 51ca9520..3ba7b1a2 100644
--- a/voice_engine/include/voe_audio_processing.h
+++ b/voice_engine/include/voe_audio_processing.h
@@ -232,6 +232,6 @@ protected:
     virtual ~VoEAudioProcessing() {}
 };
 
-}  //  namespace webrtc
+}  // namespace webrtc
 
 #endif  // WEBRTC_VOICE_ENGINE_VOE_AUDIO_PROCESSING_H
diff --git a/voice_engine/include/voe_base.h b/voice_engine/include/voe_base.h
index 2958108c..1a06c2ee 100644
--- a/voice_engine/include/voe_base.h
+++ b/voice_engine/include/voe_base.h
@@ -186,6 +186,6 @@ protected:
     virtual ~VoEBase() {}
 };
 
-} // namespace webrtc
+}  // namespace webrtc
 
 #endif  //  WEBRTC_VOICE_ENGINE_VOE_BASE_H
diff --git a/voice_engine/include/voe_codec.h b/voice_engine/include/voe_codec.h
index 4126965d..e69737d6 100644
--- a/voice_engine/include/voe_codec.h
+++ b/voice_engine/include/voe_codec.h
@@ -147,6 +147,6 @@ protected:
     virtual ~VoECodec() {}
 };
 
-} // namespace webrtc
+}  // namespace webrtc
 
 #endif  //  WEBRTC_VOICE_ENGINE_VOE_CODEC_H
diff --git a/voice_engine/include/voe_hardware.h b/voice_engine/include/voe_hardware.h
index 8236f65f..5c247d74 100644
--- a/voice_engine/include/voe_hardware.h
+++ b/voice_engine/include/voe_hardware.h
@@ -136,6 +136,6 @@ protected:
     virtual ~VoEHardware() {}
 };
 
-} // namespace webrtc
+}  // namespace webrtc
 
 #endif  //  WEBRTC_VOICE_ENGINE_VOE_HARDWARE_H
diff --git a/voice_engine/include/voe_neteq_stats.h b/voice_engine/include/voe_neteq_stats.h
index 7b7c47fe..f4e8f7b5 100644
--- a/voice_engine/include/voe_neteq_stats.h
+++ b/voice_engine/include/voe_neteq_stats.h
@@ -40,6 +40,6 @@ protected:
     virtual ~VoENetEqStats() {}
 };
 
-}   // namespace webrtc
+}  // namespace webrtc
 
 #endif    // #ifndef WEBRTC_VOICE_ENGINE_VOE_NETEQ_STATS_H
diff --git a/voice_engine/include/voe_network.h b/voice_engine/include/voe_network.h
index 15a770bd..7bcf9033 100644
--- a/voice_engine/include/voe_network.h
+++ b/voice_engine/include/voe_network.h
@@ -119,6 +119,6 @@ protected:
     virtual ~VoENetwork() {}
 };
 
-} // namespace webrtc
+}  // namespace webrtc
 
 #endif  //  WEBRTC_VOICE_ENGINE_VOE_NETWORK_H
diff --git a/voice_engine/include/voe_video_sync.h b/voice_engine/include/voe_video_sync.h
index a3770eab..ef811a96 100644
--- a/voice_engine/include/voe_video_sync.h
+++ b/voice_engine/include/voe_video_sync.h
@@ -99,6 +99,6 @@ protected:
     virtual ~VoEVideoSync() { }
 };
 
-}   // namespace webrtc
+}  // namespace webrtc
 
 #endif  // #ifndef WEBRTC_VOICE_ENGINE_VOE_VIDEO_SYNC_H
diff --git a/voice_engine/level_indicator.cc b/voice_engine/level_indicator.cc
index 12ca906e..61dfbcda 100644
--- a/voice_engine/level_indicator.cc
+++ b/voice_engine/level_indicator.cc
@@ -100,4 +100,4 @@ int16_t AudioLevel::LevelFullRange() const
 
 }  // namespace voe
 
-}  //  namespace webrtc
+}  // namespace webrtc
diff --git a/voice_engine/monitor_module.cc b/voice_engine/monitor_module.cc
index ef863f90..2389a51c 100644
--- a/voice_engine/monitor_module.cc
+++ b/voice_engine/monitor_module.cc
@@ -87,6 +87,6 @@ MonitorModule::Process()
     return 0;
 }
 
-}  //  namespace voe
+}  // namespace voe
 
-}  //  namespace webrtc
+}  // namespace webrtc
diff --git a/voice_engine/monitor_module.h b/voice_engine/monitor_module.h
index d55baec6..ebe4acaa 100644
--- a/voice_engine/monitor_module.h
+++ b/voice_engine/monitor_module.h
@@ -56,8 +56,8 @@ private:
     int32_t _lastProcessTime;
 };
 
-}  //  namespace voe
+}  // namespace voe
 
-}  //  namespace webrtc
+}  // namespace webrtc
 
 #endif // VOICE_ENGINE_MONITOR_MODULE
diff --git a/voice_engine/output_mixer.cc b/voice_engine/output_mixer.cc
index b928455b..dba96fe7 100644
--- a/voice_engine/output_mixer.cc
+++ b/voice_engine/output_mixer.cc
@@ -655,6 +655,6 @@ OutputMixer::InsertInbandDtmfTone()
     return 0;
 }
 
-}  //  namespace voe
+}  // namespace voe
 
-}  //  namespace webrtc
+}  // namespace webrtc
diff --git a/voice_engine/output_mixer.h b/voice_engine/output_mixer.h
index 5a423c2a..fc9afd8c 100644
--- a/voice_engine/output_mixer.h
+++ b/voice_engine/output_mixer.h
@@ -147,8 +147,8 @@ private:
     bool _outputFileRecording;
 };
 
-}  //  namespace voe
+}  // namespace voe
 
-}  //  namespace werbtc
+}  // namespace werbtc
 
 #endif  // VOICE_ENGINE_OUTPUT_MIXER_H_
diff --git a/voice_engine/shared_data.cc b/voice_engine/shared_data.cc
index 88f66fd3..e993778b 100644
--- a/voice_engine/shared_data.cc
+++ b/voice_engine/shared_data.cc
@@ -118,6 +118,6 @@ void SharedData::SetLastError(int32_t error, TraceLevel level,
   _engineStatistics.SetLastError(error, level, msg);
 }
 
-}  //  namespace voe
+}  // namespace voe
 
-}  //  namespace webrtc
+}  // namespace webrtc
diff --git a/voice_engine/shared_data.h b/voice_engine/shared_data.h
index b20225f0..a841547a 100644
--- a/voice_engine/shared_data.h
+++ b/voice_engine/shared_data.h
@@ -83,7 +83,7 @@ protected:
     virtual ~SharedData();
 };
 
-} //  namespace voe
+}  // namespace voe
 
-} //  namespace webrtc
+}  // namespace webrtc
 #endif // WEBRTC_VOICE_ENGINE_SHARED_DATA_H
diff --git a/voice_engine/statistics.cc b/voice_engine/statistics.cc
index 0c2b4682..a1faae74 100644
--- a/voice_engine/statistics.cc
+++ b/voice_engine/statistics.cc
@@ -94,6 +94,6 @@ int32_t Statistics::LastError() const
     return _lastError;
 }
 
-}  //  namespace voe
+}  // namespace voe
 
-}  //  namespace webrtc
+}  // namespace webrtc
diff --git a/voice_engine/statistics.h b/voice_engine/statistics.h
index 7d9582ee..3dab9162 100644
--- a/voice_engine/statistics.h
+++ b/voice_engine/statistics.h
@@ -48,6 +48,6 @@ class Statistics
 
 }  // namespace voe
 
-}  //  namespace webrtc
+}  // namespace webrtc
 
 #endif // WEBRTC_VOICE_ENGINE_STATISTICS_H
diff --git a/voice_engine/test/auto_test/voe_cpu_test.cc b/voice_engine/test/auto_test/voe_cpu_test.cc
index 1367ddcd..dddbb2cd 100644
--- a/voice_engine/test/auto_test/voe_cpu_test.cc
+++ b/voice_engine/test/auto_test/voe_cpu_test.cc
@@ -98,4 +98,4 @@ int VoECpuTest::DoTest() {
   return 0;
 }
 
-} //  namespace voetest
+}  // namespace voetest
diff --git a/voice_engine/test/auto_test/voe_cpu_test.h b/voice_engine/test/auto_test/voe_cpu_test.h
index 92d30c85..74ba3e92 100644
--- a/voice_engine/test/auto_test/voe_cpu_test.h
+++ b/voice_engine/test/auto_test/voe_cpu_test.h
@@ -26,6 +26,6 @@ class VoECpuTest {
   VoETestManager& _mgr;
 };
 
-} // namespace voetest
+}  // namespace voetest
 
 #endif // WEBRTC_VOICE_ENGINE_VOE_CPU_TEST_H
diff --git a/voice_engine/test/auto_test/voe_extended_test.cc b/voice_engine/test/auto_test/voe_extended_test.cc
index 38b3cdc0..9568e89c 100644
--- a/voice_engine/test/auto_test/voe_extended_test.cc
+++ b/voice_engine/test/auto_test/voe_extended_test.cc
@@ -1600,7 +1600,7 @@ int VoEExtendedTest::TestCodec() {
       }
     }
     ANL();
-  } // for (int index = 0; index < nCodecs; index++)
+  }  // for (int index = 0; index < nCodecs; index++)
 
   // restore PCMU
   const CodecInst tmp = { 0, "PCMU", 8000, 160, 1, 64000 };
@@ -5304,4 +5304,4 @@ int VoEExtendedTest::TestVolumeControl()
   return 0;
 }
 
-} //  namespace voetest
+}  // namespace voetest
diff --git a/voice_engine/test/auto_test/voe_extended_test.h b/voice_engine/test/auto_test/voe_extended_test.h
index f0a62b5a..0c5d4e18 100644
--- a/voice_engine/test/auto_test/voe_extended_test.h
+++ b/voice_engine/test/auto_test/voe_extended_test.h
@@ -469,5 +469,5 @@ class VoEExtendedTest : public VoiceEngineObserver,
   bool _sending[32];
 };
 
-} //  namespace voetest
+}  // namespace voetest
 #endif // WEBRTC_VOICE_ENGINE_VOE_EXTENDED_TEST_H
diff --git a/voice_engine/test/auto_test/voe_standard_test.cc b/voice_engine/test/auto_test/voe_standard_test.cc
index 751cd8e1..fed756d9 100644
--- a/voice_engine/test/auto_test/voe_standard_test.cc
+++ b/voice_engine/test/auto_test/voe_standard_test.cc
@@ -496,7 +496,7 @@ int run_auto_test(TestType test_type, ExtendedSelection ext_selection) {
         xtend.TestPassed("VolumeControl");
       }
       api_manager.GetExtendedMenuSelection(ext_selection);
-    } // while (extendedSel != XSEL_None)
+    }  // while (extendedSel != XSEL_None)
   } else if (test_type == Stress) {
     VoEStressTest stressTest(test_manager);
     result = stressTest.DoTest();
@@ -524,7 +524,7 @@ int run_auto_test(TestType test_type, ExtendedSelection ext_selection) {
 
   return 0;
 }
-} // namespace voetest
+}  // namespace voetest
 
 int RunInManualMode() {
   using namespace voetest;
diff --git a/voice_engine/test/auto_test/voe_standard_test.h b/voice_engine/test/auto_test/voe_standard_test.h
index 41700473..0710ce65 100644
--- a/voice_engine/test/auto_test/voe_standard_test.h
+++ b/voice_engine/test/auto_test/voe_standard_test.h
@@ -229,6 +229,6 @@ class VoETestManager {
   ResourceManager        resource_manager_;
 };
 
-} // namespace voetest
+}  // namespace voetest
 
 #endif // WEBRTC_VOICE_ENGINE_VOE_STANDARD_TEST_H
diff --git a/voice_engine/test/auto_test/voe_stress_test.cc b/voice_engine/test/auto_test/voe_stress_test.cc
index b79c1935..bd154043 100644
--- a/voice_engine/test/auto_test/voe_stress_test.cc
+++ b/voice_engine/test/auto_test/voe_stress_test.cc
@@ -79,8 +79,8 @@ int VoEStressTest::DoTest() {
         // Should not be possible
         printf("Invalid selection! (Test code error)\n");
         assert(false);
-    } // switch
-  } // while
+    }  // switch
+  }  // while
 
   return 0;
 }
@@ -409,4 +409,4 @@ bool VoEStressTest::ProcessExtraApi() {
   return true;
 }
 
-} //  namespace voetest
+}  // namespace voetest
diff --git a/voice_engine/test/auto_test/voe_stress_test.h b/voice_engine/test/auto_test/voe_stress_test.h
index ae3da2fb..15653bc5 100644
--- a/voice_engine/test/auto_test/voe_stress_test.h
+++ b/voice_engine/test/auto_test/voe_stress_test.h
@@ -44,6 +44,6 @@ class VoEStressTest {
   ThreadWrapper* _ptrExtraApiThread;
 };
 
-} //  namespace voetest
+}  // namespace voetest
 
 #endif // WEBRTC_VOICE_ENGINE_VOE_STRESS_TEST_H
diff --git a/voice_engine/test/auto_test/voe_test_interface.h b/voice_engine/test/auto_test/voe_test_interface.h
index dd109dcb..d5693d97 100644
--- a/voice_engine/test/auto_test/voe_test_interface.h
+++ b/voice_engine/test/auto_test/voe_test_interface.h
@@ -49,5 +49,5 @@ enum ExtendedSelection {
 // Main test function
 int runAutoTest(TestType testType, ExtendedSelection extendedSel);
 
-} //  namespace voetest
+}  // namespace voetest
 #endif // WEBRTC_VOICE_ENGINE_VOE_TEST_INTERFACE_H
diff --git a/voice_engine/test/auto_test/voe_unit_test.cc b/voice_engine/test/auto_test/voe_unit_test.cc
index b092ae32..c67de57a 100644
--- a/voice_engine/test/auto_test/voe_unit_test.cc
+++ b/voice_engine/test/auto_test/voe_unit_test.cc
@@ -210,8 +210,8 @@ int VoEUnitTest::DoTest() {
         // Should not be possible
         printf("Invalid selection! (Test code error)\n");
         assert(false);
-    } // switch
-  } // while
+    }  // switch
+  }  // while
 
   return ret;
 }
@@ -1083,4 +1083,4 @@ int VoEUnitTest::MixerTest() {
   return 0;
 }
 
-} // namespace voetest
+}  // namespace voetest
diff --git a/voice_engine/test/auto_test/voe_unit_test.h b/voice_engine/test/auto_test/voe_unit_test.h
index 69af78cb..fb80b3dd 100644
--- a/voice_engine/test/auto_test/voe_unit_test.h
+++ b/voice_engine/test/auto_test/voe_unit_test.h
@@ -67,5 +67,5 @@ class VoEUnitTest : public Encryption {
   int _extChannel;
 };
 
-} //  namespace voetest
+}  // namespace voetest
 #endif // WEBRTC_VOICE_ENGINE_VOE_UNIT_TEST_H
diff --git a/voice_engine/transmit_mixer.cc b/voice_engine/transmit_mixer.cc
index f594ef0e..9c7e03ea 100644
--- a/voice_engine/transmit_mixer.cc
+++ b/voice_engine/transmit_mixer.cc
@@ -1420,6 +1420,6 @@ bool TransmitMixer::IsStereoChannelSwappingEnabled() {
   return swap_stereo_channels_;
 }
 
-}  //  namespace voe
+}  // namespace voe
 
-}  //  namespace webrtc
+}  // namespace webrtc
diff --git a/voice_engine/transmit_mixer.h b/voice_engine/transmit_mixer.h
index 450f1254..1b575af4 100644
--- a/voice_engine/transmit_mixer.h
+++ b/voice_engine/transmit_mixer.h
@@ -236,6 +236,6 @@ private:
 
 #endif // WEBRTC_VOICE_ENGINE_TRANSMIT_MIXER_H
 
-}  //  namespace voe
+}  // namespace voe
 
 }  // namespace webrtc
diff --git a/voice_engine/utility.cc b/voice_engine/utility.cc
index 5bd87f83..5b7ee814 100644
--- a/voice_engine/utility.cc
+++ b/voice_engine/utility.cc
@@ -120,6 +120,6 @@ void Utility::ScaleWithSat(int16_t vector[], float scale,
     }
 }
 
-} // namespace voe
+}  // namespace voe
 
-} // namespace webrtc
+}  // namespace webrtc
diff --git a/voice_engine/utility.h b/voice_engine/utility.h
index b51dc035..fcb4462e 100644
--- a/voice_engine/utility.h
+++ b/voice_engine/utility.h
@@ -51,8 +51,8 @@ public:
                              uint16_t len);
 };
 
-} // namespace voe
+}  // namespace voe
 
-} // namespace webrtc
+}  // namespace webrtc
 
 #endif  // WEBRTC_VOICE_ENGINE_UTILITY_H
diff --git a/voice_engine/voe_audio_processing_impl.cc b/voice_engine/voe_audio_processing_impl.cc
index a1743ea5..430f86dc 100644
--- a/voice_engine/voe_audio_processing_impl.cc
+++ b/voice_engine/voe_audio_processing_impl.cc
@@ -1086,4 +1086,4 @@ bool VoEAudioProcessingImpl::IsStereoChannelSwappingEnabled() {
 
 #endif  // #ifdef WEBRTC_VOICE_ENGINE_AUDIO_PROCESSING_API
 
-}   // namespace webrtc
+}  // namespace webrtc
diff --git a/voice_engine/voe_audio_processing_impl.h b/voice_engine/voe_audio_processing_impl.h
index 562e8ba7..309d997b 100644
--- a/voice_engine/voe_audio_processing_impl.h
+++ b/voice_engine/voe_audio_processing_impl.h
@@ -107,6 +107,6 @@ class VoEAudioProcessingImpl : public VoEAudioProcessing {
   voe::SharedData* _shared;
 };
 
-}  //  namespace webrtc
+}  // namespace webrtc
 
 #endif  // WEBRTC_VOICE_ENGINE_VOE_AUDIO_PROCESSING_IMPL_H
diff --git a/voice_engine/voe_base_impl.cc b/voice_engine/voe_base_impl.cc
index 09f22d44..f9934573 100644
--- a/voice_engine/voe_base_impl.cc
+++ b/voice_engine/voe_base_impl.cc
@@ -1241,4 +1241,4 @@ int32_t VoEBaseImpl::TerminateInternal()
     return _shared->statistics().SetUnInitialized();
 }
 
-} // namespace webrtc
+}  // namespace webrtc
diff --git a/voice_engine/voe_base_impl.h b/voice_engine/voe_base_impl.h
index fbd9092c..4665e808 100644
--- a/voice_engine/voe_base_impl.h
+++ b/voice_engine/voe_base_impl.h
@@ -124,6 +124,6 @@ private:
 
 };
 
-} // namespace webrtc
+}  // namespace webrtc
 
 #endif  // WEBRTC_VOICE_ENGINE_VOE_BASE_IMPL_H
diff --git a/voice_engine/voe_call_report_impl.cc b/voice_engine/voe_call_report_impl.cc
index 9f3177d8..cf76850d 100644
--- a/voice_engine/voe_call_report_impl.cc
+++ b/voice_engine/voe_call_report_impl.cc
@@ -408,4 +408,4 @@ int VoECallReportImpl::WriteReportToFile(const char* fileNameUTF8)
 
 #endif  // WEBRTC_VOICE_ENGINE_CALL_REPORT_API
 
-} // namespace webrtc
+}  // namespace webrtc
diff --git a/voice_engine/voe_call_report_impl.h b/voice_engine/voe_call_report_impl.h
index e8b81f22..b9927f56 100644
--- a/voice_engine/voe_call_report_impl.h
+++ b/voice_engine/voe_call_report_impl.h
@@ -52,6 +52,6 @@ private:
     voe::SharedData* _shared;
 };
 
-} // namespace webrtc
+}  // namespace webrtc
 
 #endif  // WEBRTC_VOICE_ENGINE_VOE_CALL_REPORT_IMPL_H
diff --git a/voice_engine/voe_codec_impl.cc b/voice_engine/voe_codec_impl.cc
index 0cc4e025..6cc791af 100644
--- a/voice_engine/voe_codec_impl.cc
+++ b/voice_engine/voe_codec_impl.cc
@@ -764,4 +764,4 @@ int VoECodecImpl::RemoveSecondarySendCodec(int channel) {
 
 #endif  // WEBRTC_VOICE_ENGINE_CODEC_API
 
-} // namespace webrtc
+}  // namespace webrtc
diff --git a/voice_engine/voe_codec_impl.h b/voice_engine/voe_codec_impl.h
index ab120f82..ec6cbd7c 100644
--- a/voice_engine/voe_codec_impl.h
+++ b/voice_engine/voe_codec_impl.h
@@ -92,6 +92,6 @@ private:
     voe::SharedData* _shared;
 };
 
-} // namespace webrtc
+}  // namespace webrtc
 
 #endif  // WEBRTC_VOICE_ENGINE_VOE_CODEC_IMPL_H
diff --git a/voice_engine/voe_dtmf_impl.h b/voice_engine/voe_dtmf_impl.h
index e779b69b..e879f8de 100644
--- a/voice_engine/voe_dtmf_impl.h
+++ b/voice_engine/voe_dtmf_impl.h
@@ -61,6 +61,6 @@ private:
     voe::SharedData* _shared;
 };
 
-} // namespace webrtc
+}  // namespace webrtc
 
 #endif  // WEBRTC_VOICE_ENGINE_VOE_DTMF_IMPL_H
diff --git a/voice_engine/voe_encryption_impl.h b/voice_engine/voe_encryption_impl.h
index 47e38e00..6d482fff 100644
--- a/voice_engine/voe_encryption_impl.h
+++ b/voice_engine/voe_encryption_impl.h
@@ -35,6 +35,6 @@ private:
     voe::SharedData* _shared;
 };
 
-}   // namespace webrtc
+}  // namespace webrtc
 
 #endif  // #ifndef WEBRTC_VOICE_ENGINE_VOE_ENCRYPTION_IMPL_H
diff --git a/voice_engine/voe_hardware_impl.cc b/voice_engine/voe_hardware_impl.cc
index b2690da7..5a293fc1 100644
--- a/voice_engine/voe_hardware_impl.cc
+++ b/voice_engine/voe_hardware_impl.cc
@@ -807,4 +807,4 @@ int VoEHardwareImpl::PlayoutSampleRate(unsigned int* samples_per_sec) const {
 
 #endif  // WEBRTC_VOICE_ENGINE_HARDWARE_API
 
-} // namespace webrtc
+}  // namespace webrtc
diff --git a/voice_engine/voe_hardware_impl.h b/voice_engine/voe_hardware_impl.h
index eddaf377..4e06f978 100644
--- a/voice_engine/voe_hardware_impl.h
+++ b/voice_engine/voe_hardware_impl.h
@@ -75,6 +75,6 @@ private:
     voe::SharedData* _shared;
 };
 
-} // namespace webrtc
+}  // namespace webrtc
 
 #endif  // WEBRTC_VOICE_ENGINE_VOE_HARDWARE_IMPL_H
diff --git a/voice_engine/voe_neteq_stats_impl.cc b/voice_engine/voe_neteq_stats_impl.cc
index aa53ceb5..661c8c65 100644
--- a/voice_engine/voe_neteq_stats_impl.cc
+++ b/voice_engine/voe_neteq_stats_impl.cc
@@ -75,4 +75,4 @@ int VoENetEqStatsImpl::GetNetworkStatistics(int channel,
 
 #endif  // #ifdef WEBRTC_VOICE_ENGINE_NETEQ_STATS_API
 
-}   // namespace webrtc
+}  // namespace webrtc
diff --git a/voice_engine/voe_network_impl.cc b/voice_engine/voe_network_impl.cc
index 6b4b9773..62521706 100644
--- a/voice_engine/voe_network_impl.cc
+++ b/voice_engine/voe_network_impl.cc
@@ -319,4 +319,4 @@ int VoENetworkImpl::GetPeriodicDeadOrAliveStatus(int channel,
                                                     sampleTimeSeconds);
 }
 
-} // namespace webrtc
+}  // namespace webrtc
diff --git a/voice_engine/voe_network_impl.h b/voice_engine/voe_network_impl.h
index cfa3ffc3..194899b4 100644
--- a/voice_engine/voe_network_impl.h
+++ b/voice_engine/voe_network_impl.h
@@ -62,6 +62,6 @@ private:
     voe::SharedData* _shared;
 };
 
-} // namespace webrtc
+}  // namespace webrtc
 
 #endif  // WEBRTC_VOICE_ENGINE_VOE_NETWORK_IMPL_H
diff --git a/voice_engine/voe_video_sync_impl.h b/voice_engine/voe_video_sync_impl.h
index 932c8cd6..e0ec3f2f 100644
--- a/voice_engine/voe_video_sync_impl.h
+++ b/voice_engine/voe_video_sync_impl.h
@@ -48,6 +48,6 @@ private:
     voe::SharedData* _shared;
 };
 
-}   // namespace webrtc
+}  // namespace webrtc
 
 #endif    // WEBRTC_VOICE_ENGINE_VOE_VIDEO_SYNC_IMPL_H
diff --git a/voice_engine/voe_volume_control_impl.h b/voice_engine/voe_volume_control_impl.h
index f19d9a34..cdbc4280 100644
--- a/voice_engine/voe_volume_control_impl.h
+++ b/voice_engine/voe_volume_control_impl.h
@@ -66,6 +66,6 @@ private:
     voe::SharedData* _shared;
 };
 
-}   // namespace webrtc
+}  // namespace webrtc
 
 #endif    // WEBRTC_VOICE_ENGINE_VOE_VOLUME_CONTROL_IMPL_H
diff --git a/voice_engine/voice_engine_defines.h b/voice_engine/voice_engine_defines.h
index e1e9cdfa..2d69979e 100644
--- a/voice_engine/voice_engine_defines.h
+++ b/voice_engine/voice_engine_defines.h
@@ -123,7 +123,7 @@ enum { kVoiceEngineMinRtpExtensionId = 1 };
 // Max 4-bit ID for RTP extension
 enum { kVoiceEngineMaxRtpExtensionId = 14 };
 
-} // namespace webrtc
+}  // namespace webrtc
 
 // TODO(ajm): we shouldn't be using the precompiler for this.
 // Use enums or bools as appropriate.
@@ -218,7 +218,7 @@ inline int VoEChannelId(int moduleId)
     return (int) (moduleId & 0xffff);
 }
 
-} // namespace webrtc
+}  // namespace webrtc
 
 // ----------------------------------------------------------------------------
 //  Platform settings
diff --git a/voice_engine/voice_engine_impl.cc b/voice_engine/voice_engine_impl.cc
index eca098ef..781a66ae 100644
--- a/voice_engine/voice_engine_impl.cc
+++ b/voice_engine/voice_engine_impl.cc
@@ -38,7 +38,7 @@ VoiceEngine* GetVoiceEngine()
     }
     return self;
 }
-} // extern "C"
+}  // extern "C"
 
 int VoiceEngineImpl::AddRef() {
   return ++_ref_count;
@@ -155,4 +155,4 @@ int VoiceEngine::SetAndroidObjects(void* javaVM, void* env, void* context)
 #endif
 }
 
-} //namespace webrtc
+}  // namespace webrtc
diff --git a/voice_engine/voice_engine_impl.h b/voice_engine/voice_engine_impl.h
index 01190744..55c42095 100644
--- a/voice_engine/voice_engine_impl.h
+++ b/voice_engine/voice_engine_impl.h
@@ -154,6 +154,6 @@ private:
     Atomic32 _ref_count;
 };
 
-} // namespace webrtc
+}  // namespace webrtc
 
 #endif // WEBRTC_VOICE_ENGINE_VOICE_ENGINE_IMPL_H