OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 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/callback.h" | 5 #include "base/callback.h" |
6 #include "base/command_line.h" | 6 #include "base/command_line.h" |
7 #include "chrome/browser/browser_process.h" | 7 #include "chrome/browser/browser_process.h" |
8 #include "chrome/browser/chromeos/login/user.h" | 8 #include "chrome/browser/chromeos/login/user.h" |
9 #include "chrome/browser/chromeos/login/user_manager.h" | 9 #include "chrome/browser/chromeos/login/user_manager.h" |
10 #include "chrome/browser/extensions/api/networking_private/networking_private_pr
ocess_client.h" | 10 #include "chrome/browser/extensions/api/networking_private/networking_private_pr
ocess_client.h" |
(...skipping 239 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
250 "epcifkihnkjgphfkloaaleeakhpmgdmn"); | 250 "epcifkihnkjgphfkloaaleeakhpmgdmn"); |
251 } | 251 } |
252 | 252 |
253 virtual void SetUpOnMainThread() OVERRIDE { | 253 virtual void SetUpOnMainThread() OVERRIDE { |
254 ExtensionApiTest::SetUpOnMainThread(); | 254 ExtensionApiTest::SetUpOnMainThread(); |
255 content::RunAllPendingInMessageLoop(); | 255 content::RunAllPendingInMessageLoop(); |
256 base::DictionaryValue mock_parameters; | 256 base::DictionaryValue mock_parameters; |
257 process_client_ = | 257 process_client_ = |
258 extensions::NetworkingPrivateProcessClient::GetForProfile(profile()); | 258 extensions::NetworkingPrivateProcessClient::GetForProfile(profile()); |
259 // Use Mocks WiFiService to test plumbing. | 259 // Use Mocks WiFiService to test plumbing. |
260 process_client_->SetupForTest(mock_parameters, new CryptoVerifyMock()); | 260 process_client_->SetUpForTest(mock_parameters, new CryptoVerifyMock()); |
261 } | 261 } |
262 | 262 |
263 virtual void TearDownOnMainThread() OVERRIDE { | 263 virtual void TearDownOnMainThread() OVERRIDE { |
264 base::DictionaryValue mock_parameters; | 264 process_client_->TearDownForTest(); |
265 process_client_->SetupForTest(mock_parameters, NULL); | |
266 } | 265 } |
267 | 266 |
268 scoped_refptr<extensions::NetworkingPrivateProcessClient> process_client_; | 267 scoped_refptr<extensions::NetworkingPrivateProcessClient> process_client_; |
269 #endif // OS_CHROMEOS | 268 #endif // OS_CHROMEOS |
270 | 269 |
271 protected: | 270 protected: |
272 policy::MockConfigurationPolicyProvider provider_; | 271 policy::MockConfigurationPolicyProvider provider_; |
273 std::string userhash_; | 272 std::string userhash_; |
274 }; | 273 }; |
275 | 274 |
(...skipping 146 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
422 VerifyAndEncryptData) { | 421 VerifyAndEncryptData) { |
423 EXPECT_TRUE(RunNetworkingSubtest("verifyAndEncryptData")) << message_; | 422 EXPECT_TRUE(RunNetworkingSubtest("verifyAndEncryptData")) << message_; |
424 } | 423 } |
425 | 424 |
426 INSTANTIATE_TEST_CASE_P(ExtensionNetworkingPrivateApiTestInstantiation, | 425 INSTANTIATE_TEST_CASE_P(ExtensionNetworkingPrivateApiTestInstantiation, |
427 ExtensionNetworkingPrivateApiTest, | 426 ExtensionNetworkingPrivateApiTest, |
428 testing::Bool()); | 427 testing::Bool()); |
429 | 428 |
430 } // namespace | 429 } // namespace |
431 | 430 |
OLD | NEW |