Move async_socket_io_handler.* from media/ to base/

TBR=darin Review URL: https://chromiumcodereview.appspot.com/23137015 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@219000 0039d316-1c4b-4281-b951-d872f2087c98
GuoXi · Aug 22, 2013 · 39cb64f · 39cb64f
1 parent 7794f0f
commit 39cb64f
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 16 deletions.
diff --git a/media/audio/async_socket_io_handler.h → base/async_socket_io_handler.h b/media/audio/async_socket_io_handler.h → base/async_socket_io_handler.h
@@ -1,14 +1,13 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MEDIA_AUDIO_ASYNC_SOCKET_IO_HANDLER_H_
-#define MEDIA_AUDIO_ASYNC_SOCKET_IO_HANDLER_H_
+#ifndef BASE_ASYNC_SOCKET_IO_HANDLER_H_
+#define BASE_ASYNC_SOCKET_IO_HANDLER_H_
 
 #include "base/message_loop/message_loop.h"
 #include "base/sync_socket.h"
 #include "base/threading/non_thread_safe.h"
-#include "media/base/media_export.h"
 
 namespace media {
 
@@ -52,7 +51,7 @@ typedef base::MessageLoopForIO::Watcher MessageLoopIOHandler;
 //   char buffer_[kBufferSize];
 // };
 //
-class MEDIA_EXPORT AsyncSocketIoHandler
+class BASE_EXPORT AsyncSocketIoHandler
     : public NON_EXPORTED_BASE(base::NonThreadSafe),
       public NON_EXPORTED_BASE(MessageLoopIOHandler) {
  public:
@@ -110,4 +109,4 @@ class MEDIA_EXPORT AsyncSocketIoHandler
 
 }  // namespace media.
 
-#endif  // MEDIA_AUDIO_ASYNC_SOCKET_IO_HANDLER_H_
+#endif  // BASE_ASYNC_SOCKET_IO_HANDLER_H_
diff --git a/media/audio/async_socket_io_handler_posix.cc → base/async_socket_io_handler_posix.cc b/media/audio/async_socket_io_handler_posix.cc → base/async_socket_io_handler_posix.cc
@@ -1,8 +1,8 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "media/audio/async_socket_io_handler.h"
+#include "base/async_socket_io_handler.h"
 
 #include <fcntl.h>
 

diff --git a/...audio/async_socket_io_handler_unittest.cc → base/async_socket_io_handler_unittest.cc b/...audio/async_socket_io_handler_unittest.cc → base/async_socket_io_handler_unittest.cc
@@ -1,8 +1,8 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "media/audio/async_socket_io_handler.h"
+#include "base/async_socket_io_handler.h"
 
 #include "base/bind.h"
 #include "testing/gtest/include/gtest/gtest.h"

diff --git a/media/audio/async_socket_io_handler_win.cc → base/async_socket_io_handler_win.cc b/media/audio/async_socket_io_handler_win.cc → base/async_socket_io_handler_win.cc
@@ -1,8 +1,8 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "media/audio/async_socket_io_handler.h"
+#include "base/async_socket_io_handler.h"
 
 namespace media {
 

diff --git a/base/base.gyp b/base/base.gyp
@@ -237,6 +237,9 @@
         'third_party/nspr/prtypes.h',
         'third_party/xdg_user_dirs/xdg_user_dir_lookup.cc',
         'third_party/xdg_user_dirs/xdg_user_dir_lookup.h',
+        'async_socket_io_handler.h',
+        'async_socket_io_handler_posix.cc',
+        'async_socket_io_handler_win.cc',
         'auto_reset.h',
         'event_recorder.h',
         'event_recorder_stubs.cc',
@@ -447,6 +450,7 @@
         'android/jni_string_unittest.cc',
         'android/path_utils_unittest.cc',
         'android/scoped_java_ref_unittest.cc',
+        'async_socket_io_handler_unittest.cc',
         'at_exit_unittest.cc',
         'atomicops_unittest.cc',
         'base64_unittest.cc',

diff --git a/media/media.gyp b/media/media.gyp
@@ -60,9 +60,6 @@
         'audio/android/opensles_input.h',
         'audio/android/opensles_output.cc',
         'audio/android/opensles_output.h',
-        'audio/async_socket_io_handler.h',
-        'audio/async_socket_io_handler_posix.cc',
-        'audio/async_socket_io_handler_win.cc',
         'audio/audio_buffers_state.cc',
         'audio/audio_buffers_state.h',
         'audio/audio_device_name.cc',
@@ -910,7 +907,6 @@
         '../ui/ui.gyp:ui',
       ],
       'sources': [
-        'audio/async_socket_io_handler_unittest.cc',
         'audio/audio_input_controller_unittest.cc',
         'audio/audio_input_device_unittest.cc',
         'audio/audio_input_unittest.cc',