Make rtc_base/refcount.h self contained, not including refcountedobject.h.

The refcount.h file doesn't depend on anything from
refcountedobject.h. The motivation of this change to make it possible
to add additional declarations to refcount.h, and include it from
refcountedobject.h.

Bug: webrtc:8270
Change-Id: I24f6131f471e675570968d00065ff9b1f55e3373
Reviewed-on: https://webrtc-review.googlesource.com/5760
Reviewed-by: Karl Wiberg <kwiberg@webrtc.org>
Commit-Queue: Niels Moller <nisse@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#20106}

api/audio_codecs/audio_decoder_factory_template.h

@@ -15,6 +15,7 @@
 #include <vector>
 
 #include "api/audio_codecs/audio_decoder_factory.h"
+#include "rtc_base/refcountedobject.h"
 #include "rtc_base/scoped_ref_ptr.h"
 
 namespace webrtc {

api/audio_codecs/audio_encoder_factory_template.h

@@ -15,6 +15,7 @@
 #include <vector>
 
 #include "api/audio_codecs/audio_encoder_factory.h"
+#include "rtc_base/refcountedobject.h"
 #include "rtc_base/scoped_ref_ptr.h"
 
 namespace webrtc {

api/proxy.h

@@ -56,6 +56,7 @@
 #include <utility>
 
 #include "rtc_base/event.h"
+#include "rtc_base/refcountedobject.h"
 #include "rtc_base/thread.h"
 
 namespace webrtc {

api/stats/rtcstatsreport.h

@@ -18,6 +18,7 @@
 
 #include "api/stats/rtcstats.h"
 #include "rtc_base/refcount.h"
+#include "rtc_base/refcountedobject.h"
 #include "rtc_base/scoped_ref_ptr.h"
 
 namespace webrtc {

api/statstypes.cc

@@ -13,6 +13,7 @@
 #include <string.h>
 
 #include "rtc_base/checks.h"
+#include "rtc_base/refcountedobject.h"
 
 // TODO(tommi): Could we have a static map of value name -> expected type
 // and use this to RTC_DCHECK on correct usage (somewhat strongly typed values)?

common_video/include/i420_buffer_pool.h

@@ -16,6 +16,7 @@
 
 #include "api/video/i420_buffer.h"
 #include "rtc_base/race_checker.h"
+#include "rtc_base/refcountedobject.h"
 
 namespace webrtc {
 

modules/audio_coding/acm2/audio_coding_module_unittest.cc

@@ -37,6 +37,7 @@
 #include "rtc_base/criticalsection.h"
 #include "rtc_base/md5digest.h"
 #include "rtc_base/platform_thread.h"
+#include "rtc_base/refcountedobject.h"
 #include "rtc_base/thread_annotations.h"
 #include "system_wrappers/include/clock.h"
 #include "system_wrappers/include/event_wrapper.h"

modules/audio_coding/neteq/decoder_database_unittest.cc

@@ -16,6 +16,7 @@
 #include <string>
 
 #include "api/audio_codecs/builtin_audio_decoder_factory.h"
+#include "rtc_base/refcountedobject.h"
 #include "test/gmock.h"
 #include "test/gtest.h"
 #include "test/mock_audio_decoder.h"

modules/audio_device/audio_device_impl.cc

@@ -15,6 +15,7 @@
 #include "rtc_base/checks.h"
 #include "rtc_base/logging.h"
 #include "rtc_base/refcount.h"
+#include "rtc_base/refcountedobject.h"
 #include "rtc_base/timeutils.h"
 #include "system_wrappers/include/metrics.h"
 

modules/audio_mixer/audio_mixer_impl.cc

@@ -18,6 +18,7 @@
 #include "modules/audio_mixer/audio_frame_manipulator.h"
 #include "modules/audio_mixer/default_output_rate_calculator.h"
 #include "rtc_base/logging.h"
+#include "rtc_base/refcountedobject.h"
 
 namespace webrtc {
 namespace {

modules/audio_processing/audio_processing_impl.cc

@@ -32,6 +32,7 @@
 #include "rtc_base/checks.h"
 #include "rtc_base/logging.h"
 #include "rtc_base/platform_file.h"
+#include "rtc_base/refcountedobject.h"
 #include "rtc_base/trace_event.h"
 #if WEBRTC_INTELLIGIBILITY_ENHANCER
 #include "modules/audio_processing/intelligibility/intelligibility_enhancer.h"

modules/audio_processing/audio_processing_unittest.cc

@@ -34,6 +34,7 @@
 #include "rtc_base/gtest_prod_util.h"
 #include "rtc_base/ignore_wundef.h"
 #include "rtc_base/protobuf_utils.h"
+#include "rtc_base/refcountedobject.h"
 #include "rtc_base/safe_minmax.h"
 #include "rtc_base/task_queue.h"
 #include "rtc_base/thread.h"

modules/desktop_capture/shared_desktop_frame.h

@@ -14,6 +14,7 @@
 #include "modules/desktop_capture/desktop_frame.h"
 #include "rtc_base/constructormagic.h"
 #include "rtc_base/refcount.h"
+#include "rtc_base/refcountedobject.h"
 #include "rtc_base/scoped_ref_ptr.h"
 
 namespace webrtc {

modules/video_capture/external/video_capture_external.cc

@@ -10,6 +10,7 @@
 
 #include "modules/video_capture/video_capture_impl.h"
 #include "rtc_base/refcount.h"
+#include "rtc_base/refcountedobject.h"
 
 namespace webrtc {
 

modules/video_capture/linux/video_capture_linux.cc

@@ -25,6 +25,7 @@
 
 #include "media/base/videocommon.h"
 #include "rtc_base/refcount.h"
+#include "rtc_base/refcountedobject.h"
 #include "rtc_base/scoped_ref_ptr.h"
 #include "rtc_base/logging.h"
 

modules/video_capture/objc/video_capture.mm

@@ -15,6 +15,7 @@
 #include "modules/video_capture/objc/device_info_objc.h"
 #include "modules/video_capture/objc/rtc_video_capture_objc.h"
 #include "rtc_base/refcount.h"
+#include "rtc_base/refcountedobject.h"
 #include "rtc_base/scoped_ref_ptr.h"
 
 using namespace webrtc;

modules/video_capture/video_capture_impl.cc

@@ -18,6 +18,7 @@
 #include "modules/video_capture/video_capture_config.h"
 #include "rtc_base/logging.h"
 #include "rtc_base/refcount.h"
+#include "rtc_base/refcountedobject.h"
 #include "rtc_base/timeutils.h"
 #include "rtc_base/trace_event.h"
 #include "system_wrappers/include/clock.h"

modules/video_capture/windows/video_capture_factory_windows.cc

@@ -11,6 +11,7 @@
 #include "modules/video_capture/windows/video_capture_ds.h"
 #include "modules/video_capture/windows/video_capture_mf.h"
 #include "rtc_base/refcount.h"
+#include "rtc_base/refcountedobject.h"
 #include "rtc_base/scoped_ref_ptr.h"
 
 namespace webrtc {

modules/video_coding/codecs/vp9/vp9_frame_buffer_pool.cc

@@ -17,6 +17,7 @@
 
 #include "rtc_base/checks.h"
 #include "rtc_base/logging.h"
+#include "rtc_base/refcountedobject.h"
 
 namespace webrtc {
 

modules/video_coding/video_codec_initializer_unittest.cc

@@ -13,6 +13,7 @@
 #include "common_types.h"  // NOLINT(build/include)
 #include "modules/video_coding/codecs/vp8/temporal_layers.h"
 #include "modules/video_coding/include/video_codec_initializer.h"
+#include "rtc_base/refcountedobject.h"
 #include "test/gtest.h"
 
 namespace webrtc {

pc/audiotrack.cc

@@ -11,6 +11,7 @@
 #include "pc/audiotrack.h"
 
 #include "rtc_base/checks.h"
+#include "rtc_base/refcountedobject.h"
 
 using rtc::scoped_refptr;
 

pc/mediastream.cc

@@ -11,6 +11,7 @@
 #include "pc/mediastream.h"
 #include "rtc_base/checks.h"
 #include "rtc_base/logging.h"
+#include "rtc_base/refcountedobject.h"
 
 namespace webrtc {
 

pc/test/fakeaudiocapturemodule.cc

@@ -12,6 +12,7 @@
 
 #include "rtc_base/checks.h"
 #include "rtc_base/refcount.h"
+#include "rtc_base/refcountedobject.h"
 #include "rtc_base/thread.h"
 #include "rtc_base/timeutils.h"
 

pc/videotrack.cc

@@ -9,6 +9,7 @@
  */
 
 #include "pc/videotrack.h"
+#include "rtc_base/refcountedobject.h"
 
 #include <string>
 

rtc_base/bind_unittest.cc

@@ -14,6 +14,7 @@
 #include "rtc_base/gunit.h"
 
 #include "rtc_base/refcount.h"
+#include "rtc_base/refcountedobject.h"
 
 namespace rtc {
 

rtc_base/callback.h

@@ -13,7 +13,7 @@
  */
 
 // To generate callback.h from callback.h.pump, execute:
-// /home/build/google3/third_party/gtest/scripts/pump.py callback.h.pump
+// ../third_party/googletest/src/googletest/scripts/pump.py callback.h.pump
 
 // Callbacks are callable object containers. They can hold a function pointer
 // or a function object and behave like a value type. Internally, data is
@@ -63,6 +63,7 @@
 #define RTC_BASE_CALLBACK_H_
 
 #include "rtc_base/refcount.h"
+#include "rtc_base/refcountedobject.h"
 #include "rtc_base/scoped_ref_ptr.h"
 
 namespace rtc {

rtc_base/callback.h.pump

@@ -9,7 +9,7 @@
  */
 
 // To generate callback.h from callback.h.pump, execute:
-// /home/build/google3/third_party/gtest/scripts/pump.py callback.h.pump
+// ../third_party/googletest/src/googletest/scripts/pump.py callback.h.pump
 
 // Callbacks are callable object containers. They can hold a function pointer
 // or a function object and behave like a value type. Internally, data is
@@ -58,6 +58,7 @@
 #define RTC_BASE_CALLBACK_H_
 
 #include "rtc_base/refcount.h"
+#include "rtc_base/refcountedobject.h"
 #include "rtc_base/scoped_ref_ptr.h"
 
 namespace rtc {

rtc_base/copyonwritebuffer.h

@@ -17,6 +17,7 @@
 #include "rtc_base/buffer.h"
 #include "rtc_base/checks.h"
 #include "rtc_base/refcount.h"
+#include "rtc_base/refcountedobject.h"
 #include "rtc_base/scoped_ref_ptr.h"
 
 namespace rtc {

rtc_base/refcount.h

@@ -10,8 +10,6 @@
 #ifndef RTC_BASE_REFCOUNT_H_
 #define RTC_BASE_REFCOUNT_H_
 
-#include "rtc_base/refcountedobject.h"
-
 namespace rtc {
 
 // Reference count interface.

rtc_base/refcountedobject_unittest.cc

@@ -12,6 +12,7 @@
 
 #include "rtc_base/gunit.h"
 #include "rtc_base/refcount.h"
+#include "rtc_base/refcountedobject.h"
 
 namespace rtc {
 

rtc_base/rtccertificate.cc

@@ -13,6 +13,7 @@
 #include "rtc_base/rtccertificate.h"
 
 #include "rtc_base/checks.h"
+#include "rtc_base/refcountedobject.h"
 
 namespace rtc {
 

rtc_base/rtccertificategenerator.cc

@@ -14,6 +14,7 @@
 #include <memory>
 
 #include "rtc_base/checks.h"
+#include "rtc_base/refcountedobject.h"
 #include "rtc_base/sslidentity.h"
 
 namespace rtc {

rtc_base/rtccertificategenerator_unittest.cc

@@ -16,6 +16,7 @@
 #include "rtc_base/checks.h"
 #include "rtc_base/gunit.h"
 #include "rtc_base/logging.h"
+#include "rtc_base/refcountedobject.h"
 #include "rtc_base/thread.h"
 
 namespace rtc {

rtc_base/weak_ptr.h

@@ -16,6 +16,7 @@
 #include <utility>
 
 #include "rtc_base/refcount.h"
+#include "rtc_base/refcountedobject.h"
 #include "rtc_base/scoped_ref_ptr.h"
 #include "rtc_base/sequenced_task_checker.h"
 

test/encoder_settings.cc

@@ -15,6 +15,7 @@
 #include "modules/video_coding/codecs/h264/include/h264.h"
 #include "modules/video_coding/codecs/vp8/include/vp8.h"
 #include "modules/video_coding/codecs/vp9/include/vp9.h"
+#include "rtc_base/refcountedobject.h"
 #include "test/fake_decoder.h"
 
 namespace webrtc {

test/mock_audio_decoder_factory.h

@@ -16,6 +16,7 @@
 
 #include "api/audio_codecs/audio_decoder_factory.h"
 #include "api/audio_codecs/builtin_audio_decoder_factory.h"
+#include "rtc_base/refcountedobject.h"
 #include "rtc_base/scoped_ref_ptr.h"
 #include "test/gmock.h"
 

voice_engine/voe_base_unittest.cc

@@ -12,6 +12,7 @@
 
 #include "modules/audio_device/include/fake_audio_device.h"
 #include "modules/audio_processing/include/mock_audio_processing.h"
+#include "rtc_base/refcountedobject.h"
 #include "test/gtest.h"
 
 namespace webrtc {