introduced athena_main_lib

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/screen/public/screen_manager.h"
 #include "athena/test/sample_activity_factory.h"
 #include "athena/test/test_app_model_builder.h"
@@ skipping 69 matching lines @@
       new wm::FocusController(ScreenManager::CreateFocusRules());
   aura::client::SetFocusClient(root_window(), focus_controller);
   root_window()->AddPreTargetHandler(focus_controller);
   aura::client::SetActivationClient(root_window(), focus_controller);
   focus_client_.reset(focus_controller);
 
   root_window()->Show();
   // Ensure width != height so tests won't confuse them.
   host()->SetBounds(gfx::Rect(host_size));
 
-  athena::StartAthena(root_window(),
-                      new SampleActivityFactory(),
-                      new TestAppModelBuilder());
+  athena::StartAthenaEnv(root_window());
+  athena::StartAthenaSession(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 16 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