Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(553)

Unified Diff: athena/test/base/athena_test_helper.cc

Issue 653853004: athena: Avoid initializaing chromeos::Network for tests. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « athena/system/status_icon_container_view.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: athena/test/base/athena_test_helper.cc
diff --git a/athena/test/base/athena_test_helper.cc b/athena/test/base/athena_test_helper.cc
index dd9177e02efae28f895207710caac898a920bad8..42e04d1c55bc54a5a775f81af566cfe8036b2b97 100644
--- a/athena/test/base/athena_test_helper.cc
+++ b/athena/test/base/athena_test_helper.cc
@@ -15,7 +15,6 @@
#include "base/run_loop.h"
#include "base/threading/thread.h"
#include "chromeos/dbus/dbus_thread_manager.h"
-#include "chromeos/network/network_handler.h"
#include "ui/aura/env.h"
#include "ui/aura/input_state_lookup.h"
#include "ui/aura/test/env_test_helper.h"
@@ -52,7 +51,6 @@ void AthenaTestHelper::SetUp(ui::ContextFactory* context_factory) {
file_thread_->StartWithOptions(options);
chromeos::DBusThreadManager::Initialize();
- chromeos::NetworkHandler::Initialize();
ui::InitializeInputMethodForTesting();
aura::Env::CreateInstance(true);
aura::Env::GetInstance()->set_context_factory(context_factory);
@@ -81,7 +79,6 @@ void AthenaTestHelper::TearDown() {
#endif
ui::ShutdownInputMethodForTesting();
- chromeos::NetworkHandler::Shutdown();
chromeos::DBusThreadManager::Shutdown();
}
« no previous file with comments | « athena/system/status_icon_container_view.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698