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

webrtc/system_wrappers/include/atomic32.h

 /*
  *  Copyright (c) 2012 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.
  */
 
 // Atomic, system independent 32-bit integer.  Unless you know what you're
 // doing, use locks instead! :-)
 //
 // Note: assumes 32-bit (or higher) system
 #ifndef WEBRTC_SYSTEM_WRAPPERS_INCLUDE_ATOMIC32_H_
 #define WEBRTC_SYSTEM_WRAPPERS_INCLUDE_ATOMIC32_H_
 
 #include <stddef.h>
 
+#include "webrtc/base/constructormagic.h"
 #include "webrtc/common_types.h"
-#include "webrtc/rtc_base/constructormagic.h"
 
 namespace webrtc {
 
 // 32 bit atomic variable.  Note that this class relies on the compiler to
 // align the 32 bit value correctly (on a 32 bit boundary), so as long as you're
 // not doing things like reinterpret_cast over some custom allocated memory
 // without being careful with alignment, you should be fine.
 class Atomic32 {
  public:
   Atomic32(int32_t initial_value = 0);
@@ skipping 25 matching lines @@
   }
 
   RTC_DISALLOW_COPY_AND_ASSIGN(Atomic32);
 
   int32_t value_;
 };
 
 }  // namespace webrtc
 
 #endif  // WEBRTC_SYSTEM_WRAPPERS_INCLUDE_ATOMIC32_H_