Change exo::SurfaceFactoryOwner to exo::ExoCompositorFrameSink

components/exo/gamepad_unittest.cc

 // Copyright 2015 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 "ash/shell.h"
 #include "base/command_line.h"
 #include "base/run_loop.h"
 #include "base/test/test_simple_task_runner.h"
 #include "components/exo/buffer.h"
 #include "components/exo/gamepad.h"
@@ skipping 44 matching lines @@
     polling_task_runner_->RunPendingTasks();
   }
 
   void DestroyGamepad(MockGamepadDelegate* delegate) {
     EXPECT_CALL(*delegate, OnGamepadDestroying(testing::_)).Times(1);
     mock_data_fetcher_ = nullptr;
     gamepad_.reset();
     // Process tasks until polling is shut down.
     polling_task_runner_->RunPendingTasks();
     polling_task_runner_ = nullptr;
+    base::RunLoop().RunUntilIdle();

[reveman, 2016/12/07 00:46:57]

why is this needed?

[Alex Z., 2016/12/07 20:09:35]

Good catch. It is not. It is some leftover from debugging that I missed.

   }
 
   void SetDataAndPostToDelegate(const blink::WebGamepads& new_data) {
     ASSERT_TRUE(mock_data_fetcher_ != nullptr);
     mock_data_fetcher_->SetTestData(new_data);
     // Run one polling cycle, which will post a task to the origin task runner.
     polling_task_runner_->RunPendingTasks();
     // Run origin task runner to invoke delegate.
+
     base::RunLoop().RunUntilIdle();
   }
 
  protected:
   std::unique_ptr<Gamepad> gamepad_;
 
   // Task runner to simulate the polling thread.
   scoped_refptr<base::TestSimpleTaskRunner> polling_task_runner_;
 
   // Weak reference to the mock data fetcher provided by MockDataFetcherFactory.
@@ skipping 26 matching lines @@
   gamepad_connected.items[0].connected = true;
   gamepad_connected.items[0].timestamp = 1;
   SetDataAndPostToDelegate(gamepad_connected);
 
   // Gamepad disconnected.
   blink::WebGamepads all_disconnected;
   EXPECT_CALL(delegate, OnStateChange(false)).Times(1);
   SetDataAndPostToDelegate(all_disconnected);
 
   DestroyGamepad(&delegate);
+  RunAllPendingInMessageLoop();

[reveman, 2016/12/07 00:46:57]

and this?

[Alex Z., 2016/12/07 20:09:36]

Same as above.

 }
 
 TEST_F(GamepadTest, OnAxis) {
   std::unique_ptr<Surface> surface(new Surface);
   std::unique_ptr<ShellSurface> shell_surface(new ShellSurface(surface.get()));
   gfx::Size buffer_size(10, 10);
   std::unique_ptr<Buffer> buffer(
       new Buffer(exo_test_helper()->CreateGpuMemoryBuffer(buffer_size)));
   surface->Attach(buffer.get());
   surface->Commit();
@@ skipping 84 matching lines @@
   // scheduled in the next round.
   polling_task_runner_->RunPendingTasks();
   polling_task_runner_->RunPendingTasks();
   ASSERT_FALSE(polling_task_runner_->HasPendingTask());
 
   DestroyGamepad(&delegate);
 }
 
 }  // namespace
 }  // namespace exo