diff options
| author | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-19 22:53:09 +0000 |
|---|---|---|
| committer | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-19 22:54:28 +0000 |
| commit | 3c643ba1c58c4e41752aaa248de08a613e29f2ea (patch) | |
| tree | 76348b0edf3fa5cd7006c0a66ea11dc853460138 /athena/test | |
| parent | 0dfcae783a9285e3a3099f7098f076ef7b093f6e (diff) | |
| download | chromium_src-3c643ba1c58c4e41752aaa248de08a613e29f2ea.zip chromium_src-3c643ba1c58c4e41752aaa248de08a613e29f2ea.tar.gz chromium_src-3c643ba1c58c4e41752aaa248de08a613e29f2ea.tar.bz2 | |
introduced athena_main_lib
separate the process to initialize environment, and
start the session.
These are necessary step to launch athena in chrome.
BUG=397167
Review URL: https://codereview.chromium.org/485183002
Cr-Commit-Position: refs/heads/master@{#290686}
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@290686 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'athena/test')
| -rw-r--r-- | athena/test/athena_test_helper.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/athena/test/athena_test_helper.cc b/athena/test/athena_test_helper.cc index 8f5df97..f8916a1 100644 --- a/athena/test/athena_test_helper.cc +++ b/athena/test/athena_test_helper.cc @@ -87,9 +87,9 @@ void AthenaTestHelper::SetUp(ui::ContextFactory* context_factory) { // 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() { |