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

ash/display/json_converter.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 "ash/display/json_converter.h"
 
 #include <memory>
 #include <string>
 
 #include "ash/display/display_pref_util.h"
 #include "base/logging.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/values.h"
-#include "ui/display/manager/display_layout.h"
+#include "ui/display/display_layout.h"
 
 namespace ash {
 
 namespace {
 
 // Persistent key names
 const char kMirroredKey[] = "mirrored";
 const char kDefaultUnifiedKey[] = "default_unified";
 const char kPrimaryIdKey[] = "primary-id";
 const char kDisplayPlacementKey[] = "display_placement";
@@ skipping 167 matching lines @@
     placement_value->SetString(
         kDisplayPlacementParentDisplayIdKey,
         base::Int64ToString(placement.parent_display_id));
     placement_list->Append(std::move(placement_value));
   }
   dict_value->Set(kDisplayPlacementKey, std::move(placement_list));
   return true;
 }
 
 }  // namespace ash