OLD | NEW |
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "base/command_line.h" | 5 #include "base/command_line.h" |
6 #include "base/path_service.h" | 6 #include "base/path_service.h" |
7 #include "chrome/browser/chrome_browser_main.h" | 7 #include "chrome/browser/chrome_browser_main.h" |
8 #include "chrome/browser/chrome_browser_main_extra_parts.h" | 8 #include "chrome/browser/chrome_browser_main_extra_parts.h" |
9 #include "chrome/browser/chrome_content_browser_client.h" | 9 #include "chrome/browser/chrome_content_browser_client.h" |
10 #include "chrome/browser/chrome_notification_types.h" | 10 #include "chrome/browser/chrome_notification_types.h" |
(...skipping 127 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
138 command_line->AppendSwitchASCII( | 138 command_line->AppendSwitchASCII( |
139 chromeos::switches::kAuthExtensionPath, "gaia_auth"); | 139 chromeos::switches::kAuthExtensionPath, "gaia_auth"); |
140 } | 140 } |
141 | 141 |
142 virtual void SetUpInProcessBrowserTestFixture() OVERRIDE { | 142 virtual void SetUpInProcessBrowserTestFixture() OVERRIDE { |
143 content_browser_client_.reset(new TestContentBrowserClient()); | 143 content_browser_client_.reset(new TestContentBrowserClient()); |
144 original_content_browser_client_ = content::SetBrowserClientForTesting( | 144 original_content_browser_client_ = content::SetBrowserClientForTesting( |
145 content_browser_client_.get()); | 145 content_browser_client_.get()); |
146 base::FilePath test_data_dir; | 146 base::FilePath test_data_dir; |
147 PathService::Get(chrome::DIR_TEST_DATA, &test_data_dir); | 147 PathService::Get(chrome::DIR_TEST_DATA, &test_data_dir); |
148 CHECK(file_util::ReadFileToString(test_data_dir.Append(kServiceLogin), | 148 CHECK(base::ReadFileToString(test_data_dir.Append(kServiceLogin), |
149 &service_login_response_)); | 149 &service_login_response_)); |
150 } | 150 } |
151 | 151 |
152 virtual void SetUpOnMainThread() OVERRIDE { | 152 virtual void SetUpOnMainThread() OVERRIDE { |
153 test_server_ = new EmbeddedTestServer( | 153 test_server_ = new EmbeddedTestServer( |
154 content::BrowserThread::GetMessageLoopProxyForThread( | 154 content::BrowserThread::GetMessageLoopProxyForThread( |
155 content::BrowserThread::IO)); | 155 content::BrowserThread::IO)); |
156 CHECK(test_server_->InitializeAndWaitUntilReady()); | 156 CHECK(test_server_->InitializeAndWaitUntilReady()); |
157 test_server_->RegisterRequestHandler( | 157 test_server_->RegisterRequestHandler( |
158 base::Bind(&OobeTest::HandleRequest, base::Unretained(this))); | 158 base::Bind(&OobeTest::HandleRequest, base::Unretained(this))); |
159 LOG(INFO) << "Set up http server at " << test_server_->base_url(); | 159 LOG(INFO) << "Set up http server at " << test_server_->base_url(); |
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
213 wizard_controller->SkipToLoginForTesting(); | 213 wizard_controller->SkipToLoginForTesting(); |
214 | 214 |
215 scoped_refptr<content::MessageLoopRunner> runner = | 215 scoped_refptr<content::MessageLoopRunner> runner = |
216 new content::MessageLoopRunner; | 216 new content::MessageLoopRunner; |
217 content_browser_client_->browser_main_extra_parts_->set_quit_task( | 217 content_browser_client_->browser_main_extra_parts_->set_quit_task( |
218 runner->QuitClosure()); | 218 runner->QuitClosure()); |
219 runner->Run(); | 219 runner->Run(); |
220 } | 220 } |
221 | 221 |
222 } // namespace | 222 } // namespace |
OLD | NEW |