TestScreen shouldn't be marked aura export

ash/wm/toplevel_layout_manager_unittest.cc

Index: ash/wm/toplevel_layout_manager_unittest.cc
diff --git a/ash/wm/toplevel_layout_manager_unittest.cc b/ash/wm/toplevel_layout_manager_unittest.cc
index 246c835885e4c2b1612893abb16a9d8fc826c0ee..dff916a1949132d1c5955b3cf8af08bba6d87649 100644
--- a/ash/wm/toplevel_layout_manager_unittest.cc
+++ b/ash/wm/toplevel_layout_manager_unittest.cc
@@ -4,6 +4,7 @@
 
 #include "ash/wm/toplevel_layout_manager.h"
 
+#include "ash/screen_ash.h"
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
 #include "ash/test/ash_test_base.h"
@@ -12,7 +13,6 @@
 #include "base/compiler_specific.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/root_window.h"
-#include "ui/aura/screen_aura.h"
 #include "ui/aura/test/test_windows.h"
 #include "ui/base/ui_base_types.h"
 #include "ui/aura/window.h"
@@ -33,7 +33,7 @@ class ToplevelLayoutManagerTest : public test::AshTestBase {
 
   virtual void SetUp() OVERRIDE {
     test::AshTestBase::SetUp();
-    Shell::GetRootWindow()->SetScreenWorkAreaInsets(
+    Shell::GetInstance()->SetScreenWorkAreaInsets(
         gfx::Insets(1, 2, 3, 4));
     Shell::GetRootWindow()->SetHostSize(gfx::Size(800, 600));
     aura::Window* default_container = Shell::GetInstance()->GetContainer(
@@ -105,16 +105,14 @@ TEST_F(ToplevelLayoutManagerTest,
        ResizeMaximizedWindowOnWorkAreaInsetsChange) {
   gfx::Rect bounds(100, 100, 200, 200);
   scoped_ptr<aura::Window> window(CreateTestWindow(bounds));
-  Shell::GetRootWindow()->SetScreenWorkAreaInsets(
-        gfx::Insets(0, 0, 30, 0));
+  Shell::GetInstance()->SetScreenWorkAreaInsets(gfx::Insets(0, 0, 30, 0));
   window->SetProperty(aura::client::kShowStateKey, ui::SHOW_STATE_MAXIMIZED);
   // Maximized window fills the work area.
   EXPECT_EQ(gfx::Screen::GetMonitorWorkAreaNearestWindow(window.get()),
             window->bounds());
 
   // Change work area insets.
-  Shell::GetRootWindow()->SetScreenWorkAreaInsets(
-        gfx::Insets(0, 0, 60, 0));
+  Shell::GetInstance()->SetScreenWorkAreaInsets(gfx::Insets(0, 0, 60, 0));
   // Maximized window fills the changed work area.
   EXPECT_EQ(gfx::Screen::GetMonitorWorkAreaNearestWindow(window.get()),
             window->bounds());