summaryrefslogtreecommitdiffstats
path: root/ash/system/chromeos
diff options
context:
space:
mode:
authorstevenjb@chromium.org <stevenjb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-10-10 21:07:23 +0000
committerstevenjb@chromium.org <stevenjb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-10-10 21:07:23 +0000
commit7e03dea5f9ed53674276f99676edb12530f2d145 (patch)
treeae2b8bd0b9683d86bd5b4fb433db9d4a5c7a2567 /ash/system/chromeos
parent0dcbd9e7f11f85b3af6e4c86f78e66ede1b02c33 (diff)
downloadchromium_src-7e03dea5f9ed53674276f99676edb12530f2d145.zip
chromium_src-7e03dea5f9ed53674276f99676edb12530f2d145.tar.gz
chromium_src-7e03dea5f9ed53674276f99676edb12530f2d145.tar.bz2
Check and set Profile before connecting to a network
Shill defaults to saving networks to the user profile. We need to sepcify the shared profile for insecure wifi networks. BUG=303358 R=armansito@chromium.org Review URL: https://codereview.chromium.org/26552006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@227995 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/system/chromeos')
-rw-r--r--ash/system/chromeos/network/network_state_notifier_unittest.cc3
1 files changed, 3 insertions, 0 deletions
diff --git a/ash/system/chromeos/network/network_state_notifier_unittest.cc b/ash/system/chromeos/network/network_state_notifier_unittest.cc
index 14bf68f..2626fc2 100644
--- a/ash/system/chromeos/network/network_state_notifier_unittest.cc
+++ b/ash/system/chromeos/network/network_state_notifier_unittest.cc
@@ -14,6 +14,7 @@
#include "chromeos/dbus/dbus_thread_manager.h"
#include "chromeos/dbus/shill_device_client.h"
#include "chromeos/dbus/shill_service_client.h"
+#include "chromeos/login/login_state.h"
#include "third_party/cros_system_api/dbus/service_constants.h"
#include "ui/message_center/message_center.h"
@@ -40,6 +41,7 @@ class NetworkStateNotifierTest : public AshTestBase {
virtual void SetUp() OVERRIDE {
DBusThreadManager::InitializeWithStub();
+ chromeos::LoginState::Initialize();
SetupDefaultShillState();
RunAllPendingInMessageLoop();
AshTestBase::SetUp();
@@ -47,6 +49,7 @@ class NetworkStateNotifierTest : public AshTestBase {
virtual void TearDown() OVERRIDE {
AshTestBase::TearDown();
+ chromeos::LoginState::Shutdown();
DBusThreadManager::Shutdown();
}