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

Side by Side Diff: chrome/browser/extensions/api/networking_private/networking_private_chromeos_apitest.cc

Issue 1304843004: Add source column to chrome://policy showing the origins of policies. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed another test. Created 5 years, 3 months 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 unified diff | Download patch
OLDNEW
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
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,
589 new base::StringValue(user_policy_blob), nullptr); 590 new base::StringValue(user_policy_blob), nullptr);
590 provider_.UpdateChromePolicy(policy); 591 provider_.UpdateChromePolicy(policy);
591 592
592 content::RunAllPendingInMessageLoop(); 593 content::RunAllPendingInMessageLoop();
593 594
594 EXPECT_TRUE(RunNetworkingSubtest("getManagedProperties")) << message_; 595 EXPECT_TRUE(RunNetworkingSubtest("getManagedProperties")) << message_;
595 } 596 }
596 597
597 IN_PROC_BROWSER_TEST_F(NetworkingPrivateChromeOSApiTest, GetErrorState) { 598 IN_PROC_BROWSER_TEST_F(NetworkingPrivateChromeOSApiTest, GetErrorState) {
598 chromeos::NetworkHandler::Get()->network_state_handler()->SetLastErrorForTest( 599 chromeos::NetworkHandler::Get()->network_state_handler()->SetLastErrorForTest(
(...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after
695 } 696 }
696 697
697 IN_PROC_BROWSER_TEST_F(NetworkingPrivateChromeOSApiTest, CellularSimPuk) { 698 IN_PROC_BROWSER_TEST_F(NetworkingPrivateChromeOSApiTest, CellularSimPuk) {
698 SetupCellular(); 699 SetupCellular();
699 // Lock the SIM 700 // Lock the SIM
700 device_test_->SetSimLocked(kCellularDevicePath, true); 701 device_test_->SetSimLocked(kCellularDevicePath, true);
701 EXPECT_TRUE(RunNetworkingSubtest("cellularSimPuk")) << message_; 702 EXPECT_TRUE(RunNetworkingSubtest("cellularSimPuk")) << message_;
702 } 703 }
703 704
704 } // namespace 705 } // namespace
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698