AppModelBuilder to athena.

athena/test/athena_test_helper.cc

Index: athena/test/athena_test_helper.cc
diff --git a/athena/test/athena_test_helper.cc b/athena/test/athena_test_helper.cc
index a8e06c5e5cdebee19f7dc8fa09680add835089ab..1b99ea85316ac094590b77efe7c21226ba846f04 100644
--- a/athena/test/athena_test_helper.cc
+++ b/athena/test/athena_test_helper.cc
@@ -6,6 +6,7 @@
 
 #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"
@@ -74,7 +75,9 @@ void AthenaTestHelper::SetUp(ui::ContextFactory* context_factory) {
   // 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() {