Fix namespace for src/ui/display/.

ui/display/display_list_unittest.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 "ui/display/display_list.h"
 
 #include <string>
 #include <vector>
 
 #include "base/strings/string_number_conversions.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/display/display.h"
 #include "ui/display/display_observer.h"
 
-using display::Display;
-
 namespace display {
 namespace {
 
-class DisplayObserverImpl : public display::DisplayObserver {
+class DisplayObserverImpl : public DisplayObserver {
  public:
   DisplayObserverImpl() {}
   ~DisplayObserverImpl() override {}
 
   std::string GetAndClearChanges() {
     std::string changes;
     std::swap(changes, changes_);
     return changes;
   }
 
@@ skipping 37 matching lines @@
 
   std::string changes_;
 
   DISALLOW_COPY_AND_ASSIGN(DisplayObserverImpl);
 };
 
 TEST(DisplayListTest, AddUpdateRemove) {
   DisplayList display_list;
   DisplayObserverImpl observer;
   display_list.AddObserver(&observer);
-  display_list.AddDisplay(display::Display(2, gfx::Rect(0, 0, 801, 802)),
+  display_list.AddDisplay(Display(2, gfx::Rect(0, 0, 801, 802)),
                           DisplayList::Type::PRIMARY);
   EXPECT_EQ("Added id=2", observer.GetAndClearChanges());
 
   // Update the bounds.
   {
-    display::Display updated_display = *(display_list.displays().begin());
+    Display updated_display = *(display_list.displays().begin());
     updated_display.set_bounds(gfx::Rect(0, 0, 803, 802));
     display_list.UpdateDisplay(updated_display, DisplayList::Type::PRIMARY);
     EXPECT_EQ("Changed id=2 bounds", observer.GetAndClearChanges());
   }
 
   // Add another.
-  display_list.AddDisplay(display::Display(3, gfx::Rect(0, 0, 809, 802)),
+  display_list.AddDisplay(Display(3, gfx::Rect(0, 0, 809, 802)),
                           DisplayList::Type::NOT_PRIMARY);
   EXPECT_EQ("Added id=3", observer.GetAndClearChanges());
   ASSERT_EQ(2u, display_list.displays().size());
   EXPECT_EQ(2, display_list.displays()[0].id());
   EXPECT_EQ(3, display_list.displays()[1].id());
   EXPECT_EQ(2, display_list.GetPrimaryDisplayIterator()->id());
 
   // Make the second the primary.
   display_list.UpdateDisplay(display_list.displays()[1],
                              DisplayList::Type::PRIMARY);
   EXPECT_EQ("Changed id=3 primary", observer.GetAndClearChanges());
   EXPECT_EQ(3, display_list.GetPrimaryDisplayIterator()->id());
 
   // Delete the first.
   display_list.RemoveDisplay(2);
   ASSERT_EQ(1u, display_list.displays().size());
   EXPECT_EQ("Removed id=2", observer.GetAndClearChanges());
   EXPECT_EQ(3, display_list.GetPrimaryDisplayIterator()->id());
 }
 
 TEST(DisplayListTest, SuspendUpdates) {
   DisplayList display_list;
-  display_list.AddDisplay(display::Display(2, gfx::Rect(0, 0, 801, 802)),
+  display_list.AddDisplay(Display(2, gfx::Rect(0, 0, 801, 802)),
                           DisplayList::Type::PRIMARY);
   DisplayObserverImpl observer;
   display_list.AddObserver(&observer);
   {
     // Suspend updates and add a new display.
     std::unique_ptr<DisplayListObserverLock> lock =
         display_list.SuspendObserverUpdates();
-    display_list.AddDisplay(display::Display(3, gfx::Rect(0, 0, 809, 802)),
+    display_list.AddDisplay(Display(3, gfx::Rect(0, 0, 809, 802)),
                             DisplayList::Type::NOT_PRIMARY);
     EXPECT_EQ(2u, display_list.displays().size());
     // No update should have been generated.
     EXPECT_TRUE(observer.GetAndClearChanges().empty());
   }
   // The lock has been destroyed, but no updates should be sent yet.
   EXPECT_TRUE(observer.GetAndClearChanges().empty());
 
   // Update a display and verify observer called.
-  display::Display updated_display = display_list.displays()[0];
+  Display updated_display = display_list.displays()[0];
   updated_display.set_bounds(gfx::Rect(0, 0, 803, 802));
   display_list.UpdateDisplay(updated_display, DisplayList::Type::PRIMARY);
   EXPECT_EQ("Changed id=2 bounds", observer.GetAndClearChanges());
 }
 
 }  // namespace
 }  // namespace display