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 <memory> | 5 #include <memory> |
6 #include <string> | 6 #include <string> |
7 #include <utility> | 7 #include <utility> |
8 | 8 |
9 #include "base/bind.h" | 9 #include "base/bind.h" |
10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
11 #include "base/files/dir_reader_posix.h" | 11 #include "base/files/dir_reader_posix.h" |
12 #include "base/files/file_path.h" | 12 #include "base/files/file_path.h" |
13 #include "base/logging.h" | 13 #include "base/logging.h" |
14 #include "base/memory/ptr_util.h" | 14 #include "base/memory/ptr_util.h" |
15 #include "base/memory/ref_counted.h" | 15 #include "base/memory/ref_counted.h" |
16 #include "base/path_service.h" | 16 #include "base/path_service.h" |
17 #include "base/run_loop.h" | 17 #include "base/run_loop.h" |
18 #include "base/test/null_task_runner.h" | 18 #include "base/test/null_task_runner.h" |
19 #include "base/values.h" | 19 #include "base/values.h" |
20 #include "chrome/browser/browser_process.h" | 20 #include "chrome/browser/browser_process.h" |
21 #include "chrome/browser/browser_process_platform_part.h" | 21 #include "chrome/browser/browser_process_platform_part.h" |
22 #include "chrome/browser/chromeos/extensions/signin_screen_policy_provider.h" | 22 #include "chrome/browser/chromeos/extensions/signin_screen_policy_provider.h" |
23 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h" | 23 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h" |
24 #include "chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.h" | 24 #include "chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.h" |
25 #include "chrome/browser/chromeos/policy/device_policy_builder.h" | 25 #include "chrome/browser/chromeos/policy/device_policy_builder.h" |
26 #include "chrome/browser/chromeos/policy/device_policy_cros_browser_test.h" | 26 #include "chrome/browser/chromeos/policy/device_policy_cros_browser_test.h" |
27 #include "chrome/browser/chromeos/policy/proto/chrome_device_policy.pb.h" | 27 #include "chrome/browser/chromeos/policy/proto/chrome_device_policy.pb.h" |
28 #include "chrome/browser/chromeos/profiles/profile_helper.h" | 28 #include "chrome/browser/chromeos/profiles/profile_helper.h" |
29 #include "chrome/browser/chromeos/settings/device_settings_service.h" | 29 #include "chrome/browser/chromeos/settings/device_settings_service.h" |
30 #include "chrome/browser/extensions/chrome_test_extension_loader.cc" | |
emaxx
2017/04/07 10:05:25
.h should be included instead of .cc
limasdf
2017/04/07 12:04:40
Oops. fixed. Thanks!
| |
30 #include "chrome/browser/extensions/extension_service.h" | 31 #include "chrome/browser/extensions/extension_service.h" |
31 #include "chrome/browser/extensions/unpacked_installer.h" | |
32 #include "chrome/browser/policy/test/local_policy_test_server.h" | 32 #include "chrome/browser/policy/test/local_policy_test_server.h" |
33 #include "chrome/browser/profiles/profile.h" | 33 #include "chrome/browser/profiles/profile.h" |
34 #include "chrome/browser/ui/browser.h" | 34 #include "chrome/browser/ui/browser.h" |
35 #include "chrome/common/chrome_constants.cc" | 35 #include "chrome/common/chrome_constants.cc" |
36 #include "chrome/common/chrome_paths.h" | 36 #include "chrome/common/chrome_paths.h" |
37 #include "chrome/common/chrome_switches.h" | 37 #include "chrome/common/chrome_switches.h" |
38 #include "chrome/test/base/in_process_browser_test.h" | 38 #include "chrome/test/base/in_process_browser_test.h" |
39 #include "chrome/test/base/ui_test_utils.h" | 39 #include "chrome/test/base/ui_test_utils.h" |
40 #include "chromeos/chromeos_paths.h" | 40 #include "chromeos/chromeos_paths.h" |
41 #include "chromeos/chromeos_switches.h" | 41 #include "chromeos/chromeos_switches.h" |
42 #include "chromeos/dbus/fake_session_manager_client.h" | 42 #include "chromeos/dbus/fake_session_manager_client.h" |
43 #include "components/ownership/owner_key_util.h" | 43 #include "components/ownership/owner_key_util.h" |
44 #include "components/policy/core/browser/browser_policy_connector.h" | 44 #include "components/policy/core/browser/browser_policy_connector.h" |
45 #include "components/policy/core/common/cloud/cloud_policy_client.h" | 45 #include "components/policy/core/common/cloud/cloud_policy_client.h" |
46 #include "components/policy/core/common/cloud/device_management_service.h" | 46 #include "components/policy/core/common/cloud/device_management_service.h" |
47 #include "components/policy/core/common/cloud/mock_cloud_policy_client.h" | 47 #include "components/policy/core/common/cloud/mock_cloud_policy_client.h" |
48 #include "components/policy/core/common/cloud/policy_builder.h" | 48 #include "components/policy/core/common/cloud/policy_builder.h" |
49 #include "components/policy/core/common/cloud/resource_cache.h" | 49 #include "components/policy/core/common/cloud/resource_cache.h" |
50 #include "components/policy/core/common/policy_service.h" | 50 #include "components/policy/core/common/policy_service.h" |
51 #include "components/policy/core/common/policy_switches.h" | 51 #include "components/policy/core/common/policy_switches.h" |
52 #include "components/policy/policy_constants.h" | 52 #include "components/policy/policy_constants.h" |
53 #include "components/policy/proto/chrome_extension_policy.pb.h" | 53 #include "components/policy/proto/chrome_extension_policy.pb.h" |
54 #include "components/policy/proto/device_management_backend.pb.h" | 54 #include "components/policy/proto/device_management_backend.pb.h" |
55 #include "crypto/rsa_private_key.h" | 55 #include "crypto/rsa_private_key.h" |
56 #include "crypto/sha2.h" | 56 #include "crypto/sha2.h" |
57 #include "extensions/browser/extension_registry.h" | 57 #include "extensions/browser/extension_registry.h" |
58 #include "extensions/browser/extension_system.h" | 58 #include "extensions/browser/extension_system.h" |
59 #include "extensions/common/constants.h" | 59 #include "extensions/common/constants.h" |
60 #include "extensions/common/extension.h" | 60 #include "extensions/common/extension.h" |
61 #include "extensions/test/extension_test_notification_observer.h" | |
62 #include "extensions/test/result_catcher.h" | 61 #include "extensions/test/result_catcher.h" |
63 #include "net/http/http_status_code.h" | 62 #include "net/http/http_status_code.h" |
64 #include "net/url_request/test_url_fetcher_factory.h" | 63 #include "net/url_request/test_url_fetcher_factory.h" |
65 #include "testing/gtest/include/gtest/gtest.h" | 64 #include "testing/gtest/include/gtest/gtest.h" |
66 #include "url/gurl.h" | 65 #include "url/gurl.h" |
67 | 66 |
68 namespace policy { | 67 namespace policy { |
69 | 68 |
70 namespace { | 69 namespace { |
71 | 70 |
(...skipping 306 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
378 // The fake component policy is injected by using the local policy test server. | 377 // The fake component policy is injected by using the local policy test server. |
379 // The test extension is installed into the profile manually by the test code | 378 // The test extension is installed into the profile manually by the test code |
380 // (i.e. this class doesn't test the installation of the signin screen | 379 // (i.e. this class doesn't test the installation of the signin screen |
381 // extensions through the admin policy). | 380 // extensions through the admin policy). |
382 class SigninExtensionsDeviceCloudPolicyBrowserTest | 381 class SigninExtensionsDeviceCloudPolicyBrowserTest |
383 : public SigninExtensionsDeviceCloudPolicyBrowserTestBase { | 382 : public SigninExtensionsDeviceCloudPolicyBrowserTestBase { |
384 protected: | 383 protected: |
385 SigninExtensionsDeviceCloudPolicyBrowserTest() | 384 SigninExtensionsDeviceCloudPolicyBrowserTest() |
386 : fetcher_factory_(&fetcher_impl_factory_) {} | 385 : fetcher_factory_(&fetcher_impl_factory_) {} |
387 | 386 |
388 const extensions::Extension* InstallAndLoadTestExtension() const { | 387 scoped_refptr<const extensions::Extension> InstallAndLoadTestExtension() |
389 Profile* signin_profile = GetSigninProfile(); | 388 const { |
390 ExtensionService* service = | 389 extensions::ChromeTestExtensionLoader loader(GetSigninProfile()); |
391 extensions::ExtensionSystem::Get(signin_profile)->extension_service(); | 390 return loader.LoadExtension(GetTestExtensionSourcePath()); |
392 scoped_refptr<extensions::UnpackedInstaller> installer( | |
393 extensions::UnpackedInstaller::Create(service)); | |
394 extensions::ExtensionTestNotificationObserver observer(signin_profile); | |
395 installer->Load(GetTestExtensionSourcePath()); | |
396 observer.WaitForExtensionLoad(); | |
397 return GetTestExtension(); | |
398 } | 391 } |
399 | 392 |
400 private: | 393 private: |
401 void SetUp() override { | 394 void SetUp() override { |
402 StartPolicyTestServer(); | 395 StartPolicyTestServer(); |
403 DevicePolicyCrosBrowserTest::SetUp(); | 396 DevicePolicyCrosBrowserTest::SetUp(); |
404 } | 397 } |
405 | 398 |
406 void SetUpCommandLine(base::CommandLine* command_line) override { | 399 void SetUpCommandLine(base::CommandLine* command_line) override { |
407 SigninExtensionsDeviceCloudPolicyBrowserTestBase::SetUpCommandLine( | 400 SigninExtensionsDeviceCloudPolicyBrowserTestBase::SetUpCommandLine( |
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
455 net::URLFetcherImplFactory fetcher_impl_factory_; | 448 net::URLFetcherImplFactory fetcher_impl_factory_; |
456 net::FakeURLFetcherFactory fetcher_factory_; | 449 net::FakeURLFetcherFactory fetcher_factory_; |
457 base::FilePath component_policy_cache_dir_; | 450 base::FilePath component_policy_cache_dir_; |
458 std::unique_ptr<base::AutoReset<bool>> signin_policy_provided_disabler_; | 451 std::unique_ptr<base::AutoReset<bool>> signin_policy_provided_disabler_; |
459 }; | 452 }; |
460 | 453 |
461 } // namespace | 454 } // namespace |
462 | 455 |
463 IN_PROC_BROWSER_TEST_F(SigninExtensionsDeviceCloudPolicyBrowserTest, | 456 IN_PROC_BROWSER_TEST_F(SigninExtensionsDeviceCloudPolicyBrowserTest, |
464 InstallAndRunInWindow) { | 457 InstallAndRunInWindow) { |
465 const extensions::Extension* extension = InstallAndLoadTestExtension(); | 458 scoped_refptr<const extensions::Extension> extension = |
459 InstallAndLoadTestExtension(); | |
466 ASSERT_TRUE(extension); | 460 ASSERT_TRUE(extension); |
467 Browser* browser = CreateBrowser(GetSigninProfile()); | 461 Browser* browser = CreateBrowser(GetSigninProfile()); |
468 extensions::ResultCatcher result_catcher; | 462 extensions::ResultCatcher result_catcher; |
469 ui_test_utils::NavigateToURL( | 463 ui_test_utils::NavigateToURL( |
470 browser, extension->GetResourceURL(kTestExtensionTestPage)); | 464 browser, extension->GetResourceURL(kTestExtensionTestPage)); |
471 EXPECT_TRUE(result_catcher.GetNextResult()); | 465 EXPECT_TRUE(result_catcher.GetNextResult()); |
472 CloseBrowserSynchronously(browser); | 466 CloseBrowserSynchronously(browser); |
473 } | 467 } |
474 | 468 |
475 namespace { | 469 namespace { |
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
547 ASSERT_TRUE(extension); | 541 ASSERT_TRUE(extension); |
548 Browser* browser = CreateBrowser(GetSigninProfile()); | 542 Browser* browser = CreateBrowser(GetSigninProfile()); |
549 extensions::ResultCatcher result_catcher; | 543 extensions::ResultCatcher result_catcher; |
550 ui_test_utils::NavigateToURL( | 544 ui_test_utils::NavigateToURL( |
551 browser, extension->GetResourceURL(kTestExtensionTestPage)); | 545 browser, extension->GetResourceURL(kTestExtensionTestPage)); |
552 EXPECT_TRUE(result_catcher.GetNextResult()); | 546 EXPECT_TRUE(result_catcher.GetNextResult()); |
553 CloseBrowserSynchronously(browser); | 547 CloseBrowserSynchronously(browser); |
554 } | 548 } |
555 | 549 |
556 } // namespace policy | 550 } // namespace policy |
OLD | NEW |