Fix namespace for src/ui/display/.

chrome/browser/chromeos/display/display_preferences_unittest.cc

 // Copyright (c) 2012 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 "chrome/browser/chromeos/display/display_preferences.h"
 
 #include <stdint.h>
 
 #include <string>
 #include <utility>
@@ skipping 250 matching lines @@
   ash::WindowTreeHostManager* window_tree_host_manager =
       ash::Shell::GetInstance()->window_tree_host_manager();
 
   UpdateDisplay("200x200*2, 400x300#400x400|300x200*1.25");
   int64_t id1 = display::Screen::GetScreen()->GetPrimaryDisplay().id();
   display::test::ScopedSetInternalDisplayId set_internal(display_manager(),
                                                          id1);
   int64_t id2 = display_manager()->GetSecondaryDisplay().id();
   int64_t dummy_id = id2 + 1;
   ASSERT_NE(id1, dummy_id);
-  std::vector<ui::ColorCalibrationProfile> profiles;
-  profiles.push_back(ui::COLOR_PROFILE_STANDARD);
-  profiles.push_back(ui::COLOR_PROFILE_DYNAMIC);
-  profiles.push_back(ui::COLOR_PROFILE_MOVIE);
-  profiles.push_back(ui::COLOR_PROFILE_READING);
+  std::vector<display::ColorCalibrationProfile> profiles;
+  profiles.push_back(display::COLOR_PROFILE_STANDARD);
+  profiles.push_back(display::COLOR_PROFILE_DYNAMIC);
+  profiles.push_back(display::COLOR_PROFILE_MOVIE);
+  profiles.push_back(display::COLOR_PROFILE_READING);
   // Allows only |id1|.
   display::test::DisplayManagerTestApi(display_manager())
       .SetAvailableColorProfiles(id1, profiles);
-  display_manager()->SetColorCalibrationProfile(id1, ui::COLOR_PROFILE_DYNAMIC);
-  display_manager()->SetColorCalibrationProfile(id2, ui::COLOR_PROFILE_DYNAMIC);
+  display_manager()->SetColorCalibrationProfile(id1,
+                                                display::COLOR_PROFILE_DYNAMIC);
+  display_manager()->SetColorCalibrationProfile(id2,
+                                                display::COLOR_PROFILE_DYNAMIC);
 
   LoggedInAsUser();
 
   display_manager()->SetLayoutForCurrentDisplays(
       display::test::CreateDisplayLayout(display_manager(),
                                          display::DisplayPlacement::TOP, 10));
   const display::DisplayLayout& layout =
       display_manager()->GetCurrentDisplayLayout();
   EXPECT_EQ(display::DisplayPlacement::TOP, layout.placement_list[0].position);
   EXPECT_EQ(10, layout.placement_list[0].offset);
@@ skipping 211 matching lines @@
   // by mirroring.
   EXPECT_TRUE(properties->GetDictionary(base::Int64ToString(id2), &property));
   EXPECT_TRUE(property->GetInteger("width", &width));
   EXPECT_TRUE(property->GetInteger("height", &height));
   EXPECT_EQ(300, width);
   EXPECT_EQ(200, height);
 
   // Set new display's selected resolution.
   display_manager()->RegisterDisplayProperty(
       id2 + 1, display::Display::ROTATE_0, 1.0f, nullptr, gfx::Size(500, 400),
-      1.0f, ui::COLOR_PROFILE_STANDARD, nullptr);
+      1.0f, display::COLOR_PROFILE_STANDARD, nullptr);
 
   UpdateDisplay("200x200*2, 600x500#600x500|500x400");
 
   // Update key as the 2nd display gets new id.
   id2 = display_manager()->GetSecondaryDisplay().id();
   key = base::Int64ToString(id1) + "," + base::Int64ToString(id2);
   EXPECT_TRUE(displays->GetDictionary(key, &layout_value));
   EXPECT_TRUE(layout_value->GetString(kPositionKey, &position));
   EXPECT_EQ("right", position);
   EXPECT_TRUE(layout_value->GetInteger(kOffsetKey, &offset));
   EXPECT_EQ(0, offset);
   mirrored = true;
   EXPECT_TRUE(layout_value->GetBoolean(kMirroredKey, &mirrored));
   EXPECT_FALSE(mirrored);
   EXPECT_TRUE(layout_value->GetString(kPrimaryIdKey, &primary_id_str));
   EXPECT_EQ(base::Int64ToString(id1), primary_id_str);
 
   // Best resolution should not be saved.
   EXPECT_TRUE(properties->GetDictionary(base::Int64ToString(id2), &property));
   EXPECT_FALSE(property->GetInteger("width", &width));
   EXPECT_FALSE(property->GetInteger("height", &height));
 
   // Set yet another new display's selected resolution.
   display_manager()->RegisterDisplayProperty(
       id2 + 1, display::Display::ROTATE_0, 1.0f, nullptr, gfx::Size(500, 400),
-      1.0f, ui::COLOR_PROFILE_STANDARD, nullptr);
+      1.0f, display::COLOR_PROFILE_STANDARD, nullptr);
   // Disconnect 2nd display first to generate new id for external display.
   UpdateDisplay("200x200*2");
   UpdateDisplay("200x200*2, 500x400#600x500|500x400%60.0f");
   // Update key as the 2nd display gets new id.
   id2 = display_manager()->GetSecondaryDisplay().id();
   key = base::Int64ToString(id1) + "," + base::Int64ToString(id2);
   EXPECT_TRUE(displays->GetDictionary(key, &layout_value));
   EXPECT_TRUE(layout_value->GetString(kPositionKey, &position));
   EXPECT_EQ("right", position);
   EXPECT_TRUE(layout_value->GetInteger(kOffsetKey, &offset));
@@ skipping 133 matching lines @@
 TEST_F(DisplayPreferencesTest, RestoreColorProfiles) {
   int64_t id1 = display::Screen::GetScreen()->GetPrimaryDisplay().id();
 
   StoreColorProfile(id1, "dynamic");
 
   LoggedInAsUser();
   LoadDisplayPreferences(false);
 
   // id1's available color profiles list is empty, means somehow the color
   // profile suport is temporary in trouble.
-  EXPECT_NE(ui::COLOR_PROFILE_DYNAMIC,
+  EXPECT_NE(display::COLOR_PROFILE_DYNAMIC,
             display_manager()->GetDisplayInfo(id1).color_profile());
 
   // Once the profile is supported, the color profile should be restored.
-  std::vector<ui::ColorCalibrationProfile> profiles;
-  profiles.push_back(ui::COLOR_PROFILE_STANDARD);
-  profiles.push_back(ui::COLOR_PROFILE_DYNAMIC);
-  profiles.push_back(ui::COLOR_PROFILE_MOVIE);
-  profiles.push_back(ui::COLOR_PROFILE_READING);
+  std::vector<display::ColorCalibrationProfile> profiles;
+  profiles.push_back(display::COLOR_PROFILE_STANDARD);
+  profiles.push_back(display::COLOR_PROFILE_DYNAMIC);
+  profiles.push_back(display::COLOR_PROFILE_MOVIE);
+  profiles.push_back(display::COLOR_PROFILE_READING);
   display::test::DisplayManagerTestApi(
       ash::Shell::GetInstance()->display_manager())
       .SetAvailableColorProfiles(id1, profiles);
 
   LoadDisplayPreferences(false);
-  EXPECT_EQ(ui::COLOR_PROFILE_DYNAMIC,
+  EXPECT_EQ(display::COLOR_PROFILE_DYNAMIC,
             display_manager()->GetDisplayInfo(id1).color_profile());
 }
 
 TEST_F(DisplayPreferencesTest, DontStoreInGuestMode) {
   ash::WindowTreeHostManager* window_tree_host_manager =
       ash::Shell::GetInstance()->window_tree_host_manager();
 
   UpdateDisplay("200x200*2,200x200");
 
   LoggedInAsGuest();
@@ skipping 437 matching lines @@
 
   EXPECT_EQ(gfx::Rect(0, 0, 200, 200),
             display_manager()->GetDisplayForId(list[0]).bounds());
   EXPECT_EQ(gfx::Rect(-200, 0, 200, 200),
             display_manager()->GetDisplayForId(list[1]).bounds());
   EXPECT_EQ(gfx::Rect(-100, 200, 300, 300),
             display_manager()->GetDisplayForId(list[2]).bounds());
 }
 
 }  // namespace chromeos