| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 "base/command_line.h" | 5 #include "base/command_line.h" |
| 6 #include "base/scoped_observer.h" | 6 #include "base/scoped_observer.h" |
| 7 #include "chrome/browser/chrome_notification_types.h" | 7 #include "chrome/browser/chrome_notification_types.h" |
| 8 #include "chrome/browser/extensions/extension_install_prompt.h" | 8 #include "chrome/browser/extensions/extension_install_prompt.h" |
| 9 #include "chrome/browser/extensions/extension_install_ui.h" | |
| 10 #include "chrome/browser/extensions/extension_service.h" | 9 #include "chrome/browser/extensions/extension_service.h" |
| 11 #include "chrome/browser/extensions/startup_helper.h" | 10 #include "chrome/browser/extensions/startup_helper.h" |
| 12 #include "chrome/browser/extensions/webstore_installer_test.h" | 11 #include "chrome/browser/extensions/webstore_installer_test.h" |
| 13 #include "chrome/browser/infobars/infobar_service.h" | 12 #include "chrome/browser/infobars/infobar_service.h" |
| 14 #include "chrome/browser/profiles/profile.h" | 13 #include "chrome/browser/profiles/profile.h" |
| 15 #include "chrome/browser/ui/browser.h" | 14 #include "chrome/browser/ui/browser.h" |
| 16 #include "chrome/browser/ui/tabs/tab_strip_model.h" | 15 #include "chrome/browser/ui/tabs/tab_strip_model.h" |
| 17 #include "chrome/common/chrome_switches.h" | 16 #include "chrome/common/chrome_switches.h" |
| 18 #include "chrome/common/pref_names.h" | 17 #include "chrome/common/pref_names.h" |
| 19 #include "chrome/test/base/in_process_browser_test.h" | 18 #include "chrome/test/base/in_process_browser_test.h" |
| 20 #include "chrome/test/base/test_switches.h" | 19 #include "chrome/test/base/test_switches.h" |
| 21 #include "chrome/test/base/ui_test_utils.h" | 20 #include "chrome/test/base/ui_test_utils.h" |
| 22 #include "content/public/browser/notification_registrar.h" | 21 #include "content/public/browser/notification_registrar.h" |
| 23 #include "content/public/browser/notification_service.h" | 22 #include "content/public/browser/notification_service.h" |
| 24 #include "content/public/browser/notification_types.h" | 23 #include "content/public/browser/notification_types.h" |
| 25 #include "content/public/browser/web_contents.h" | 24 #include "content/public/browser/web_contents.h" |
| 26 #include "content/public/test/browser_test_utils.h" | 25 #include "content/public/test/browser_test_utils.h" |
| 27 #include "extensions/browser/extension_host.h" | 26 #include "extensions/browser/extension_host.h" |
| 28 #include "extensions/browser/extension_registry.h" | 27 #include "extensions/browser/extension_registry.h" |
| 29 #include "extensions/browser/extension_registry_observer.h" | 28 #include "extensions/browser/extension_registry_observer.h" |
| 30 #include "extensions/browser/extension_system.h" | 29 #include "extensions/browser/extension_system.h" |
| 30 #include "extensions/browser/install/extension_install_ui.h" |
| 31 #include "extensions/common/extension_builder.h" | 31 #include "extensions/common/extension_builder.h" |
| 32 #include "extensions/common/value_builder.h" | 32 #include "extensions/common/value_builder.h" |
| 33 #include "net/dns/mock_host_resolver.h" | 33 #include "net/dns/mock_host_resolver.h" |
| 34 #include "url/gurl.h" | 34 #include "url/gurl.h" |
| 35 | 35 |
| 36 using content::WebContents; | 36 using content::WebContents; |
| 37 using extensions::DictionaryBuilder; | 37 using extensions::DictionaryBuilder; |
| 38 using extensions::Extension; | 38 using extensions::Extension; |
| 39 using extensions::ExtensionBuilder; | 39 using extensions::ExtensionBuilder; |
| 40 using extensions::ListBuilder; | 40 using extensions::ListBuilder; |
| (...skipping 175 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 216 WebstoreStartupInstallerTest::SetUpCommandLine(command_line); | 216 WebstoreStartupInstallerTest::SetUpCommandLine(command_line); |
| 217 | 217 |
| 218 GURL crx_url = GenerateTestServerUrl( | 218 GURL crx_url = GenerateTestServerUrl( |
| 219 kWebstoreDomain, "malformed_extension.crx"); | 219 kWebstoreDomain, "malformed_extension.crx"); |
| 220 base::CommandLine::ForCurrentProcess()->AppendSwitchASCII( | 220 base::CommandLine::ForCurrentProcess()->AppendSwitchASCII( |
| 221 switches::kAppsGalleryUpdateURL, crx_url.spec()); | 221 switches::kAppsGalleryUpdateURL, crx_url.spec()); |
| 222 } | 222 } |
| 223 | 223 |
| 224 virtual void SetUpInProcessBrowserTestFixture() override { | 224 virtual void SetUpInProcessBrowserTestFixture() override { |
| 225 WebstoreStartupInstallerTest::SetUpInProcessBrowserTestFixture(); | 225 WebstoreStartupInstallerTest::SetUpInProcessBrowserTestFixture(); |
| 226 ExtensionInstallUI::set_disable_failure_ui_for_tests(); | 226 extensions::ExtensionInstallUI::set_disable_failure_ui_for_tests(); |
| 227 } | 227 } |
| 228 }; | 228 }; |
| 229 | 229 |
| 230 IN_PROC_BROWSER_TEST_F(WebstoreStartupInstallUnpackFailureTest, | 230 IN_PROC_BROWSER_TEST_F(WebstoreStartupInstallUnpackFailureTest, |
| 231 WebstoreStartupInstallUnpackFailureTest) { | 231 WebstoreStartupInstallUnpackFailureTest) { |
| 232 ExtensionInstallPrompt::g_auto_confirm_for_tests = | 232 ExtensionInstallPrompt::g_auto_confirm_for_tests = |
| 233 ExtensionInstallPrompt::ACCEPT; | 233 ExtensionInstallPrompt::ACCEPT; |
| 234 | 234 |
| 235 ui_test_utils::NavigateToURL(browser(), | 235 ui_test_utils::NavigateToURL(browser(), |
| 236 GenerateTestServerUrl(kAppDomain, "install_unpack_failure.html")); | 236 GenerateTestServerUrl(kAppDomain, "install_unpack_failure.html")); |
| (...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 294 base::CommandLine* command_line = base::CommandLine::ForCurrentProcess(); | 294 base::CommandLine* command_line = base::CommandLine::ForCurrentProcess(); |
| 295 command_line->AppendSwitchASCII( | 295 command_line->AppendSwitchASCII( |
| 296 switches::kInstallEphemeralAppFromWebstore, kTestExtensionId); | 296 switches::kInstallEphemeralAppFromWebstore, kTestExtensionId); |
| 297 ExtensionInstallPrompt::g_auto_confirm_for_tests = | 297 ExtensionInstallPrompt::g_auto_confirm_for_tests = |
| 298 ExtensionInstallPrompt::ACCEPT; | 298 ExtensionInstallPrompt::ACCEPT; |
| 299 extensions::StartupHelper helper; | 299 extensions::StartupHelper helper; |
| 300 EXPECT_FALSE(helper.InstallEphemeralApp(*command_line, browser()->profile())); | 300 EXPECT_FALSE(helper.InstallEphemeralApp(*command_line, browser()->profile())); |
| 301 EXPECT_FALSE(saw_install()); | 301 EXPECT_FALSE(saw_install()); |
| 302 EXPECT_EQ(0, browser_open_count()); | 302 EXPECT_EQ(0, browser_open_count()); |
| 303 } | 303 } |
| OLD | NEW |