| 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 <string> | 5 #include <string> |
| 6 | 6 |
| 7 #include "base/base64url.h" | 7 #include "base/base64url.h" |
| 8 #include "base/command_line.h" | 8 #include "base/command_line.h" |
| 9 #include "base/files/file_path.h" | 9 #include "base/files/file_path.h" |
| 10 #include "base/files/file_util.h" | 10 #include "base/files/file_util.h" |
| (...skipping 224 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 235 CloudPolicyClient* client_ = nullptr; | 235 CloudPolicyClient* client_ = nullptr; |
| 236 }; | 236 }; |
| 237 | 237 |
| 238 IN_PROC_BROWSER_TEST_F(ComponentCloudPolicyTest, FetchExtensionPolicy) { | 238 IN_PROC_BROWSER_TEST_F(ComponentCloudPolicyTest, FetchExtensionPolicy) { |
| 239 // Read the initial policy. | 239 // Read the initial policy. |
| 240 ExtensionTestMessageListener policy_listener(kTestPolicyJSON, false); | 240 ExtensionTestMessageListener policy_listener(kTestPolicyJSON, false); |
| 241 event_listener_->Reply("get-policy-Name"); | 241 event_listener_->Reply("get-policy-Name"); |
| 242 EXPECT_TRUE(policy_listener.WaitUntilSatisfied()); | 242 EXPECT_TRUE(policy_listener.WaitUntilSatisfied()); |
| 243 } | 243 } |
| 244 | 244 |
| 245 IN_PROC_BROWSER_TEST_F(ComponentCloudPolicyTest, UpdateExtensionPolicy) { | 245 // http://crbug.com/723548 |
| 246 #if defined(OS_WIN) |
| 247 #define MAYBE_UpdateExtensionPolicy DISABLED_UpdateExtensionPolicy |
| 248 #else |
| 249 #define MAYBE_UpdateExtensionPolicy UpdateExtensionPolicy |
| 250 #endif |
| 251 IN_PROC_BROWSER_TEST_F(ComponentCloudPolicyTest, MAYBE_UpdateExtensionPolicy) { |
| 246 // Read the initial policy. | 252 // Read the initial policy. |
| 247 ExtensionTestMessageListener policy_listener(kTestPolicyJSON, true); | 253 ExtensionTestMessageListener policy_listener(kTestPolicyJSON, true); |
| 248 event_listener_->Reply("get-policy-Name"); | 254 event_listener_->Reply("get-policy-Name"); |
| 249 EXPECT_TRUE(policy_listener.WaitUntilSatisfied()); | 255 EXPECT_TRUE(policy_listener.WaitUntilSatisfied()); |
| 250 | 256 |
| 251 // Update the policy at the server and reload policy. | 257 // Update the policy at the server and reload policy. |
| 252 event_listener_.reset(new ExtensionTestMessageListener("event", true)); | 258 event_listener_.reset(new ExtensionTestMessageListener("event", true)); |
| 253 policy_listener.Reply("idle"); | 259 policy_listener.Reply("idle"); |
| 254 EXPECT_TRUE(test_server_.UpdatePolicyData( | 260 EXPECT_TRUE(test_server_.UpdatePolicyData( |
| 255 dm_protocol::kChromeExtensionPolicyType, kTestExtension, kTestPolicy2)); | 261 dm_protocol::kChromeExtensionPolicyType, kTestExtension, kTestPolicy2)); |
| (...skipping 148 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 404 ExtensionTestMessageListener policy_listener1("{}", true); | 410 ExtensionTestMessageListener policy_listener1("{}", true); |
| 405 event_listener_->Reply("get-policy-Name"); | 411 event_listener_->Reply("get-policy-Name"); |
| 406 EXPECT_TRUE(policy_listener1.WaitUntilSatisfied()); | 412 EXPECT_TRUE(policy_listener1.WaitUntilSatisfied()); |
| 407 | 413 |
| 408 ExtensionTestMessageListener policy_listener2(kTestPolicy2JSON, false); | 414 ExtensionTestMessageListener policy_listener2(kTestPolicy2JSON, false); |
| 409 policy_listener1.Reply("get-policy-Another"); | 415 policy_listener1.Reply("get-policy-Another"); |
| 410 EXPECT_TRUE(policy_listener2.WaitUntilSatisfied()); | 416 EXPECT_TRUE(policy_listener2.WaitUntilSatisfied()); |
| 411 } | 417 } |
| 412 | 418 |
| 413 } // namespace policy | 419 } // namespace policy |
| OLD | NEW |