Revert "Update includes for webrtc/{base => rtc_base} rename (1/3)"

webrtc/modules/audio_processing/test/unpack.cc

 /*
  *  Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
 // Commandline tool to unpack audioproc debug files.
 //
 // The debug files are dumped as protobuf blobs. For analysis, it's necessary
 // to unpack the file into its component parts: audio and other data.
 
 #include <stdio.h>
 
 #include <memory>
 
 #include "gflags/gflags.h"
+#include "webrtc/base/format_macros.h"
+#include "webrtc/base/ignore_wundef.h"
 #include "webrtc/modules/audio_processing/test/protobuf_utils.h"
 #include "webrtc/modules/audio_processing/test/test_utils.h"
-#include "webrtc/rtc_base/format_macros.h"
-#include "webrtc/rtc_base/ignore_wundef.h"
 #include "webrtc/typedefs.h"
 
 RTC_PUSH_IGNORING_WUNDEF()
 #include "webrtc/modules/audio_processing/debug.pb.h"
 RTC_POP_IGNORING_WUNDEF()
 
 // TODO(andrew): unpack more of the data.
 DEFINE_string(input_file, "input", "The name of the input stream file.");
 DEFINE_string(output_file, "ref_out",
               "The name of the reference output stream file.");
@@ skipping 292 matching lines @@
   }
 
   return 0;
 }
 
 }  // namespace webrtc
 
 int main(int argc, char* argv[]) {
   return webrtc::do_main(argc, argv);
 }