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

ui/display/manager/chromeos/test/action_logger_util.h

 // 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.
 
-#ifndef UI_DISPLAY_CHROMEOS_TEST_ACTION_LOGGER_UTIL_H_
-#define UI_DISPLAY_CHROMEOS_TEST_ACTION_LOGGER_UTIL_H_
+#ifndef UI_DISPLAY_MANAGER_CHROMEOS_TEST_ACTION_LOGGER_UTIL_H_
+#define UI_DISPLAY_MANAGER_CHROMEOS_TEST_ACTION_LOGGER_UTIL_H_
 
 #include <stdint.h>
 
 #include <string>
 #include <vector>
 
 #include "ui/display/types/display_constants.h"
 
 namespace gfx {
 class Point;
@@ skipping 58 matching lines @@
     const std::vector<float>& correction_matrix);
 // Joins a sequence of strings describing actions (e.g. kScreenDim) such
 // that they can be compared against a string returned by
 // ActionLogger::GetActionsAndClear().  The list of actions must be
 // terminated by a NULL pointer.
 std::string JoinActions(const char* action, ...);
 
 }  // namespace test
 }  // namespace ui
 
-#endif  // UI_DISPLAY_CHROMEOS_TEST_ACTION_LOGGER_UTIL_H_
+#endif  // UI_DISPLAY_MANAGER_CHROMEOS_TEST_ACTION_LOGGER_UTIL_H_