Relocate display_manager from ash to ui

chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager_unittest.cc

 // 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.
 
 #include "chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.h"
 
 #include <cstdlib>
 #include <cstring>
 #include <memory>
 
 #include "ash/shell.h"
 #include "ash/test/ash_test_base.h"
-#include "ash/test/display_manager_test_api.h"
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/files/scoped_temp_dir.h"
 #include "chrome/browser/chromeos/login/startup_utils.h"
 #include "chrome/browser/chromeos/login/users/fake_chrome_user_manager.h"
 #include "chrome/browser/chromeos/login/users/scoped_user_manager_enabler.h"
 #include "chrome/browser/chromeos/settings/cros_settings.h"
 #include "chrome/browser/chromeos/settings/device_settings_service.h"
 #include "chrome/browser/prefs/browser_prefs.h"
 #include "chrome/test/base/testing_browser_process.h"
 #include "chromeos/chromeos_switches.h"
 #include "chromeos/settings/cros_settings_names.h"
 #include "chromeos/settings/cros_settings_provider.h"
 #include "components/prefs/pref_service.h"
 #include "components/prefs/testing_pref_service.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "ui/display/manager/display_manager.h"

[kylechar, 2016/10/24 14:55:15]

Is DisplayManager used here?

[oshima, 2016/10/24 19:29:16]

looks like these are no longer used.

[rjkroege, 2016/10/25 23:30:26]

Done. Both removed.

+#include "ui/display/test/display_manager_test_api.h"
 #include "ui/gfx/image/image.h"
 
 using namespace ash;
 
 namespace chromeos {
 
 class WallpaperManagerCacheTest : public test::AshTestBase {
  public:
   WallpaperManagerCacheTest()
       : fake_user_manager_(new FakeChromeUserManager()),
@@ skipping 108 matching lines @@
   fake_user_manager()->RemoveUserFromList(test_account_id_2);
 
   // Test that only user1's wallpaper can be found in cache.
   EXPECT_TRUE(
       test_api->GetWallpaperFromCache(test_account_id_1, &cached_wallpaper));
   EXPECT_FALSE(
       test_api->GetWallpaperFromCache(test_account_id_2, &cached_wallpaper));
 }
 
 }  // namespace chromeos