Add context to gfx::Screen calls in support of simultaneous desktop+ash

ash/test/ash_test_base.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 "ash/test/ash_test_base.h"
 
 #include <string>
 #include <vector>
 
 #include "ash/display/display_controller.h"
@@ skipping 62 matching lines @@
   RunAllPendingInMessageLoop();
 
   // Tear down the shell.
   Shell::DeleteInstance();
   aura::Env::DeleteInstance();
   ui::TextInputTestSupport::Shutdown();
 }
 
 void AshTestBase::ChangeDisplayConfig(float scale,
                                       const gfx::Rect& bounds_in_pixel) {
-  gfx::Display display = gfx::Display(gfx::Screen::GetPrimaryDisplay().id());
+  gfx::Display display =
+      gfx::Display(Shell::GetScreen()->GetPrimaryDisplay().id());
   display.SetScaleAndBounds(scale, bounds_in_pixel);
   std::vector<gfx::Display> displays;
   displays.push_back(display);
   aura::Env::GetInstance()->display_manager()->OnNativeDisplaysChanged(
       displays);
 }
 
 void AshTestBase::UpdateDisplay(const std::string& display_specs) {
   std::vector<gfx::Display> displays = CreateDisplaysFromString(display_specs);
   internal::MultiDisplayManager* display_manager =
@@ skipping 28 matching lines @@
 void AshTestBase::RunAllPendingInMessageLoop() {
 #if !defined(OS_MACOSX)
   DCHECK(MessageLoopForUI::current() == &message_loop_);
   base::RunLoop run_loop(aura::Env::GetInstance()->GetDispatcher());
   run_loop.RunUntilIdle();
 #endif
 }
 
 }  // namespace test
 }  // namespace ash