| Index: components/exo/gaming_seat_unittest.cc
 | 
| diff --git a/components/exo/gaming_seat_unittest.cc b/components/exo/gaming_seat_unittest.cc
 | 
| index 5a7893deb616c1828d6a5966fd64ff6932893924..282783ae001f2e820e46c687d3e843752afc7340 100644
 | 
| --- a/components/exo/gaming_seat_unittest.cc
 | 
| +++ b/components/exo/gaming_seat_unittest.cc
 | 
| @@ -42,9 +42,9 @@ class MockGamepadDelegate : public GamepadDelegate {
 | 
|    MOCK_METHOD0(OnFrame, void());
 | 
|  };
 | 
|  
 | 
| -class GamingSeatTest : public test::ExoTestBase {
 | 
| +class GamingSeatJoydevTest : public test::ExoTestBase {
 | 
|   public:
 | 
| -  GamingSeatTest() {}
 | 
| +  GamingSeatJoydevTest() {}
 | 
|  
 | 
|    std::unique_ptr<device::GamepadDataFetcher> MockDataFetcherFactory() {
 | 
|      device::Gamepads initial_data;
 | 
| @@ -58,7 +58,7 @@ class GamingSeatTest : public test::ExoTestBase {
 | 
|      polling_task_runner_ = new base::TestSimpleTaskRunner();
 | 
|      gaming_seat_.reset(
 | 
|          new GamingSeat(delegate, polling_task_runner_.get(),
 | 
| -                       base::Bind(&GamingSeatTest::MockDataFetcherFactory,
 | 
| +                       base::Bind(&GamingSeatJoydevTest::MockDataFetcherFactory,
 | 
|                                    base::Unretained(this))));
 | 
|      // Run the polling task runner to have it create the data fetcher.
 | 
|      polling_task_runner_->RunPendingTasks();
 | 
| @@ -93,10 +93,10 @@ class GamingSeatTest : public test::ExoTestBase {
 | 
|    // shut down.
 | 
|    device::MockGamepadDataFetcher* mock_data_fetcher_;
 | 
|  
 | 
| -  DISALLOW_COPY_AND_ASSIGN(GamingSeatTest);
 | 
| +  DISALLOW_COPY_AND_ASSIGN(GamingSeatJoydevTest);
 | 
|  };
 | 
|  
 | 
| -TEST_F(GamingSeatTest, ConnectionChange) {
 | 
| +TEST_F(GamingSeatJoydevTest, ConnectionChange) {
 | 
|    std::unique_ptr<Surface> surface(new Surface);
 | 
|    std::unique_ptr<ShellSurface> shell_surface(new ShellSurface(surface.get()));
 | 
|    gfx::Size buffer_size(10, 10);
 | 
| @@ -158,7 +158,7 @@ TEST_F(GamingSeatTest, ConnectionChange) {
 | 
|    DestroyGamingSeat(gaming_seat_delegate);
 | 
|  }
 | 
|  
 | 
| -TEST_F(GamingSeatTest, OnAxis) {
 | 
| +TEST_F(GamingSeatJoydevTest, OnAxis) {
 | 
|    std::unique_ptr<Surface> surface(new Surface);
 | 
|    std::unique_ptr<ShellSurface> shell_surface(new ShellSurface(surface.get()));
 | 
|    gfx::Size buffer_size(10, 10);
 | 
| @@ -217,7 +217,7 @@ TEST_F(GamingSeatTest, OnAxis) {
 | 
|    DestroyGamingSeat(gaming_seat_delegate);
 | 
|  }
 | 
|  
 | 
| -TEST_F(GamingSeatTest, OnButton) {
 | 
| +TEST_F(GamingSeatJoydevTest, OnButton) {
 | 
|    std::unique_ptr<Surface> surface(new Surface);
 | 
|    std::unique_ptr<ShellSurface> shell_surface(new ShellSurface(surface.get()));
 | 
|    gfx::Size buffer_size(10, 10);
 | 
| @@ -280,7 +280,7 @@ TEST_F(GamingSeatTest, OnButton) {
 | 
|    DestroyGamingSeat(gaming_seat_delegate);
 | 
|  }
 | 
|  
 | 
| -TEST_F(GamingSeatTest, OnWindowFocused) {
 | 
| +TEST_F(GamingSeatJoydevTest, OnWindowFocused) {
 | 
|    // Create surface and move focus to it.
 | 
|    std::unique_ptr<Surface> surface(new Surface);
 | 
|    std::unique_ptr<ShellSurface> shell_surface(new ShellSurface(surface.get()));
 | 
| 
 |