Revert of Remove remains of webrtc/base (patchset #7 id:120001 of https://codereview.webrtc.org/297…

webrtc/rtc_base/BUILD.gn

 # Copyright (c) 2014 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.
 
 import("//build/config/crypto.gni")
 import("//build/config/ui.gni")
@@ skipping 185 matching lines @@
   }
 
   if (is_win) {
     sources += [ "file_win.cc" ]
   }
 
   if (build_with_chromium) {
     # Dependency on chromium's logging (in //base).
     deps += [ "//base:base" ]
     sources += [
-      "../../webrtc_overrides/webrtc/rtc_base/logging.cc",
-      "../../webrtc_overrides/webrtc/rtc_base/logging.h",
+      "../../webrtc_overrides/webrtc/base/logging.cc",
+      "../../webrtc_overrides/webrtc/base/logging.h",
     ]
   } else {
     sources += [
       "logging.cc",
       "logging.h",
       "logging_mac.mm",
     ]
   }
   if (is_component_build && is_win) {
     # Copy the VS runtime DLLs into the isolate so that they don't have to be
@@ skipping 76 matching lines @@
   defines = [ "WEBRTC_BUILD_LIBEVENT" ]
 }
 
 rtc_static_library("rtc_task_queue") {
   public_deps = [
     ":rtc_base_approved",
   ]
 
   if (build_with_chromium) {
     sources = [
-      "../../webrtc_overrides/webrtc/rtc_base/task_queue.cc",
-      "../../webrtc_overrides/webrtc/rtc_base/task_queue.h",
+      "../../webrtc_overrides/webrtc/base/task_queue.cc",
+      "../../webrtc_overrides/webrtc/base/task_queue.h",
     ]
   } else {
     sources = [
       "task_queue.h",
       "task_queue_posix.h",
     ]
     if (rtc_build_libevent) {
       deps = [
         "//base/third_party/libevent",
       ]
@@ skipping 194 matching lines @@
   # TODO(henrike): issue 3307, make rtc_base build with the Chromium default
   # compiler settings.
   suppressed_configs += [ "//build/config/compiler:chromium_code" ]
   configs += [ "//build/config/compiler:no_chromium_code" ]
   if (!is_win) {
     cflags += [ "-Wno-uninitialized" ]
   }
 
   if (build_with_chromium) {
     if (is_win) {
-      sources += [ "../../webrtc_overrides/webrtc/rtc_base/win32socketinit.cc" ]
+      sources += [ "../../webrtc_overrides/webrtc/base/win32socketinit.cc" ]
     }
     include_dirs = [ "../../boringssl/src/include" ]
     public_configs += [ ":rtc_base_chromium_config" ]
   } else {
     configs += [ ":rtc_base_warnings_config" ]
     sources += [
       "callback.h",
       "logsinks.cc",
       "logsinks.h",
       "mathutils.h",
@@ skipping 498 matching lines @@
 if (is_android) {
   android_library("base_java") {
     java_files = [
       "java/src/org/webrtc/ContextUtils.java",
       "java/src/org/webrtc/Logging.java",
       "java/src/org/webrtc/Size.java",
       "java/src/org/webrtc/ThreadUtils.java",
     ]
   }
 }