aura: Allow specifying the size of TestScreen when creating it.

athena/test/athena_test_helper.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 "athena/test/athena_test_helper.h"
 
 #include "athena/main/athena_launcher.h"
 #include "athena/test/sample_activity_factory.h"
 #include "athena/test/test_app_model_builder.h"
 #include "base/message_loop/message_loop.h"
@@ skipping 38 matching lines @@
   aura::Env::CreateInstance(true);
   aura::Env::GetInstance()->set_context_factory(context_factory);
 
   // Unit tests generally don't want to query the system, rather use the state
   // from RootWindow.
   aura::test::EnvTestHelper(aura::Env::GetInstance())
       .SetInputStateLookup(scoped_ptr<aura::InputStateLookup>());
 
   ui::InitializeInputMethodForTesting();
 
-  test_screen_.reset(aura::TestScreen::Create());
+  const gfx::Size host_size(800, 600);
+  test_screen_.reset(aura::TestScreen::Create(host_size));
   gfx::Screen::SetScreenInstance(gfx::SCREEN_TYPE_NATIVE, test_screen_.get());
   host_.reset(test_screen_->CreateHostForPrimaryDisplay());
 
   input_method_filter_.reset(new ::wm::InputMethodEventFilter(
       root_window()->GetHost()->GetAcceleratedWidget()));
   input_method_filter_->SetInputMethodPropertyInRootWindow(
       root_window());
 
   // TODO(oshima): Switch to athena implementation.
   focus_client_.reset(new aura::test::TestFocusClient);
   aura::client::SetFocusClient(root_window(),
                                focus_client_.get());
   new ::wm::DefaultActivationClient(root_window());
 
   root_window()->Show();
   // Ensure width != height so tests won't confuse them.
-  host()->SetBounds(gfx::Rect(800, 600));
+  host()->SetBounds(gfx::Rect(host_size));
 
   athena::StartAthena(root_window(),
                       new SampleActivityFactory(),
                       new TestAppModelBuilder());
 }
 
 void AthenaTestHelper::TearDown() {
   teardown_called_ = true;
 
   athena::ShutdownAthena();
@@ skipping 18 matching lines @@
 
 void AthenaTestHelper::RunAllPendingInMessageLoop() {
   // TODO(jbates) crbug.com/134753 Find quitters of this RunLoop and have them
   //              use run_loop.QuitClosure().
   base::RunLoop run_loop;
   run_loop.RunUntilIdle();
 }
 
 }  // namespace test
 }  // namespace athena