Fixes three crashes

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"
 #include "athena/test/test_screen_manager_delegate.h"
 #include "base/command_line.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
+#include "base/threading/thread.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "ui/app_list/app_list_switches.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 18 matching lines @@
       ui::ScopedAnimationDurationScaleMode::ZERO_DURATION));
 }
 
 AthenaTestHelper::~AthenaTestHelper() {
   CHECK(setup_called_) << "AthenaTestHelper::SetUp() never called.";
   CHECK(teardown_called_) << "AthenaTestHelper::TearDown() never called.";
 }
 
 void AthenaTestHelper::SetUp(ui::ContextFactory* context_factory) {
   setup_called_ = true;
+  file_thread_.reset(new base::Thread("FileThread"));
+  base::Thread::Options options(base::MessageLoop::TYPE_IO, 0);
+  file_thread_->StartWithOptions(options);
 
   // Force showing in the experimental app-list view.
   base::CommandLine::ForCurrentProcess()->AppendSwitch(
       app_list::switches::kEnableExperimentalAppList);
 
   chromeos::DBusThreadManager::InitializeWithStub();
 
   aura::Env::CreateInstance(true);
   aura::Env::GetInstance()->set_context_factory(context_factory);
 
@@ skipping 20 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::StartAthenaEnv(root_window(), screen_manager_delegate_.get());
+  athena::StartAthenaEnv(root_window(), screen_manager_delegate_.get(),
+                         file_thread_->message_loop_proxy());
   athena::StartAthenaSession(new SampleActivityFactory(),
                              new TestAppModelBuilder());
 }
 
 void AthenaTestHelper::TearDown() {
   teardown_called_ = true;
 
   athena::ShutdownAthena();
 
   aura::client::SetFocusClient(root_window(), NULL);
@@ 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