chrome/browser/policy/cloud/component_cloud_policy_browsertest.cc - Issue 58313002: Removed the PolicyDefinitionList.

Side by Side Diff: chrome/browser/policy/cloud/component_cloud_policy_browsertest.cc

Issue 58313002: Removed the PolicyDefinitionList. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@chrome-policy-schema-10-use-registry

Patch Set: Created 7 years, 1 month 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

« chrome/browser/policy/cloud/cloud_policy_manager_browsertest.cc ('K') | « chrome/browser/policy/cloud/cloud_policy_manager_unittest.cc ('k') | chrome/browser/policy/config_dir_policy_loader_unittest.cc » ('j') | chrome/browser/policy/configuration_policy_handler_list.cc » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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/command_line.h"	7 #include "base/command_line.h"

8 #include "base/files/file_path.h"	8 #include "base/files/file_path.h"

9 #include "base/memory/ref_counted.h"	9 #include "base/memory/ref_counted.h"

10 #include "base/path_service.h"	10 #include "base/path_service.h"

11 #include "base/run_loop.h"	11 #include "base/run_loop.h"

12 #include "chrome/browser/browser_process.h"	12 #include "chrome/browser/browser_process.h"

13 #include "chrome/browser/extensions/extension_browsertest.h"	13 #include "chrome/browser/extensions/extension_browsertest.h"

14 #include "chrome/browser/extensions/extension_test_message_listener.h"	14 #include "chrome/browser/extensions/extension_test_message_listener.h"

15 #include "chrome/browser/policy/browser_policy_connector.h"	15 #include "chrome/browser/policy/browser_policy_connector.h"

16 #include "chrome/browser/policy/cloud/cloud_policy_constants.h"	16 #include "chrome/browser/policy/cloud/cloud_policy_constants.h"

17 #include "chrome/browser/policy/cloud/mock_cloud_policy_client.h"	17 #include "chrome/browser/policy/cloud/mock_cloud_policy_client.h"

18 #include "chrome/browser/policy/policy_service.h"	18 #include "chrome/browser/policy/policy_service.h"

19 #include "chrome/browser/policy/policy_test_utils.h"

20 #include "chrome/browser/policy/profile_policy_connector.h"	19 #include "chrome/browser/policy/profile_policy_connector.h"

21 #include "chrome/browser/policy/profile_policy_connector_factory.h"	20 #include "chrome/browser/policy/profile_policy_connector_factory.h"

22 #include "chrome/browser/policy/proto/cloud/chrome_extension_policy.pb.h"	21 #include "chrome/browser/policy/proto/cloud/chrome_extension_policy.pb.h"

23 #include "chrome/browser/policy/test/local_policy_test_server.h"	22 #include "chrome/browser/policy/test/local_policy_test_server.h"

	23 #include "chrome/browser/policy/test/policy_test_utils.h"
	bartfab (slow) 2013/11/05 18:18:33 Nit: chrome/browser/policy/test/policy_test_utils. Nit: chrome/browser/policy/test/policy_test_utils.h now implicitly pulls in "callback_forward.h", so all implementation files using it must #include "base/callback.h" Joao da Silva 2013/11/07 20:27:27 This file doesn't use the Callback interface Show quoted text On 2013/11/05 18:18:33, bartfab wrote: > Nit: chrome/browser/policy/test/policy_test_utils.h now implicitly pulls in > "callback_forward.h", so all implementation files using it must #include > "base/callback.h" This file doesn't use the Callback interface
24 #include "chrome/browser/profiles/profile.h"	24 #include "chrome/browser/profiles/profile.h"

25 #include "chrome/common/chrome_paths.h"	25 #include "chrome/common/chrome_paths.h"

26 #include "chrome/common/chrome_switches.h"	26 #include "chrome/common/chrome_switches.h"

27 #include "chrome/common/extensions/extension.h"	27 #include "chrome/common/extensions/extension.h"

28 #include "net/url_request/url_request_context_getter.h"	28 #include "net/url_request/url_request_context_getter.h"

29 #include "policy/proto/cloud_policy.pb.h"	29 #include "policy/proto/cloud_policy.pb.h"

30 #include "testing/gmock/include/gmock/gmock.h"	30 #include "testing/gmock/include/gmock/gmock.h"

31 #include "testing/gtest/include/gtest/gtest.h"	31 #include "testing/gtest/include/gtest/gtest.h"

32	32

33 #if defined(OS_CHROMEOS)	33 #if defined(OS_CHROMEOS)

(...skipping 214 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
248 ASSERT_EQ(kTestExtension2, extension2->id());	248 ASSERT_EQ(kTestExtension2, extension2->id());

249	249

250 // This extension only sends the 'policy' signal once it receives the policy,	250 // This extension only sends the 'policy' signal once it receives the policy,

251 // and after verifying it has the expected value. Otherwise it sends 'fail'.	251 // and after verifying it has the expected value. Otherwise it sends 'fail'.

252 EXPECT_TRUE(result_listener.WaitUntilSatisfied());	252 EXPECT_TRUE(result_listener.WaitUntilSatisfied());

253 }	253 }

254	254

255 #endif // OS_CHROMEOS	255 #endif // OS_CHROMEOS

256	256

257 } // namespace policy	257 } // namespace policy

OLD	NEW