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

Unified Diff: chrome/browser/chromeos/login/oobe_base_test.cc

Issue 118733002: Added merge session request throttle for XHR requests (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years 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/oobe_base_test.cc
diff --git a/chrome/browser/chromeos/login/oobe_base_test.cc b/chrome/browser/chromeos/login/oobe_base_test.cc
index 090be6db8d12e9d3a0901b813c59872a707a8143..82cb631f7e1fdaa405baeda019bdfe2038c5827c 100644
--- a/chrome/browser/chromeos/login/oobe_base_test.cc
+++ b/chrome/browser/chromeos/login/oobe_base_test.cc
@@ -34,7 +34,9 @@ const char kStubEthernetServicePath[] = "eth1";
} // namespace
-OobeBaseTest::OobeBaseTest() : network_portal_detector_(NULL) {
+OobeBaseTest::OobeBaseTest()
+ : fake_gaia_(new FakeGaia()),
+ network_portal_detector_(NULL) {
set_exit_when_last_browser_closes(false);
}
@@ -46,7 +48,7 @@ void OobeBaseTest::SetUp() {
PathService::Get(chrome::DIR_TEST_DATA, &test_data_dir);
embedded_test_server()->ServeFilesFromDirectory(test_data_dir);
embedded_test_server()->RegisterRequestHandler(
- base::Bind(&FakeGaia::HandleRequest, base::Unretained(&fake_gaia_)));
+ base::Bind(&FakeGaia::HandleRequest, base::Unretained(fake_gaia_.get())));
ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
// Stop IO thread here because no threads are allowed while
// spawning sandbox host process. See crbug.com/322732.
@@ -96,7 +98,7 @@ void OobeBaseTest::SetUpCommandLine(CommandLine* command_line) {
command_line->AppendSwitchASCII(::switches::kLsoUrl, gaia_url.spec());
command_line->AppendSwitchASCII(::switches::kGoogleApisUrl,
gaia_url.spec());
- fake_gaia_.Initialize();
+ fake_gaia_->Initialize();
}
void OobeBaseTest::SimulateNetworkOffline() {

Powered by Google App Engine
This is Rietveld 408576698