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/bind.h" | 5 #include "base/bind.h" |
6 #include "base/callback.h" | 6 #include "base/callback.h" |
7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
8 #include "base/macros.h" | 8 #include "base/macros.h" |
9 #include "base/memory/scoped_ptr.h" | 9 #include "base/memory/scoped_ptr.h" |
10 #include "chrome/browser/browser_process.h" | 10 #include "chrome/browser/browser_process.h" |
(...skipping 568 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
579 " \"Security\": \"WPA-PSK\" }" | 579 " \"Security\": \"WPA-PSK\" }" |
580 " }" | 580 " }" |
581 " ]," | 581 " ]," |
582 " \"Certificates\": []," | 582 " \"Certificates\": []," |
583 " \"Type\": \"UnencryptedConfiguration\"" | 583 " \"Type\": \"UnencryptedConfiguration\"" |
584 "}"; | 584 "}"; |
585 | 585 |
586 policy::PolicyMap policy; | 586 policy::PolicyMap policy; |
587 policy.Set(policy::key::kOpenNetworkConfiguration, | 587 policy.Set(policy::key::kOpenNetworkConfiguration, |
588 policy::POLICY_LEVEL_MANDATORY, policy::POLICY_SCOPE_USER, | 588 policy::POLICY_LEVEL_MANDATORY, policy::POLICY_SCOPE_USER, |
589 policy::POLICY_SOURCE_CLOUD, | |
590 new base::StringValue(user_policy_blob), nullptr); | 589 new base::StringValue(user_policy_blob), nullptr); |
591 provider_.UpdateChromePolicy(policy); | 590 provider_.UpdateChromePolicy(policy); |
592 | 591 |
593 content::RunAllPendingInMessageLoop(); | 592 content::RunAllPendingInMessageLoop(); |
594 | 593 |
595 EXPECT_TRUE(RunNetworkingSubtest("getManagedProperties")) << message_; | 594 EXPECT_TRUE(RunNetworkingSubtest("getManagedProperties")) << message_; |
596 } | 595 } |
597 | 596 |
598 IN_PROC_BROWSER_TEST_F(NetworkingPrivateChromeOSApiTest, GetErrorState) { | 597 IN_PROC_BROWSER_TEST_F(NetworkingPrivateChromeOSApiTest, GetErrorState) { |
599 chromeos::NetworkHandler::Get()->network_state_handler()->SetLastErrorForTest( | 598 chromeos::NetworkHandler::Get()->network_state_handler()->SetLastErrorForTest( |
(...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
696 } | 695 } |
697 | 696 |
698 IN_PROC_BROWSER_TEST_F(NetworkingPrivateChromeOSApiTest, CellularSimPuk) { | 697 IN_PROC_BROWSER_TEST_F(NetworkingPrivateChromeOSApiTest, CellularSimPuk) { |
699 SetupCellular(); | 698 SetupCellular(); |
700 // Lock the SIM | 699 // Lock the SIM |
701 device_test_->SetSimLocked(kCellularDevicePath, true); | 700 device_test_->SetSimLocked(kCellularDevicePath, true); |
702 EXPECT_TRUE(RunNetworkingSubtest("cellularSimPuk")) << message_; | 701 EXPECT_TRUE(RunNetworkingSubtest("cellularSimPuk")) << message_; |
703 } | 702 } |
704 | 703 |
705 } // namespace | 704 } // namespace |
OLD | NEW |