OLD | NEW |
---|---|
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 "chrome/browser/ui/webui/extensions/extension_settings_browsertest.h" | 5 #include "chrome/browser/ui/webui/extensions/extension_settings_browsertest.h" |
6 | 6 |
7 #include "base/files/file_path.h" | 7 #include "base/files/file_path.h" |
8 #include "base/path_service.h" | 8 #include "base/path_service.h" |
9 #include "base/strings/string_number_conversions.h" | 9 #include "base/strings/string_number_conversions.h" |
10 #include "chrome/browser/chrome_notification_types.h" | 10 #include "chrome/browser/chrome_notification_types.h" |
11 #include "chrome/browser/extensions/crx_installer.h" | 11 #include "chrome/browser/extensions/crx_installer.h" |
12 #include "chrome/browser/extensions/extension_error_reporter.h" | 12 #include "chrome/browser/extensions/extension_error_reporter.h" |
13 #include "chrome/browser/extensions/extension_install_prompt.h" | 13 #include "chrome/browser/extensions/extension_install_prompt.h" |
14 #include "chrome/browser/extensions/extension_install_prompt_show_params.h" | 14 #include "chrome/browser/extensions/extension_install_prompt_show_params.h" |
15 #include "chrome/browser/extensions/extension_service.h" | 15 #include "chrome/browser/extensions/extension_service.h" |
16 #include "chrome/browser/extensions/unpacked_installer.h" | 16 #include "chrome/browser/extensions/unpacked_installer.h" |
17 #include "chrome/browser/profiles/profile.h" | 17 #include "chrome/browser/profiles/profile.h" |
18 #include "chrome/browser/profiles/profile_manager.h" | 18 #include "chrome/browser/profiles/profile_manager.h" |
19 #include "chrome/browser/ui/browser.h" | 19 #include "chrome/browser/ui/browser.h" |
20 #include "chrome/browser/ui/tabs/tab_strip_model.h" | 20 #include "chrome/browser/ui/tabs/tab_strip_model.h" |
21 #include "chrome/common/chrome_paths.h" | 21 #include "chrome/common/chrome_paths.h" |
22 #include "content/public/browser/notification_registrar.h" | 22 #include "content/public/browser/notification_registrar.h" |
23 #include "content/public/browser/notification_service.h" | 23 #include "content/public/browser/notification_service.h" |
24 #include "content/public/browser/render_view_host.h" | 24 #include "content/public/browser/render_view_host.h" |
25 #include "content/public/test/browser_test_utils.h" | 25 #include "content/public/test/browser_test_utils.h" |
26 #include "content/public/test/test_utils.h" | 26 #include "content/public/test/test_utils.h" |
27 #include "extensions/browser/extension_registry.h" | 27 #include "extensions/browser/extension_registry.h" |
28 #include "extensions/browser/extension_system.h" | 28 #include "extensions/browser/extension_system.h" |
29 #include "extensions/browser/test_extension_registry_observer.h" | |
29 #include "extensions/common/extension_set.h" | 30 #include "extensions/common/extension_set.h" |
30 | 31 |
31 using extensions::Extension; | 32 using extensions::Extension; |
32 using extensions::TestManagementPolicyProvider; | 33 using extensions::TestManagementPolicyProvider; |
33 | 34 |
34 ExtensionSettingsUIBrowserTest::ExtensionSettingsUIBrowserTest() | 35 ExtensionSettingsUIBrowserTest::ExtensionSettingsUIBrowserTest() |
35 : profile_(NULL), | 36 : profile_(NULL), |
36 policy_provider_(TestManagementPolicyProvider::PROHIBIT_MODIFY_STATUS | | 37 policy_provider_(TestManagementPolicyProvider::PROHIBIT_MODIFY_STATUS | |
37 TestManagementPolicyProvider::MUST_REMAIN_ENABLED | | 38 TestManagementPolicyProvider::MUST_REMAIN_ENABLED | |
38 TestManagementPolicyProvider::MUST_REMAIN_INSTALLED) {} | 39 TestManagementPolicyProvider::MUST_REMAIN_INSTALLED) {} |
(...skipping 13 matching lines...) Expand all Loading... | |
52 observer_.reset(new ExtensionTestNotificationObserver(browser())); | 53 observer_.reset(new ExtensionTestNotificationObserver(browser())); |
53 } | 54 } |
54 | 55 |
55 void ExtensionSettingsUIBrowserTest::InstallGoodExtension() { | 56 void ExtensionSettingsUIBrowserTest::InstallGoodExtension() { |
56 base::FilePath test_data_dir; | 57 base::FilePath test_data_dir; |
57 if (!PathService::Get(chrome::DIR_TEST_DATA, &test_data_dir)) { | 58 if (!PathService::Get(chrome::DIR_TEST_DATA, &test_data_dir)) { |
58 ADD_FAILURE(); | 59 ADD_FAILURE(); |
59 return; | 60 return; |
60 } | 61 } |
61 base::FilePath extensions_data_dir = test_data_dir.AppendASCII("extensions"); | 62 base::FilePath extensions_data_dir = test_data_dir.AppendASCII("extensions"); |
62 InstallExtension(extensions_data_dir.AppendASCII("good.crx")); | 63 EXPECT_TRUE(InstallExtension(extensions_data_dir.AppendASCII("good.crx"))); |
64 } | |
65 | |
66 void ExtensionSettingsUIBrowserTest::InstallErrorsExtension() { | |
67 base::FilePath test_data_dir; | |
68 if (!PathService::Get(chrome::DIR_TEST_DATA, &test_data_dir)) { | |
69 ADD_FAILURE(); | |
70 return; | |
71 } | |
72 base::FilePath extensions_data_dir = test_data_dir.AppendASCII("extensions"); | |
73 extensions_data_dir = extensions_data_dir.AppendASCII("error_console"); | |
74 EXPECT_TRUE(InstallUnpackedExtension( | |
75 extensions_data_dir.AppendASCII("runtime_and_manifest_errors"), | |
76 "pdlpifnclfacjobnmbpngemkalkjamnf")); | |
63 } | 77 } |
64 | 78 |
65 void ExtensionSettingsUIBrowserTest::AddManagedPolicyProvider() { | 79 void ExtensionSettingsUIBrowserTest::AddManagedPolicyProvider() { |
66 auto* extension_service = extensions::ExtensionSystem::Get(GetProfile()); | 80 auto* extension_service = extensions::ExtensionSystem::Get(GetProfile()); |
67 extension_service->management_policy()->RegisterProvider(&policy_provider_); | 81 extension_service->management_policy()->RegisterProvider(&policy_provider_); |
68 } | 82 } |
69 | 83 |
70 class MockAutoConfirmExtensionInstallPrompt : public ExtensionInstallPrompt { | 84 class MockAutoConfirmExtensionInstallPrompt : public ExtensionInstallPrompt { |
71 public: | 85 public: |
72 explicit MockAutoConfirmExtensionInstallPrompt( | 86 explicit MockAutoConfirmExtensionInstallPrompt( |
73 content::WebContents* web_contents) | 87 content::WebContents* web_contents) |
74 : ExtensionInstallPrompt(web_contents) {} | 88 : ExtensionInstallPrompt(web_contents) {} |
75 | 89 |
76 // Proceed without confirmation prompt. | 90 // Proceed without confirmation prompt. |
77 void ConfirmInstall(Delegate* delegate, | 91 void ConfirmInstall(Delegate* delegate, |
78 const Extension* extension, | 92 const Extension* extension, |
79 const ShowDialogCallback& show_dialog_callback) override { | 93 const ShowDialogCallback& show_dialog_callback) override { |
80 delegate->InstallUIProceed(); | 94 delegate->InstallUIProceed(); |
81 } | 95 } |
82 }; | 96 }; |
83 | 97 |
84 const Extension* ExtensionSettingsUIBrowserTest::InstallExtension( | 98 const Extension* ExtensionSettingsUIBrowserTest::InstallUnpackedExtension( |
85 const base::FilePath& path) { | 99 const base::FilePath& path, const char* id) { |
86 Profile* profile = this->GetProfile(); | 100 if (path.empty()) |
101 return NULL; | |
102 | |
103 Profile* profile = GetProfile(); | |
87 ExtensionService* service = | 104 ExtensionService* service = |
88 extensions::ExtensionSystem::Get(profile)->extension_service(); | 105 extensions::ExtensionSystem::Get(profile)->extension_service(); |
89 extensions::ExtensionRegistry* registry = | 106 extensions::ExtensionRegistry* registry = |
107 extensions::ExtensionRegistry::Get(profile); | |
108 service->set_show_extensions_prompts(false); | |
Dan Beam
2015/02/24 00:55:38
nit: reverse these ^^ two lines, e.g.,
Extensio
hcarmona
2015/02/24 02:49:44
Done.
| |
109 | |
110 extensions::TestExtensionRegistryObserver observer(registry, id); | |
Dan Beam
2015/02/24 02:40:49
i think this class auto registers itself as an obs
hcarmona
2015/02/24 02:49:44
Awesome, thanks! Done.
| |
111 registry->AddObserver(&observer); | |
112 | |
113 extensions::UnpackedInstaller::Create(service)->Load(path); | |
114 | |
115 // Test will timeout if extension is not loaded. | |
116 observer.WaitForExtensionLoaded(); | |
117 registry->RemoveObserver(&observer); | |
118 return service->GetExtensionById(last_loaded_extension_id(), false); | |
119 } | |
120 | |
121 const Extension* ExtensionSettingsUIBrowserTest::InstallExtension( | |
122 const base::FilePath& path) { | |
123 Profile* profile = GetProfile(); | |
124 ExtensionService* service = | |
125 extensions::ExtensionSystem::Get(profile)->extension_service(); | |
126 extensions::ExtensionRegistry* registry = | |
90 extensions::ExtensionRegistry::Get(profile); | 127 extensions::ExtensionRegistry::Get(profile); |
91 service->set_show_extensions_prompts(false); | 128 service->set_show_extensions_prompts(false); |
92 size_t num_before = registry->enabled_extensions().size(); | 129 size_t num_before = registry->enabled_extensions().size(); |
93 { | 130 { |
94 scoped_ptr<ExtensionInstallPrompt> install_ui; | 131 scoped_ptr<ExtensionInstallPrompt> install_ui; |
95 install_ui.reset(new MockAutoConfirmExtensionInstallPrompt( | 132 install_ui.reset(new MockAutoConfirmExtensionInstallPrompt( |
96 browser()->tab_strip_model()->GetActiveWebContents())); | 133 browser()->tab_strip_model()->GetActiveWebContents())); |
97 | 134 |
98 base::FilePath crx_path = path; | 135 base::FilePath crx_path = path; |
99 DCHECK(crx_path.Extension() == FILE_PATH_LITERAL(".crx")); | 136 DCHECK(crx_path.Extension() == FILE_PATH_LITERAL(".crx")); |
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
135 iter != errors->end(); ++iter) | 172 iter != errors->end(); ++iter) |
136 VLOG(1) << *iter; | 173 VLOG(1) << *iter; |
137 | 174 |
138 return NULL; | 175 return NULL; |
139 } | 176 } |
140 | 177 |
141 if (!observer_->WaitForExtensionViewsToLoad()) | 178 if (!observer_->WaitForExtensionViewsToLoad()) |
142 return NULL; | 179 return NULL; |
143 return service->GetExtensionById(last_loaded_extension_id(), false); | 180 return service->GetExtensionById(last_loaded_extension_id(), false); |
144 } | 181 } |
OLD | NEW |