TestScreen shouldn't be marked aura export

ash/wm/workspace/workspace_window_resizer_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 "ash/wm/workspace/workspace_window_resizer.h"
 
+#include "ash/screen_ash.h"
 #include "ash/shell.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/wm/property_util.h"
 #include "base/string_number_conversions.h"
 #include "ui/aura/root_window.h"
-#include "ui/aura/screen_aura.h"
 #include "ui/aura/test/test_window_delegate.h"
 #include "ui/base/hit_test.h"
 
 namespace ash {
 namespace internal {
 namespace {
 
 const int kRootHeight = 600;
 
 // A simple window delegate that returns the specified min size.
@@ skipping 22 matching lines @@
  public:
   WorkspaceWindowResizerTest() : window_(NULL) {}
   virtual ~WorkspaceWindowResizerTest() {}
 
   virtual void SetUp() OVERRIDE {
     AshTestBase::SetUp();
     aura::RootWindow* root = Shell::GetInstance()->GetRootWindow();
     root->SetBounds(gfx::Rect(0, 0, 800, kRootHeight));
     gfx::Rect root_bounds(root->bounds());
     EXPECT_EQ(kRootHeight, root_bounds.height());
-    root->SetScreenWorkAreaInsets(gfx::Insets());
+    Shell::GetInstance()->SetScreenWorkAreaInsets(gfx::Insets());
     window_.reset(new aura::Window(&delegate_));
     window_->Init(ui::Layer::LAYER_NOT_DRAWN);
     window_->SetParent(Shell::GetInstance()->GetRootWindow());
 
     window2_.reset(new aura::Window(&delegate2_));
     window2_->Init(ui::Layer::LAYER_NOT_DRAWN);
     window2_->SetParent(Shell::GetInstance()->GetRootWindow());
 
     window3_.reset(new aura::Window(&delegate3_));
     window3_->Init(ui::Layer::LAYER_NOT_DRAWN);
@@ skipping 474 matching lines @@
     EXPECT_EQ("0,0 400x380", window_->bounds().ToString());
     EXPECT_EQ("40,380 100x200", window2_->bounds().ToString());
   }
 }
 
 // Assertions around attached window resize dragging from the bottom with 3
 // windows.
 TEST_F(WorkspaceWindowResizerTest, AttachedResize_BOTTOM_3) {
   aura::RootWindow* root = Shell::GetInstance()->GetRootWindow();
   root->SetBounds(gfx::Rect(0, 0, 600, 800));
-  root->SetScreenWorkAreaInsets(gfx::Insets());
+  Shell::GetInstance()->SetScreenWorkAreaInsets(gfx::Insets());
 
   window_->SetBounds(gfx::Rect( 300, 100, 300, 200));
   window2_->SetBounds(gfx::Rect(300, 300, 200, 150));
   window3_->SetBounds(gfx::Rect(300, 450, 200, 100));
   delegate2_.set_min_size(gfx::Size(50, 52));
   delegate3_.set_min_size(gfx::Size(50, 38));
 
   std::vector<aura::Window*> windows;
   windows.push_back(window2_.get());
   windows.push_back(window3_.get());
@@ skipping 21 matching lines @@
   // Revert and make sure everything moves back.
   resizer->RevertDrag();
   EXPECT_EQ("300,100 300x200", window_->bounds().ToString());
   EXPECT_EQ("300,300 200x150", window2_->bounds().ToString());
   EXPECT_EQ("300,450 200x100", window3_->bounds().ToString());
 }
 
 TEST_F(WorkspaceWindowResizerTest, AttachedResize_BOTTOM_RememberHeight) {
   aura::RootWindow* root = Shell::GetInstance()->GetRootWindow();
   root->SetBounds(gfx::Rect(0, 0, 600, 800));
-  root->SetScreenWorkAreaInsets(gfx::Insets());
+  Shell::GetInstance()->SetScreenWorkAreaInsets(gfx::Insets());
 
   window_->SetBounds(gfx::Rect( 300, 100, 300, 200));
   window2_->SetBounds(gfx::Rect(300, 300, 200, 150));
   window3_->SetBounds(gfx::Rect(300, 450, 200, 100));
   delegate2_.set_min_size(gfx::Size(50, 52));
   delegate3_.set_min_size(gfx::Size(50, 38));
 
   std::vector<aura::Window*> windows;
   windows.push_back(window2_.get());
   windows.push_back(window3_.get());
@@ skipping 54 matching lines @@
   resizer->Drag(CalculateDragPoint(*resizer, 800, 10));
   resizer->CompleteDrag();
   EXPECT_EQ("400,0 400x600", window_->bounds().ToString());
   ASSERT_TRUE(GetRestoreBounds(window_.get()));
   EXPECT_EQ("20,30 50x60", GetRestoreBounds(window_.get())->ToString());
 }
 
 }  // namespace
 }  // namespace test
 }  // namespace ash