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

webrtc/rtc_base/optional_unittest.cc

 /*
  *  Copyright 2015 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.
  */
 
 #include <memory>
 #include <sstream>
 #include <string>
 #include <utility>
 #include <vector>
 
-#include "webrtc/rtc_base/gunit.h"
-#include "webrtc/rtc_base/optional.h"
+#include "webrtc/base/gunit.h"
+#include "webrtc/base/optional.h"
 
 namespace rtc {
 
 namespace {
 
 struct MyUnprintableType {
   int value;
 };
 
 struct MyPrintableType {
@@ skipping 793 matching lines @@
   // for MyPrintableType never getting called.
   const MyPrintableType dont_warn{17};
   const MyOstreamPrintableType dont_warn2{18};
   std::stringstream sstr;
   sstr << dont_warn;
   PrintTo(dont_warn, &sstr);
   sstr << dont_warn2;
 }
 
 }  // namespace rtc