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

webrtc/rtc_base/window.h

 /*
  *  Copyright 2004 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.
  */
 
 #ifndef WEBRTC_RTC_BASE_WINDOW_H_
 #define WEBRTC_RTC_BASE_WINDOW_H_
 
 #include <stdint.h>
 
-#include "webrtc/rtc_base/stringencode.h"
+#include "webrtc/base/stringencode.h"
 
 // Define platform specific window types.
 #if defined(WEBRTC_LINUX) && !defined(WEBRTC_ANDROID)
 typedef unsigned long Window;  // Avoid include <X11/Xlib.h>.
 #elif defined(WEBRTC_WIN)
-// We commonly include win32.h in webrtc/rtc_base so just include it here.
-#include "webrtc/rtc_base/win32.h"  // Include HWND, HMONITOR.
+// We commonly include win32.h in webrtc/base so just include it here.
+#include "webrtc/base/win32.h"  // Include HWND, HMONITOR.
 #elif defined(WEBRTC_MAC) && !defined(WEBRTC_IOS)
 typedef unsigned int CGWindowID;
 typedef unsigned int CGDirectDisplayID;
 #endif
 
 namespace rtc {
 
 class WindowId {
  public:
   // Define WindowT for each platform.
@@ skipping 35 matching lines @@
   WindowT id_;
 };
 
 inline std::string ToString(const WindowId& window) {
   return ToString(window.id());
 }
 
 }  // namespace rtc
 
 #endif  // WEBRTC_RTC_BASE_WINDOW_H_