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

Unified Diff: chrome/browser/chromeos/login/saml/saml_browsertest.cc

Issue 1097663003: Fetch OAuth2 tokens prior to profile creation. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: set up default networks Created 5 years, 8 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
Index: chrome/browser/chromeos/login/saml/saml_browsertest.cc
diff --git a/chrome/browser/chromeos/login/saml/saml_browsertest.cc b/chrome/browser/chromeos/login/saml/saml_browsertest.cc
index ce4d3c0ffdf0209c493636e7fcb804fa01232e08..d896a0435b59c63dbe97acf4d25bbcbf62b03a83 100644
--- a/chrome/browser/chromeos/login/saml/saml_browsertest.cc
+++ b/chrome/browser/chromeos/login/saml/saml_browsertest.cc
@@ -51,6 +51,7 @@
#include "chromeos/dbus/dbus_thread_manager.h"
#include "chromeos/dbus/fake_session_manager_client.h"
#include "chromeos/dbus/session_manager_client.h"
+#include "chromeos/dbus/shill_manager_client.h"
#include "chromeos/settings/cros_settings_names.h"
#include "components/policy/core/browser/browser_policy_connector.h"
#include "components/policy/core/common/mock_configuration_policy_provider.h"
@@ -292,6 +293,12 @@ class SamlTest : public OobeBaseTest, public testing::WithParamInterface<bool> {
embedded_test_server()->RegisterRequestHandler(base::Bind(
&FakeSamlIdp::HandleRequest, base::Unretained(&fake_saml_idp_)));
+ // Set up fake networks.
+ DBusThreadManager::Get()
+ ->GetShillManagerClient()
+ ->GetTestInterface()
+ ->SetupDefaultEnvironment();
xiyuan 2015/04/23 16:09:23 nit: Move this to SAMLPolicyTest::SetUpOnMainThrea
achuithb 2015/04/23 22:11:16 Done.
+
OobeBaseTest::SetUpOnMainThread();
}

Powered by Google App Engine
This is Rietveld 408576698