chrome/browser/extensions/api/enterprise_platform_keys/enterprise_platform_keys_apitest_nss.cc - Issue 1658793002: Update chrome for new prefs location.

Side by Side Diff: chrome/browser/extensions/api/enterprise_platform_keys/enterprise_platform_keys_apitest_nss.cc

Issue 1658793002: Update chrome for new prefs location. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 10 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

« no previous file with comments | « chrome/browser/extensions/api/enterprise_device_attributes/enterprise_device_attributes_apitest.cc ('k') | chrome/browser/extensions/api/enterprise_platform_keys_private/enterprise_platform_keys_private_api.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 // Copyright 2014 The Chromium Authors. All rights reserved.	1 // Copyright 2014 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 <cryptohi.h>	5 #include <cryptohi.h>

6 #include <stddef.h>	6 #include <stddef.h>

7	7

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

11 #include "base/prefs/pref_service.h"

12 #include "base/strings/stringprintf.h"	11 #include "base/strings/stringprintf.h"

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

14 #include "chrome/browser/chromeos/login/test/https_forwarder.h"	13 #include "chrome/browser/chromeos/login/test/https_forwarder.h"

15 #include "chrome/browser/chromeos/policy/affiliation_test_helper.h"	14 #include "chrome/browser/chromeos/policy/affiliation_test_helper.h"

16 #include "chrome/browser/chromeos/policy/device_policy_cros_browser_test.h"	15 #include "chrome/browser/chromeos/policy/device_policy_cros_browser_test.h"

17 #include "chrome/browser/extensions/extension_apitest.h"	16 #include "chrome/browser/extensions/extension_apitest.h"

18 #include "chrome/browser/net/nss_context.h"	17 #include "chrome/browser/net/nss_context.h"

19 #include "chrome/browser/net/url_request_mock_util.h"	18 #include "chrome/browser/net/url_request_mock_util.h"

20 #include "chrome/common/chrome_paths.h"	19 #include "chrome/common/chrome_paths.h"

21 #include "chrome/test/base/ui_test_utils.h"	20 #include "chrome/test/base/ui_test_utils.h"

22 #include "chromeos/chromeos_switches.h"	21 #include "chromeos/chromeos_switches.h"

23 #include "chromeos/dbus/dbus_thread_manager.h"	22 #include "chromeos/dbus/dbus_thread_manager.h"

24 #include "chromeos/dbus/fake_session_manager_client.h"	23 #include "chromeos/dbus/fake_session_manager_client.h"

25 #include "chromeos/dbus/session_manager_client.h"	24 #include "chromeos/dbus/session_manager_client.h"

26 #include "chromeos/login/user_names.h"	25 #include "chromeos/login/user_names.h"

27 #include "components/policy/core/browser/browser_policy_connector.h"	26 #include "components/policy/core/browser/browser_policy_connector.h"

28 #include "components/policy/core/common/mock_configuration_policy_provider.h"	27 #include "components/policy/core/common/mock_configuration_policy_provider.h"

29 #include "components/policy/core/common/policy_map.h"	28 #include "components/policy/core/common/policy_map.h"

	29 #include "components/prefs/pref_service.h"

30 #include "components/signin/core/account_id/account_id.h"	30 #include "components/signin/core/account_id/account_id.h"

31 #include "components/user_manager/user_manager.h"	31 #include "components/user_manager/user_manager.h"

32 #include "content/public/common/content_switches.h"	32 #include "content/public/common/content_switches.h"

33 #include "crypto/nss_util_internal.h"	33 #include "crypto/nss_util_internal.h"

34 #include "crypto/scoped_test_system_nss_key_slot.h"	34 #include "crypto/scoped_test_system_nss_key_slot.h"

35 #include "extensions/browser/extension_registry.h"	35 #include "extensions/browser/extension_registry.h"

36 #include "extensions/browser/test_extension_registry_observer.h"	36 #include "extensions/browser/test_extension_registry_observer.h"

37 #include "extensions/browser/test_extension_registry_observer.h"	37 #include "extensions/browser/test_extension_registry_observer.h"

38 #include "extensions/test/result_catcher.h"	38 #include "extensions/test/result_catcher.h"

39 #include "google_apis/gaia/fake_gaia.h"	39 #include "google_apis/gaia/fake_gaia.h"

(...skipping 465 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
505 extensions::ExtensionRegistry* registry =	505 extensions::ExtensionRegistry* registry =

506 extensions::ExtensionRegistry::Get(profile());	506 extensions::ExtensionRegistry::Get(profile());

507 const extensions::Extension* extension =	507 const extensions::Extension* extension =

508 GetExtensionByPath(registry->enabled_extensions(), extension_path);	508 GetExtensionByPath(registry->enabled_extensions(), extension_path);

509 ASSERT_FALSE(extension->install_warnings().empty());	509 ASSERT_FALSE(extension->install_warnings().empty());

510 EXPECT_EQ(	510 EXPECT_EQ(

511 "'enterprise.platformKeys' is not allowed for specified install "	511 "'enterprise.platformKeys' is not allowed for specified install "

512 "location.",	512 "location.",

513 extension->install_warnings()[0].message);	513 extension->install_warnings()[0].message);

514 }	514 }

OLD	NEW