Removes unnecessary webrtc_cc namespaces.

Bug: webrtc:9586
Change-Id: I6407ee465d725d7469c409e5bea1c55354ab7f95
Reviewed-on: https://webrtc-review.googlesource.com/92385
Commit-Queue: Sebastian Jansson <srte@webrtc.org>
Reviewed-by: Björn Terelius <terelius@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#24199}

modules/congestion_controller/goog_cc/alr_detector_unittest.cc

@@ -21,8 +21,6 @@ constexpr int kEstimatedBitrateBps = 300000;
 }  // namespace
 
 namespace webrtc {
-namespace webrtc_cc {
-
 namespace {
 class SimulateOutgoingTrafficIn {
  public:
@@ -173,5 +171,4 @@ TEST_F(AlrDetectorTest, ParseActiveFieldTrial) {
   EXPECT_EQ(1, parsed_params->group_id);
 }
 
-}  // namespace webrtc_cc
 }  // namespace webrtc

modules/congestion_controller/goog_cc/goog_cc_factory.cc

@@ -19,8 +19,7 @@ GoogCcNetworkControllerFactory::GoogCcNetworkControllerFactory(
 
 std::unique_ptr<NetworkControllerInterface>
 GoogCcNetworkControllerFactory::Create(NetworkControllerConfig config) {
-  return absl::make_unique<webrtc_cc::GoogCcNetworkController>(event_log_,
-                                                               config, false);
+  return absl::make_unique<GoogCcNetworkController>(event_log_, config, false);
 }
 
 TimeDelta GoogCcNetworkControllerFactory::GetProcessInterval() const {
@@ -34,8 +33,7 @@ GoogCcFeedbackNetworkControllerFactory::GoogCcFeedbackNetworkControllerFactory(
 
 std::unique_ptr<NetworkControllerInterface>
 GoogCcFeedbackNetworkControllerFactory::Create(NetworkControllerConfig config) {
-  return absl::make_unique<webrtc_cc::GoogCcNetworkController>(event_log_,
-                                                               config, true);
+  return absl::make_unique<GoogCcNetworkController>(event_log_, config, true);
 }
 
 TimeDelta GoogCcFeedbackNetworkControllerFactory::GetProcessInterval() const {

modules/congestion_controller/goog_cc/goog_cc_network_control.cc

@@ -33,7 +33,6 @@
 #include "system_wrappers/include/field_trial.h"
 
 namespace webrtc {
-namespace webrtc_cc {
 namespace {
 
 const char kCwndExperiment[] = "WebRTC-CwndExperiment";
@@ -543,5 +542,4 @@ PacerConfig GoogCcNetworkController::GetPacingRates(Timestamp at_time) const {
   msg.pad_window = padding_rate * msg.time_window;
   return msg;
 }
-}  // namespace webrtc_cc
 }  // namespace webrtc

modules/congestion_controller/goog_cc/goog_cc_network_control.h

@@ -27,7 +27,6 @@
 #include "rtc_base/constructormagic.h"
 
 namespace webrtc {
-namespace webrtc_cc {
 
 class GoogCcNetworkController : public NetworkControllerInterface {
  public:
@@ -105,7 +104,6 @@ class GoogCcNetworkController : public NetworkControllerInterface {
   RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(GoogCcNetworkController);
 };
 
-}  // namespace webrtc_cc
 }  // namespace webrtc
 
 #endif  // MODULES_CONGESTION_CONTROLLER_GOOG_CC_GOOG_CC_NETWORK_CONTROL_H_

modules/congestion_controller/goog_cc/probe_controller_unittest.cc

@@ -24,7 +24,6 @@ using testing::NiceMock;
 using testing::Return;
 
 namespace webrtc {
-namespace webrtc_cc {
 namespace test {
 
 namespace {
@@ -264,5 +263,4 @@ TEST_F(ProbeControllerTest, TestExponentialProbingOverflow) {
 }
 
 }  // namespace test
-}  // namespace webrtc_cc
 }  // namespace webrtc

modules/congestion_controller/goog_cc/test/goog_cc_printer.cc

@@ -13,8 +13,7 @@ namespace webrtc {
 GoogCcStatePrinter::GoogCcStatePrinter() = default;
 GoogCcStatePrinter::~GoogCcStatePrinter() = default;
 
-void GoogCcStatePrinter::Attach(
-    webrtc_cc::GoogCcNetworkController* controller) {
+void GoogCcStatePrinter::Attach(GoogCcNetworkController* controller) {
   controller_ = controller;
 }
 
@@ -41,8 +40,7 @@ std::unique_ptr<NetworkControllerInterface> GoogCcDebugFactory::Create(
     NetworkControllerConfig config) {
   RTC_CHECK(controller_ == nullptr);
   auto controller = GoogCcNetworkControllerFactory::Create(config);
-  controller_ =
-      static_cast<webrtc_cc::GoogCcNetworkController*>(controller.get());
+  controller_ = static_cast<GoogCcNetworkController*>(controller.get());
   printer_->Attach(controller_);
   return controller;
 }

modules/congestion_controller/goog_cc/test/goog_cc_printer.h

@@ -21,7 +21,7 @@ class GoogCcStatePrinter : public DebugStatePrinter {
  public:
   GoogCcStatePrinter();
   ~GoogCcStatePrinter() override;
-  void Attach(webrtc_cc::GoogCcNetworkController*);
+  void Attach(GoogCcNetworkController*);
   bool Attached() const override;
 
   void PrintHeaders(FILE* out) override;
@@ -30,7 +30,7 @@ class GoogCcStatePrinter : public DebugStatePrinter {
   NetworkControlUpdate GetState(Timestamp at_time) const override;
 
  private:
-  webrtc_cc::GoogCcNetworkController* controller_ = nullptr;
+  GoogCcNetworkController* controller_ = nullptr;
 };
 
 class GoogCcDebugFactory : public GoogCcNetworkControllerFactory {
@@ -41,7 +41,7 @@ class GoogCcDebugFactory : public GoogCcNetworkControllerFactory {
 
  private:
   GoogCcStatePrinter* printer_;
-  webrtc_cc::GoogCcNetworkController* controller_ = nullptr;
+  GoogCcNetworkController* controller_ = nullptr;
 };
 }  // namespace webrtc
 

modules/congestion_controller/rtp/pacer_controller.cc

@@ -14,7 +14,6 @@
 #include "rtc_base/logging.h"
 
 namespace webrtc {
-namespace webrtc_cc {
 
 PacerController::PacerController(PacedSender* pacer) : pacer_(pacer) {
   sequenced_checker_.Detach();
@@ -68,5 +67,4 @@ void PacerController::SetPacerState(bool paused) {
   pacer_paused_ = paused;
 }
 
-}  // namespace webrtc_cc
 }  // namespace webrtc

modules/congestion_controller/rtp/pacer_controller.h

@@ -20,8 +20,6 @@
 namespace webrtc {
 class Clock;
 
-namespace webrtc_cc {
-
 // Wrapper class to control pacer using task queues. Note that this class is
 // only designed to be used from a single task queue and has no built in
 // concurrency safety.
@@ -48,6 +46,5 @@ class PacerController {
   rtc::SequencedTaskChecker sequenced_checker_;
   RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(PacerController);
 };
-}  // namespace webrtc_cc
 }  // namespace webrtc
 #endif  // MODULES_CONGESTION_CONTROLLER_RTP_PACER_CONTROLLER_H_

modules/congestion_controller/rtp/send_time_history_unittest.cc

@@ -19,7 +19,6 @@
 #include "test/gtest.h"
 
 namespace webrtc {
-namespace webrtc_cc {
 namespace test {
 
 static const int kDefaultHistoryLengthMs = 1000;
@@ -254,5 +253,4 @@ TEST_F(SendTimeHistoryTest, InterlievedGetAndRemove) {
   EXPECT_EQ(packets[2], packet3);
 }
 }  // namespace test
-}  // namespace webrtc_cc
 }  // namespace webrtc