Remove DisplayStructTraitsTest interface.

The best practice is apparently not to do this and to use
Serialize()/Deserialize() functions directly. This also removes an
EnumTraits test that isn't super useful.

BUG=none

Review-Url: https://codereview.chromium.org/2857033002
Cr-Commit-Position: refs/heads/master@{#469402}

ui/display/BUILD.gn

@@ -168,7 +168,7 @@ test("display_unittests") {
     "//testing/gmock",
     "//testing/gtest",
     "//ui/display/manager",
-    "//ui/display/mojo:test_interfaces",
+    "//ui/display/mojo:interfaces",
     "//ui/display/types",
     "//ui/display/util",
     "//ui/events/devices",

ui/display/mojo/BUILD.gn

@@ -20,13 +20,3 @@ mojom("interfaces") {
     "//ui/gfx/geometry/mojo",
   ]
 }
-
-mojom("test_interfaces") {
-  sources = [
-    "display_struct_traits_test.mojom",
-  ]
-
-  public_deps = [
-    ":interfaces",
-  ]
-}

ui/display/mojo/display_snapshot_mojo_struct_traits.cc

@@ -4,11 +4,7 @@
 
 #include "ui/display/mojo/display_snapshot_mojo_struct_traits.h"
 
-#include "ipc/ipc_message_utils.h"
-#include "ui/display/mojo/display_constants_struct_traits.h"
-#include "ui/display/mojo/display_mode_struct_traits.h"
 #include "ui/display/types/display_constants.h"
-#include "ui/gfx/geometry/mojo/geometry_struct_traits.h"
 #include "ui/gfx/geometry/size.h"
 
 namespace mojo {
@@ -136,4 +132,4 @@ bool StructTraits<display::mojom::DisplaySnapshotMojoDataView,
   return true;
 }
 
-}  // namespace mojo
\ No newline at end of file
+}  // namespace mojo

ui/display/mojo/display_snapshot_mojo_struct_traits.h

@@ -5,9 +5,13 @@
 #ifndef UI_DISPLAY_MOJO_DISPLAY_SNAPSHOT_MOJO_STRUCT_TRAITS_H_
 #define UI_DISPLAY_MOJO_DISPLAY_SNAPSHOT_MOJO_STRUCT_TRAITS_H_
 
+#include "ipc/ipc_message_utils.h"
+#include "ui/display/mojo/display_constants_struct_traits.h"
+#include "ui/display/mojo/display_mode_struct_traits.h"
 #include "ui/display/mojo/display_snapshot_mojo.mojom.h"
 #include "ui/display/types/display_mode.h"
 #include "ui/display/types/display_snapshot_mojo.h"
+#include "ui/gfx/geometry/mojo/geometry_struct_traits.h"
 
 namespace mojo {
 

ui/display/mojo/display_struct_traits.cc

@@ -4,8 +4,6 @@
 
 #include "ui/display/mojo/display_struct_traits.h"
 
-#include "ui/gfx/geometry/mojo/geometry_struct_traits.h"
-
 namespace mojo {
 
 display::mojom::Rotation

ui/display/mojo/display_struct_traits.h

@@ -7,6 +7,7 @@
 
 #include "ui/display/display.h"
 #include "ui/display/mojo/display.mojom.h"
+#include "ui/gfx/geometry/mojo/geometry_struct_traits.h"
 
 namespace mojo {
 

ui/display/mojo/display_struct_traits_test.mojom

-// 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.
-
-module display.mojom;
-
-import "ui/display/mojo/display.mojom";
-import "ui/display/mojo/display_constants.mojom";
-import "ui/display/mojo/display_layout.mojom";
-import "ui/display/mojo/display_mode.mojom";
-import "ui/display/mojo/display_snapshot_mojo.mojom";
-import "ui/display/mojo/gamma_ramp_rgb_entry.mojom";
-
-interface DisplayStructTraitsTest {
-  [Sync]
-  EchoDisplay(Display in) => (Display out);
-
-  [Sync]
-  EchoDisplayMode(DisplayMode in) => (DisplayMode out);
-
-  [Sync]
-  EchoDisplaySnapshotMojo(DisplaySnapshotMojo in) => (DisplaySnapshotMojo
-    out);
-
-  [Sync]
-  EchoDisplayPlacement(DisplayPlacement in) => (DisplayPlacement out);
-
-  [Sync]
-  EchoDisplayLayout(DisplayLayout in) => (DisplayLayout out);
-
-  [Sync]
-  EchoHDCPState(HDCPState in) => (HDCPState out);
-
-  [Sync]
-  EchoGammaRampRGBEntry(GammaRampRGBEntry in) => (GammaRampRGBEntry out);
-};
\ No newline at end of file