AppModelBuilder to athena.

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"
 #include "base/run_loop.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/env.h"
 #include "ui/aura/input_state_lookup.h"
 #include "ui/aura/test/env_test_helper.h"
 #include "ui/aura/test/test_focus_client.h"
 #include "ui/aura/test/test_screen.h"
 #include "ui/aura/window_event_dispatcher.h"
 #include "ui/base/ime/input_method_initializer.h"
@@ skipping 52 matching lines @@
   // 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));
 
-  athena::StartAthena(root_window(), new SampleActivityFactory());
+  athena::StartAthena(root_window(),
+                      new SampleActivityFactory(),
+                      new TestAppModelBuilder());
 }
 
 void AthenaTestHelper::TearDown() {
   teardown_called_ = true;
 
   athena::ShutdownAthena();
 
   aura::client::SetFocusClient(root_window(), NULL);
   focus_client_.reset();
   input_method_filter_.reset();
@@ skipping 14 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