Split //ui/display and create //ui/display/manager.

ui/display/chromeos/test/action_logger_util.cc

Index: ui/display/chromeos/test/action_logger_util.cc
diff --git a/ui/display/chromeos/test/action_logger_util.cc b/ui/display/chromeos/test/action_logger_util.cc
deleted file mode 100644
index ebd9ef84d09618da2a821603a103b45fd33c98fb..0000000000000000000000000000000000000000
--- a/ui/display/chromeos/test/action_logger_util.cc
+++ /dev/null
@@ -1,104 +0,0 @@
-// Copyright 2014 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/test/action_logger_util.h"
-
-#include <stddef.h>
-
-#include "base/format_macros.h"
-#include "base/logging.h"
-#include "base/strings/stringprintf.h"
-#include "ui/display/types/display_mode.h"
-#include "ui/display/types/display_snapshot.h"
-#include "ui/display/types/gamma_ramp_rgb_entry.h"
-#include "ui/display/types/native_display_delegate.h"
-#include "ui/gfx/geometry/point.h"
-#include "ui/gfx/geometry/size.h"
-
-namespace ui {
-namespace test {
-
-std::string DisplaySnapshotToString(const DisplaySnapshot& output) {
-  return base::StringPrintf("id=%" PRId64, output.display_id());
-}
-
-std::string GetBackgroundAction(uint32_t color_argb) {
-  return base::StringPrintf("background(0x%x)", color_argb);
-}
-
-std::string GetAddOutputModeAction(const DisplaySnapshot& output,
-                                   const DisplayMode* mode) {
-  return base::StringPrintf("add_mode(output=%" PRId64 ",mode=%s)",
-                            output.display_id(), mode->ToString().c_str());
-}
-
-std::string GetCrtcAction(const DisplaySnapshot& output,
-                          const DisplayMode* mode,
-                          const gfx::Point& origin) {
-  return base::StringPrintf("crtc(display=[%s],x=%d,y=%d,mode=[%s])",
-                            DisplaySnapshotToString(output).c_str(), origin.x(),
-                            origin.y(),
-                            mode ? mode->ToString().c_str() : "NULL");
-}
-
-std::string GetFramebufferAction(const gfx::Size& size,
-                                 const DisplaySnapshot* out1,
-                                 const DisplaySnapshot* out2) {
-  return base::StringPrintf(
-      "framebuffer(width=%d,height=%d,display1=%s,display2=%s)", size.width(),
-      size.height(), out1 ? DisplaySnapshotToString(*out1).c_str() : "NULL",
-      out2 ? DisplaySnapshotToString(*out2).c_str() : "NULL");
-}
-
-std::string GetSetHDCPStateAction(const DisplaySnapshot& output,
-                                  HDCPState state) {
-  return base::StringPrintf("set_hdcp(id=%" PRId64 ",state=%d)",
-                            output.display_id(), state);
-}
-
-std::string SetColorCorrectionAction(
-    const ui::DisplaySnapshot& output,
-    const std::vector<GammaRampRGBEntry>& degamma_lut,
-    const std::vector<GammaRampRGBEntry>& gamma_lut,
-    const std::vector<float>& correction_matrix) {
-  std::string degamma_table;
-  for (size_t i = 0; i < degamma_lut.size(); ++i) {
-    degamma_table += base::StringPrintf(",degamma[%" PRIuS "]=%04x%04x%04x", i,
-                                        degamma_lut[i].r, degamma_lut[i].g,
-                                        degamma_lut[i].b);
-  }
-  std::string gamma_table;
-  for (size_t i = 0; i < gamma_lut.size(); ++i) {
-    gamma_table +=
-        base::StringPrintf(",gamma[%" PRIuS "]=%04x%04x%04x", i, gamma_lut[i].r,
-                           gamma_lut[i].g, gamma_lut[i].b);
-  }
-
-  std::string ctm;
-  for (size_t i = 0; i < correction_matrix.size(); ++i) {
-    ctm += base::StringPrintf(",ctm[%" PRIuS "]=%f", i, correction_matrix[i]);
-  }
-
-  return base::StringPrintf("set_color_correction(id=%" PRId64 "%s%s%s)",
-                            output.display_id(), degamma_table.c_str(),
-                            gamma_table.c_str(), ctm.c_str());
-}
-
-std::string JoinActions(const char* action, ...) {
-  std::string actions;
-
-  va_list arg_list;
-  va_start(arg_list, action);
-  while (action) {
-    if (!actions.empty())
-      actions += ",";
-    actions += action;
-    action = va_arg(arg_list, const char*);
-  }
-  va_end(arg_list);
-  return actions;
-}
-
-}  // namespace test
-}  // namespace ui