Rename PlatformScreen implementations.

services/ui/display/platform_screen_ozone_unittests.cc

 // Copyright 2016 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 <memory>
 #include <vector>
 
 #include "base/logging.h"
 #include "base/memory/ptr_util.h"
 #include "services/ui/display/platform_screen.h"
-#include "services/ui/display/platform_screen_impl_ozone.h"
+#include "services/ui/display/platform_screen_ozone.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/display/chromeos/display_configurator.h"
 #include "ui/display/chromeos/display_snapshot_virtual.h"
 #include "ui/display/types/display_constants.h"
 #include "ui/display/types/display_mode.h"
 #include "ui/display/types/display_snapshot.h"
 #include "ui/ozone/public/ozone_platform.h"
 
 namespace display {
@@ skipping 72 matching lines @@
   }
 
   std::vector<DisplayState> added_;
   std::vector<DisplayState> removed_;
   std::vector<DisplayState> modified_;
 
   DISALLOW_COPY_AND_ASSIGN(TestPlatformScreenDelegate);
 };
 
 // Test fixture with helpers to act like ui::DisplayConfigurator and send
-// OnDisplayModeChanged() to PlatformScreenImplOzone.
+// OnDisplayModeChanged() to PlatformScreenOzone.
 class PlatformScreenOzoneTest : public testing::Test {
  public:
   PlatformScreenOzoneTest() {}
   ~PlatformScreenOzoneTest() override {}
 
   PlatformScreen* platform_screen() { return platform_screen_.get(); }
   TestPlatformScreenDelegate* delegate() { return &delegate_; }
 
   // Adds a display snapshot with specified ID and default size.
   void AddDisplay(int64_t id) { return AddDisplay(id, gfx::Size(1024, 768)); }
@@ skipping 48 matching lines @@
       if (snapshot->display_id() == id)
         return snapshot.get();
     }
     return nullptr;
   }
 
   // testing::Test:
   void SetUp() override {
     testing::Test::SetUp();
     ui::OzonePlatform::InitializeForUI();
-    platform_screen_ = base::MakeUnique<PlatformScreenImplOzone>();
+    platform_screen_ = base::MakeUnique<PlatformScreenOzone>();
     platform_screen_->Init(&delegate_);
 
     // Double check the expected display exists and clear counters.
     ASSERT_THAT(delegate()->added(), SizeIs(1));
     ASSERT_THAT(delegate_.added()[0], DisplayId(kDefaultDisplayId));
     ASSERT_THAT(delegate_.added()[0], DisplayOrigin("0,0"));
     ASSERT_THAT(delegate_.added()[0], DisplaySize("1024x768"));
     delegate_.Reset();
 
     // Make the initial list of snapshots match what exists.
     AddDisplay(kDefaultDisplayId);
   }
 
   void TearDown() override {
     snapshots_.clear();
     delegate_.Reset();
     platform_screen_.reset();
   }
 
   TestPlatformScreenDelegate delegate_;
-  std::unique_ptr<PlatformScreenImplOzone> platform_screen_;
+  std::unique_ptr<PlatformScreenOzone> platform_screen_;
   std::vector<std::unique_ptr<DisplaySnapshot>> snapshots_;
 };
 
 }  // namespace
 
 TEST_F(PlatformScreenOzoneTest, AddDisplay) {
   AddDisplay(2);
   TriggerOnDisplayModeChanged();
 
   // Check that display 2 was added.
@@ skipping 109 matching lines @@
   // Check that the default display was modified with a new size and display 2
   // was modified with a new origin.
   ASSERT_THAT(delegate()->modified(), SizeIs(2));
   EXPECT_THAT(delegate()->modified()[0], DisplayId(kDefaultDisplayId));
   EXPECT_THAT(delegate()->modified()[0], DisplaySize(size.ToString()));
   EXPECT_THAT(delegate()->modified()[1], DisplayId(2));
   EXPECT_THAT(delegate()->modified()[1], DisplayOrigin("1920,0"));
 }
 
 }  // namespace display