Moved the video encoders/decoders to the codec directory.

Review URL: https://chromiumcodereview.appspot.com/10877014

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@152912 0039d316-1c4b-4281-b951-d872f2087c98

27 files changed, 94 insertions, 117 deletions

diff --git a/remoting/base/base_mock_objects.cc b/remoting/base/base_mock_objects.cc
deleted file mode 100644
index d76a965..0000000
--- a/remoting/base/base_mock_objects.cc
+++ /dev/null
@@ -1,13 +0,0 @@
-// Copyright (c) 2011 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 "remoting/base/base_mock_objects.h"
-
-namespace remoting {
-
-MockEncoder::MockEncoder() {}
-
-MockEncoder::~MockEncoder() {}
-
-}  // namespace remoting
diff --git a/remoting/base/base_mock_objects.h b/remoting/base/base_mock_objects.h
deleted file mode 100644
index e90530d..0000000
--- a/remoting/base/base_mock_objects.h
+++ /dev/null
@@ -1,31 +0,0 @@
-// Copyright (c) 2010 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 REMOTING_BASE_BASE_MOCK_OBJECTS_H_
-#define REMOTING_BASE_BASE_MOCK_OBJECTS_H_
-
-#include "remoting/base/capture_data.h"
-#include "remoting/base/decoder.h"
-#include "remoting/base/encoder.h"
-#include "testing/gmock/include/gmock/gmock.h"
-
-namespace remoting {
-
-class MockEncoder : public Encoder {
- public:
-  MockEncoder();
-  virtual ~MockEncoder();
-
-  MOCK_METHOD3(Encode, void(
-      scoped_refptr<CaptureData> capture_data,
-      bool key_frame,
-      const DataAvailableCallback& data_available_callback));
-
- private:
-  DISALLOW_COPY_AND_ASSIGN(MockEncoder);
-};
-
-}  // namespace remoting
-
-#endif  // REMOTING_BASE_BASE_MOCK_OBJECTS_H_
diff --git a/remoting/client/rectangle_update_decoder.cc b/remoting/client/rectangle_update_decoder.cc
index 1b4a771..16638ad 100644
--- a/remoting/client/rectangle_update_decoder.cc
+++ b/remoting/client/rectangle_update_decoder.cc
@@ -11,10 +11,10 @@
 #include "base/logging.h"
 #include "base/message_loop_proxy.h"
 #include "ppapi/cpp/image_data.h"
-#include "remoting/base/decoder.h"
-#include "remoting/base/decoder_row_based.h"
-#include "remoting/base/decoder_vp8.h"
 #include "remoting/base/util.h"
+#include "remoting/codec/video_decoder.h"
+#include "remoting/codec/video_decoder_row_based.h"
+#include "remoting/codec/video_decoder_vp8.h"
 #include "remoting/client/frame_consumer.h"
 #include "remoting/protocol/session_config.h"
 
diff --git a/remoting/client/rectangle_update_decoder.h b/remoting/client/rectangle_update_decoder.h
index fdee520..afe0f28 100644
--- a/remoting/client/rectangle_update_decoder.h
+++ b/remoting/client/rectangle_update_decoder.h
@@ -10,7 +10,7 @@
 #include "base/callback_forward.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
-#include "remoting/base/decoder.h"
+#include "remoting/codec/video_decoder.h"
 #include "remoting/client/frame_consumer_proxy.h"
 #include "remoting/client/frame_producer.h"
 
diff --git a/remoting/base/codec_test.cc b/remoting/codec/codec_test.cc
index 6813c66..d811e78 100644
--- a/remoting/base/codec_test.cc
+++ b/remoting/codec/codec_test.cc
@@ -9,10 +9,9 @@
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "media/base/video_frame.h"
-#include "remoting/base/base_mock_objects.h"
-#include "remoting/base/codec_test.h"
-#include "remoting/base/decoder.h"
-#include "remoting/base/encoder.h"
+#include "remoting/codec/codec_test.h"
+#include "remoting/codec/video_decoder.h"
+#include "remoting/codec/video_encoder.h"
 #include "remoting/base/util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
diff --git a/remoting/base/codec_test.h b/remoting/codec/codec_test.h
index ba71dad..e7168ed 100644
--- a/remoting/base/codec_test.h
+++ b/remoting/codec/codec_test.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef REMOTING_BASE_CODEC_TEST_H_
-#define REMOTING_BASE_CODEC_TEST_H_
+#ifndef REMOTING_CODEC_CODEC_TEST_H_
+#define REMOTING_CODEC_CODEC_TEST_H_
 
 #include "base/memory/ref_counted.h"
 #include "media/base/video_frame.h"
@@ -37,4 +37,4 @@ void TestEncoderDecoderGradient(Encoder* encoder, Decoder* decoder,
 
 }  // namespace remoting
 
-#endif  // REMOTING_BASE_CODEC_TEST_H_
+#endif  // REMOTING_CODEC_CODEC_TEST_H_
diff --git a/remoting/base/decoder.h b/remoting/codec/video_decoder.h
index 9286ab5..70e5723 100644
--- a/remoting/base/decoder.h
+++ b/remoting/codec/video_decoder.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef REMOTING_BASE_DECODER_H_
-#define REMOTING_BASE_DECODER_H_
+#ifndef REMOTING_CODEC_VIDEO_DECODER_H_
+#define REMOTING_CODEC_VIDEO_DECODER_H_
 
 #include "base/basictypes.h"
 #include "remoting/proto/video.pb.h"
@@ -72,4 +72,4 @@ class Decoder {
 
 }  // namespace remoting
 
-#endif  // REMOTING_BASE_DECODER_H_
+#endif  // REMOTING_CODEC_VIDEO_DECODER_H_
diff --git a/remoting/base/decoder_row_based.cc b/remoting/codec/video_decoder_row_based.cc
index d98a5ca..7072a6f 100644
--- a/remoting/base/decoder_row_based.cc
+++ b/remoting/codec/video_decoder_row_based.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "remoting/base/decoder_row_based.h"
+#include "remoting/codec/video_decoder_row_based.h"
 
 #include "base/logging.h"
 #include "remoting/base/decompressor.h"
diff --git a/remoting/base/decoder_row_based.h b/remoting/codec/video_decoder_row_based.h
index fc76837..258809d 100644
--- a/remoting/base/decoder_row_based.h
+++ b/remoting/codec/video_decoder_row_based.h
@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef REMOTING_BASE_DECODER_ROW_BASED_H_
-#define REMOTING_BASE_DECODER_ROW_BASED_H_
+#ifndef REMOTING_CODEC_VIDEO_DECODER_ROW_BASED_H_
+#define REMOTING_CODEC_VIDEO_DECODER_ROW_BASED_H_
 
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
-#include "remoting/base/decoder.h"
+#include "remoting/codec/video_decoder.h"
 
 namespace remoting {
 
@@ -81,4 +81,4 @@ class DecoderRowBased : public Decoder {
 
 }  // namespace remoting
 
-#endif  // REMOTING_BASE_DECODER_ROW_BASED_H_
+#endif  // REMOTING_CODEC_VIDEO_DECODER_ROW_BASED_H_
diff --git a/remoting/base/decoder_vp8.cc b/remoting/codec/video_decoder_vp8.cc
index 74fd8a8..6a8d7c0 100644
--- a/remoting/base/decoder_vp8.cc
+++ b/remoting/codec/video_decoder_vp8.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "remoting/base/decoder_vp8.h"
+#include "remoting/codec/video_decoder_vp8.h"
 
 #include <math.h>
 
diff --git a/remoting/base/decoder_vp8.h b/remoting/codec/video_decoder_vp8.h
index 53029e2..2095fbb 100644
--- a/remoting/base/decoder_vp8.h
+++ b/remoting/codec/video_decoder_vp8.h
@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef REMOTING_BASE_DECODER_VP8_H_
-#define REMOTING_BASE_DECODER_VP8_H_
+#ifndef REMOTING_CODEC_VIDEO_DECODER_VP8_H_
+#define REMOTING_CODEC_VIDEO_DECODER_VP8_H_
 
 #include "base/compiler_specific.h"
-#include "remoting/base/decoder.h"
+#include "remoting/codec/video_decoder.h"
 
 typedef struct vpx_codec_ctx vpx_codec_ctx_t;
 typedef struct vpx_image vpx_image_t;
@@ -57,4 +57,4 @@ class DecoderVp8 : public Decoder {
 
 }  // namespace remoting
 
-#endif  // REMOTING_BASE_DECODER_VP8_H_
+#endif  // REMOTING_CODEC_VIDEO_DECODER_VP8_H_
diff --git a/remoting/base/decoder_vp8_unittest.cc b/remoting/codec/video_decoder_vp8_unittest.cc
index 553d27c..472dda8 100644
--- a/remoting/base/decoder_vp8_unittest.cc
+++ b/remoting/codec/video_decoder_vp8_unittest.cc
@@ -2,10 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include "remoting/codec/video_decoder_vp8.h"
+
 #include "media/base/video_frame.h"
-#include "remoting/base/codec_test.h"
-#include "remoting/base/decoder_vp8.h"
-#include "remoting/base/encoder_vp8.h"
+#include "remoting/codec/codec_test.h"
+#include "remoting/codec/video_encoder_vp8.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace remoting {
diff --git a/remoting/base/encode_decode_unittest.cc b/remoting/codec/video_encode_decode_unittest.cc
index 10baf7c..fac0efa 100644
--- a/remoting/base/encode_decode_unittest.cc
+++ b/remoting/codec/video_encode_decode_unittest.cc
@@ -2,10 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include "remoting/codec/video_encoder_row_based.h"
+
 #include "media/base/video_frame.h"
-#include "remoting/base/codec_test.h"
-#include "remoting/base/decoder_row_based.h"
-#include "remoting/base/encoder_row_based.h"
+#include "remoting/codec/codec_test.h"
+#include "remoting/codec/video_decoder_row_based.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace remoting {
diff --git a/remoting/base/encoder.h b/remoting/codec/video_encoder.h
index ae6fadc..83fb308 100644
--- a/remoting/base/encoder.h
+++ b/remoting/codec/video_encoder.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef REMOTING_BASE_ENCODER_H_
-#define REMOTING_BASE_ENCODER_H_
+#ifndef REMOTING_CODEC_VIDEO_ENCODER_H_
+#define REMOTING_CODEC_VIDEO_ENCODER_H_
 
 #include "base/basictypes.h"
 #include "base/callback.h"
@@ -45,4 +45,4 @@ class Encoder {
 
 }  // namespace remoting
 
-#endif  // REMOTING_BASE_ENCODER_H_
+#endif  // REMOTING_CODEC_VIDEO_ENCODER_H_
diff --git a/remoting/base/encoder_row_based.cc b/remoting/codec/video_encoder_row_based.cc
index c28c06c..f3b0ef6 100644
--- a/remoting/base/encoder_row_based.cc
+++ b/remoting/codec/video_encoder_row_based.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "remoting/base/encoder_row_based.h"
+#include "remoting/codec/video_encoder_row_based.h"
 
 #include "base/logging.h"
 #include "remoting/base/capture_data.h"
diff --git a/remoting/base/encoder_row_based.h b/remoting/codec/video_encoder_row_based.h
index 5d8a877..7762f92 100644
--- a/remoting/base/encoder_row_based.h
+++ b/remoting/codec/video_encoder_row_based.h
@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef REMOTING_BASE_ENCODER_ROW_BASED_H_
-#define REMOTING_BASE_ENCODER_ROW_BASED_H_
+#ifndef REMOTING_CODEC_VIDEO_ENCODER_ROW_BASED_H_
+#define REMOTING_CODEC_VIDEO_ENCODER_ROW_BASED_H_
 
-#include "remoting/base/encoder.h"
+#include "remoting/codec/video_encoder.h"
 #include "remoting/proto/video.pb.h"
 #include "third_party/skia/include/core/SkRect.h"
 
@@ -68,4 +68,4 @@ class EncoderRowBased : public Encoder {
 
 }  // namespace remoting
 
-#endif  // REMOTING_BASE_ENCODER_ROW_BASED_H_
+#endif  // REMOTING_CODEC_VIDEO_ENCODER_ROW_BASED_H_
diff --git a/remoting/base/encoder_row_based_unittest.cc b/remoting/codec/video_encoder_row_based_unittest.cc
index 735e806..76a75b5 100644
--- a/remoting/base/encoder_row_based_unittest.cc
+++ b/remoting/codec/video_encoder_row_based_unittest.cc
@@ -2,8 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "remoting/base/codec_test.h"
-#include "remoting/base/encoder_row_based.h"
+#include "remoting/codec/video_encoder_row_based.h"
+
+#include "remoting/codec/codec_test.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace remoting {
diff --git a/remoting/base/encoder_vp8.cc b/remoting/codec/video_encoder_vp8.cc
index f329948..d3a5fca 100644
--- a/remoting/base/encoder_vp8.cc
+++ b/remoting/codec/video_encoder_vp8.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "remoting/base/encoder_vp8.h"
+#include "remoting/codec/video_encoder_vp8.h"
 
 #include "base/logging.h"
 #include "base/sys_info.h"
diff --git a/remoting/base/encoder_vp8.h b/remoting/codec/video_encoder_vp8.h
index b9883a5..05aeea1 100644
--- a/remoting/base/encoder_vp8.h
+++ b/remoting/codec/video_encoder_vp8.h
@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef REMOTING_BASE_ENCODER_VP8_H_
-#define REMOTING_BASE_ENCODER_VP8_H_
+#ifndef REMOTING_CODEC_VIDEO_ENCODER_VP8_H_
+#define REMOTING_CODEC_VIDEO_ENCODER_VP8_H_
 
 #include "base/gtest_prod_util.h"
-#include "remoting/base/encoder.h"
+#include "remoting/codec/video_encoder.h"
 #include "third_party/skia/include/core/SkRegion.h"
 
 typedef struct vpx_codec_ctx vpx_codec_ctx_t;
@@ -61,4 +61,4 @@ class EncoderVp8 : public Encoder {
 
 }  // namespace remoting
 
-#endif  // REMOTING_BASE_ENCODER_VP8_H_
+#endif  // REMOTING_CODEC_VIDEO_ENCODER_VP8_H_
diff --git a/remoting/base/encoder_vp8_unittest.cc b/remoting/codec/video_encoder_vp8_unittest.cc
index 635284b..8fe3e27 100644
--- a/remoting/base/encoder_vp8_unittest.cc
+++ b/remoting/codec/video_encoder_vp8_unittest.cc
@@ -2,6 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include "remoting/codec/video_encoder_vp8.h"
+
 #include <limits>
 #include <vector>
 
@@ -9,8 +11,7 @@
 #include "base/callback.h"
 #include "base/memory/scoped_ptr.h"
 #include "remoting/base/capture_data.h"
-#include "remoting/base/codec_test.h"
-#include "remoting/base/encoder_vp8.h"
+#include "remoting/codec/codec_test.h"
 #include "remoting/proto/video.pb.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
diff --git a/remoting/host/chromoting_host.cc b/remoting/host/chromoting_host.cc
index 4ef9de1..d70085fb 100644
--- a/remoting/host/chromoting_host.cc
+++ b/remoting/host/chromoting_host.cc
@@ -10,12 +10,12 @@
 #include "base/message_loop_proxy.h"
 #include "build/build_config.h"
 #include "remoting/base/constants.h"
-#include "remoting/base/encoder.h"
-#include "remoting/base/encoder_row_based.h"
-#include "remoting/base/encoder_vp8.h"
 #include "remoting/codec/audio_encoder.h"
 #include "remoting/codec/audio_encoder_speex.h"
 #include "remoting/codec/audio_encoder_verbatim.h"
+#include "remoting/codec/video_encoder.h"
+#include "remoting/codec/video_encoder_row_based.h"
+#include "remoting/codec/video_encoder_vp8.h"
 #include "remoting/host/audio_scheduler.h"
 #include "remoting/host/chromoting_host_context.h"
 #include "remoting/host/desktop_environment.h"
diff --git a/remoting/host/chromoting_host.h b/remoting/host/chromoting_host.h
index ee745c8..4893347 100644
--- a/remoting/host/chromoting_host.h
+++ b/remoting/host/chromoting_host.h
@@ -12,7 +12,7 @@
 #include "base/observer_list.h"
 #include "base/threading/thread.h"
 #include "net/base/backoff_entry.h"
-#include "remoting/base/encoder.h"
+#include "remoting/codec/video_encoder.h"
 #include "remoting/host/client_session.h"
 #include "remoting/host/desktop_environment.h"
 #include "remoting/host/host_key_pair.h"
diff --git a/remoting/host/screen_recorder.h b/remoting/host/screen_recorder.h
index 2c343d3..97a811b 100644
--- a/remoting/host/screen_recorder.h
+++ b/remoting/host/screen_recorder.h
@@ -13,7 +13,7 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/time.h"
 #include "base/timer.h"
-#include "remoting/base/encoder.h"
+#include "remoting/codec/video_encoder.h"
 #include "remoting/host/capture_scheduler.h"
 #include "remoting/proto/video.pb.h"
 
diff --git a/remoting/host/screen_recorder_unittest.cc b/remoting/host/screen_recorder_unittest.cc
index bfd3a50..5642313 100644
--- a/remoting/host/screen_recorder_unittest.cc
+++ b/remoting/host/screen_recorder_unittest.cc
@@ -6,7 +6,8 @@
 
 #include "base/bind.h"
 #include "base/message_loop.h"
-#include "remoting/base/base_mock_objects.h"
+#include "remoting/base/capture_data.h"
+#include "remoting/codec/video_encoder.h"
 #include "remoting/host/host_mock_objects.h"
 #include "remoting/proto/video.pb.h"
 #include "remoting/protocol/protocol_mock_objects.h"
@@ -68,6 +69,24 @@ static const media::VideoFrame::Format kFormat = media::VideoFrame::RGB32;
 static const VideoPacketFormat::Encoding kEncoding =
     VideoPacketFormat::ENCODING_VERBATIM;
 
+class MockEncoder : public Encoder {
+ public:
+  MockEncoder();
+  virtual ~MockEncoder();
+
+  MOCK_METHOD3(Encode, void(
+      scoped_refptr<CaptureData> capture_data,
+      bool key_frame,
+      const DataAvailableCallback& data_available_callback));
+
+ private:
+  DISALLOW_COPY_AND_ASSIGN(MockEncoder);
+};
+
+MockEncoder::MockEncoder() {}
+
+MockEncoder::~MockEncoder() {}
+
 class ScreenRecorderTest : public testing::Test {
  public:
   ScreenRecorderTest() {
diff --git a/remoting/protocol/DEPS b/remoting/protocol/DEPS
index 09d966f..8b14bb2 100644
--- a/remoting/protocol/DEPS
+++ b/remoting/protocol/DEPS
@@ -5,6 +5,7 @@ include_rules = [
   "+ppapi/c",
   "+ppapi/cpp",
   "+ppapi/utility",
+  "+remoting/codec",
   "+remoting/jingle_glue",
   "+third_party/libjingle",
   "+third_party/protobuf/src",
diff --git a/remoting/protocol/connection_to_client_unittest.cc b/remoting/protocol/connection_to_client_unittest.cc
index 69f1879..043ecdd 100644
--- a/remoting/protocol/connection_to_client_unittest.cc
+++ b/remoting/protocol/connection_to_client_unittest.cc
@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include "remoting/protocol/connection_to_client.h"
+
 #include "base/bind.h"
 #include "base/message_loop.h"
 #include "base/message_loop_proxy.h"
-#include "remoting/base/base_mock_objects.h"
 #include "remoting/base/constants.h"
 #include "remoting/protocol/fake_session.h"
-#include "remoting/protocol/connection_to_client.h"
 #include "remoting/protocol/protocol_mock_objects.h"
 #include "testing/gmock/include/gmock/gmock.h"
 
diff --git a/remoting/remoting.gyp b/remoting/remoting.gyp
index 5337bd2..6d4922b 100644
--- a/remoting/remoting.gyp
+++ b/remoting/remoting.gyp
@@ -1136,21 +1136,11 @@
         'base/compressor_zlib.h',
         'base/constants.cc',
         'base/constants.h',
-        'base/decoder.h',
-        'base/decoder_vp8.cc',
-        'base/decoder_vp8.h',
-        'base/decoder_row_based.cc',
-        'base/decoder_row_based.h',
         'base/decompressor.h',
         'base/decompressor_verbatim.cc',
         'base/decompressor_verbatim.h',
         'base/decompressor_zlib.cc',
         'base/decompressor_zlib.h',
-        'base/encoder.h',
-        'base/encoder_vp8.cc',
-        'base/encoder_vp8.h',
-        'base/encoder_row_based.cc',
-        'base/encoder_row_based.h',
         'base/plugin_thread_task_runner.cc',
         'base/plugin_thread_task_runner.h',
         'base/rate_counter.cc',
@@ -1174,6 +1164,16 @@
         'codec/audio_encoder_speex.h',
         'codec/audio_encoder_verbatim.cc',
         'codec/audio_encoder_verbatim.h',
+        'codec/video_decoder.h',
+        'codec/video_decoder_vp8.cc',
+        'codec/video_decoder_vp8.h',
+        'codec/video_decoder_row_based.cc',
+        'codec/video_decoder_row_based.h',
+        'codec/video_encoder.h',
+        'codec/video_encoder_vp8.cc',
+        'codec/video_encoder_vp8.h',
+        'codec/video_encoder_row_based.cc',
+        'codec/video_encoder_row_based.h',
       ],
     },  # end of target 'remoting_base'
 
@@ -1729,21 +1729,19 @@
       ],
       'sources': [
         'base/auth_token_util_unittest.cc',
-        'base/base_mock_objects.cc',
-        'base/base_mock_objects.h',
         'base/breakpad_win_unittest.cc',
-        'base/codec_test.cc',
-        'base/codec_test.h',
         'base/compound_buffer_unittest.cc',
         'base/compressor_zlib_unittest.cc',
-        'base/decoder_vp8_unittest.cc',
         'base/decompressor_zlib_unittest.cc',
-        'base/encode_decode_unittest.cc',
-        'base/encoder_vp8_unittest.cc',
-        'base/encoder_row_based_unittest.cc',
         'base/util_unittest.cc',
         'client/key_event_mapper_unittest.cc',
         'client/plugin/mac_key_event_processor_unittest.cc',
+        'codec/codec_test.cc',
+        'codec/codec_test.h',
+        'codec/video_decoder_vp8_unittest.cc',
+        'codec/video_encode_decode_unittest.cc',
+        'codec/video_encoder_row_based_unittest.cc',
+        'codec/video_encoder_vp8_unittest.cc',
         'host/audio_capturer_win_unittest.cc',
         'host/chromoting_host_context_unittest.cc',
         'host/chromoting_host_unittest.cc',