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/extension_apitest.h" | 10 #include "chrome/browser/extensions/extension_apitest.h" |
(...skipping 306 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
317 " }" | 317 " }" |
318 " ]," | 318 " ]," |
319 " \"Certificates\": []," | 319 " \"Certificates\": []," |
320 " \"Type\": \"UnencryptedConfiguration\"" | 320 " \"Type\": \"UnencryptedConfiguration\"" |
321 "}"; | 321 "}"; |
322 | 322 |
323 policy::PolicyMap policy; | 323 policy::PolicyMap policy; |
324 policy.Set(policy::key::kOpenNetworkConfiguration, | 324 policy.Set(policy::key::kOpenNetworkConfiguration, |
325 policy::POLICY_LEVEL_MANDATORY, | 325 policy::POLICY_LEVEL_MANDATORY, |
326 policy::POLICY_SCOPE_USER, | 326 policy::POLICY_SCOPE_USER, |
327 Value::CreateStringValue(user_policy_blob), | 327 new base::StringValue(user_policy_blob), |
328 NULL); | 328 NULL); |
329 provider_.UpdateChromePolicy(policy); | 329 provider_.UpdateChromePolicy(policy); |
330 | 330 |
331 content::RunAllPendingInMessageLoop(); | 331 content::RunAllPendingInMessageLoop(); |
332 | 332 |
333 EXPECT_TRUE(RunNetworkingSubtest("getManagedProperties")) << message_; | 333 EXPECT_TRUE(RunNetworkingSubtest("getManagedProperties")) << message_; |
334 } | 334 } |
335 #endif // OS_CHROMEOS | 335 #endif // OS_CHROMEOS |
336 | 336 |
337 IN_PROC_BROWSER_TEST_P(ExtensionNetworkingPrivateApiTest, | 337 IN_PROC_BROWSER_TEST_P(ExtensionNetworkingPrivateApiTest, |
(...skipping 26 matching lines...) Expand all Loading... |
364 IN_PROC_BROWSER_TEST_P(ExtensionNetworkingPrivateApiTest, | 364 IN_PROC_BROWSER_TEST_P(ExtensionNetworkingPrivateApiTest, |
365 VerifyAndEncryptData) { | 365 VerifyAndEncryptData) { |
366 EXPECT_TRUE(RunNetworkingSubtest("verifyAndEncryptData")) << message_; | 366 EXPECT_TRUE(RunNetworkingSubtest("verifyAndEncryptData")) << message_; |
367 } | 367 } |
368 | 368 |
369 INSTANTIATE_TEST_CASE_P(ExtensionNetworkingPrivateApiTestInstantiation, | 369 INSTANTIATE_TEST_CASE_P(ExtensionNetworkingPrivateApiTestInstantiation, |
370 ExtensionNetworkingPrivateApiTest, | 370 ExtensionNetworkingPrivateApiTest, |
371 testing::Bool()); | 371 testing::Bool()); |
372 | 372 |
373 } // namespace chromeos | 373 } // namespace chromeos |
OLD | NEW |