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

webrtc/rtc_base/sigslottester.h.pump

 /*
  *  Copyright 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.
  */
 
@@ skipping 17 matching lines @@
 //   /* We want to monitor foo in some test. Note how signal argument is
 //      const std::string&, but capture-type is std::string. Capture type
 //      must be type that can be assigned to. */
 //   std::string capture;
 //   SigslotTester1<const std::string&, std::string> slot(&foo, &capture);
 //   foo.emit("hello");
 //   EXPECT_EQ(1, slot.callback_count());
 //   EXPECT_EQ("hello", capture);
 //   /* See unit-tests for more examples */
 
-#include "webrtc/rtc_base/constructormagic.h"
-#include "webrtc/rtc_base/sigslot.h"
+#include "webrtc/base/constructormagic.h"
+#include "webrtc/base/sigslot.h"
 
 namespace rtc {
 
 // Base version for testing signals that passes no arguments.
 class SigslotTester0 : public sigslot::has_slots<> {
  public:
   explicit SigslotTester0(sigslot::signal0<>* signal) : callback_count_(0) {
     signal->connect(this, &SigslotTester0::OnSignalCallback);
   }
 
@@ skipping 43 matching lines @@
   C$j* capture$j[[]]_;]]
 
 
   RTC_DISALLOW_COPY_AND_ASSIGN(SigslotTester$i);
 };
 
 ]]
 }  // namespace rtc
 
 #endif  // WEBRTC_RTC_BASE_SIGSLOTTESTER_H_