Chromium Code Reviews| Index: blimp/client/feature/compositor/blimp_compositor_unittest.cc |
| diff --git a/blimp/client/feature/compositor/blimp_compositor_unittest.cc b/blimp/client/feature/compositor/blimp_compositor_unittest.cc |
| index da76475c7a3352ed5ce5b9e04ffce23e81b2f3bf..912de124b61de6ca18d430fd2595049948425dcb 100644 |
| --- a/blimp/client/feature/compositor/blimp_compositor_unittest.cc |
| +++ b/blimp/client/feature/compositor/blimp_compositor_unittest.cc |
| @@ -6,7 +6,7 @@ |
| #include "base/thread_task_runner_handle.h" |
| #include "blimp/client/feature/compositor/blimp_gpu_memory_buffer_manager.h" |
| -#include "blimp/common/compositor/blimp_image_serialization_processor.h" |
| +#include "blimp/client/feature/compositor/client_image_serialization_processor.h" |
| #include "blimp/common/compositor/blimp_task_graph_runner.h" |
| #include "cc/proto/compositor_message.pb.h" |
| #include "testing/gmock/include/gmock/gmock.h" |
| @@ -20,9 +20,7 @@ namespace client { |
| class MockBlimpCompositorClient : public BlimpCompositorClient { |
| public: |
| MockBlimpCompositorClient() |
| - : compositor_thread_("Compositor"), |
| - image_serialization_processor_( |
| - BlimpImageSerializationProcessor::Mode::DESERIALIZATION) { |
| + : compositor_thread_("Compositor"), image_serialization_processor_() { |
|
Kevin M
2016/05/05 19:34:40
No need to initialize image_serialization_processo
nyquist
2016/05/05 21:26:08
Done.
|
| compositor_thread_.Start(); |
| } |
| ~MockBlimpCompositorClient() override { compositor_thread_.Stop(); } |
| @@ -58,7 +56,7 @@ class MockBlimpCompositorClient : public BlimpCompositorClient { |
| base::Thread compositor_thread_; |
| BlimpTaskGraphRunner task_graph_runner_; |
| BlimpGpuMemoryBufferManager gpu_memory_buffer_manager_; |
| - BlimpImageSerializationProcessor image_serialization_processor_; |
| + ClientImageSerializationProcessor image_serialization_processor_; |
| }; |
| class BlimpCompositorForTesting : public BlimpCompositor { |