Delete TestDisplaySnapshot and update tests.

ui/display/chromeos/apply_content_protection_task_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 "ui/display/chromeos/apply_content_protection_task.h"
 
 #include <stdint.h>
 #include <utility>
 
 #include "base/bind.h"
 #include "base/macros.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/display/chromeos/display_layout_manager.h"
 #include "ui/display/chromeos/test/action_logger_util.h"
 #include "ui/display/chromeos/test/test_display_layout_manager.h"
-#include "ui/display/chromeos/test/test_display_snapshot.h"
 #include "ui/display/chromeos/test/test_native_display_delegate.h"
+#include "ui/display/fake_display_snapshot.h"
 
 namespace ui {
 namespace test {
 
 namespace {
 
 std::unique_ptr<DisplaySnapshot> CreateDisplaySnapshot(
     int64_t id,
     DisplayConnectionType type) {
-  std::unique_ptr<TestDisplaySnapshot> display(new TestDisplaySnapshot());
-  display->set_display_id(id);
-  display->set_type(type);
-
-  return std::move(display);
+  return display::FakeDisplaySnapshot::Builder()
+      .SetId(id)
+      .SetNativeMode(gfx::Size(1024, 768))
+      .SetType(type)
+      .Build();
 }
 
 }  // namespace
 
 class ApplyContentProtectionTaskTest : public testing::Test {
  public:
   enum Response {
     ERROR,
     SUCCESS,
     NOT_CALLED,
@@ skipping 129 matching lines @@
       base::Bind(&ApplyContentProtectionTaskTest::ResponseCallback,
                  base::Unretained(this)));
   task.Run();
 
   EXPECT_EQ(SUCCESS, response_);
   EXPECT_EQ(kNoActions, log_.GetActionsAndClear());
 }
 
 }  // namespace test
 }  // namespace ui