Move DisplayLayout and DisplayLayoutBuilder From ash To ui/display

ui/display/manager/display_layout_builder.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/display_layout_builder.h"
+#include "ui/display/manager/display_layout_builder.h"
 
 #include <algorithm>
 
-namespace ash {
+namespace display {
 
 DisplayLayoutBuilder::DisplayLayoutBuilder(const DisplayLayout& layout)
     : layout_(layout.Copy()) {}
 
 DisplayLayoutBuilder::DisplayLayoutBuilder(int64_t primary_id)
     : layout_(new DisplayLayout) {
   layout_->primary_id = primary_id;
 }
 
 DisplayLayoutBuilder::~DisplayLayoutBuilder() {}
@@ skipping 38 matching lines @@
 }
 
 scoped_ptr<DisplayLayout> DisplayLayoutBuilder::Build() {
   std::sort(layout_->placement_list.begin(), layout_->placement_list.end(),
             [](const DisplayPlacement& a, const DisplayPlacement& b) {
               return a.display_id < b.display_id;
             });
   return std::move(layout_);
 }
 
-}  // namespace ash
+}  // namespace display