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 "chrome/browser/extensions/extension_install_prompt.h" | 5 #include "chrome/browser/extensions/extension_install_prompt.h" |
6 | 6 |
7 #include "base/macros.h" | 7 #include "base/macros.h" |
8 #include "base/run_loop.h" | 8 #include "base/run_loop.h" |
9 #include "chrome/browser/extensions/extension_install_prompt_show_params.h" | 9 #include "chrome/browser/extensions/extension_install_prompt_show_params.h" |
10 #include "chrome/browser/extensions/extension_install_prompt_test_helper.h" | 10 #include "chrome/browser/extensions/extension_install_prompt_test_helper.h" |
11 #include "chrome/browser/ui/browser.h" | 11 #include "chrome/browser/ui/browser.h" |
12 #include "chrome/browser/ui/browser_window.h" | 12 #include "chrome/browser/ui/browser_window.h" |
13 #include "chrome/browser/ui/tabs/tab_strip_model.h" | 13 #include "chrome/browser/ui/tabs/tab_strip_model.h" |
14 #include "chrome/test/base/in_process_browser_test.h" | 14 #include "chrome/test/base/in_process_browser_test.h" |
15 #include "content/public/test/test_utils.h" | 15 #include "content/public/test/test_utils.h" |
16 #include "extensions/browser/extension_dialog_auto_confirm.h" | 16 #include "extensions/browser/extension_dialog_auto_confirm.h" |
17 #include "extensions/common/extension.h" | 17 #include "extensions/common/extension.h" |
18 #include "extensions/common/extension_builder.h" | 18 #include "extensions/common/extension_builder.h" |
19 #include "extensions/common/value_builder.h" | 19 #include "extensions/common/value_builder.h" |
20 | 20 |
21 using extensions::ScopedTestDialogAutoConfirm; | 21 using extensions::ScopedTestDialogAutoConfirm; |
22 | 22 |
23 namespace { | 23 namespace { |
24 | 24 |
25 scoped_refptr<extensions::Extension> BuildTestExtension() { | 25 scoped_refptr<extensions::Extension> BuildTestExtension() { |
26 return extensions::ExtensionBuilder() | 26 return extensions::ExtensionBuilder() |
27 .SetManifest(std::move(extensions::DictionaryBuilder() | 27 .SetManifest(extensions::DictionaryBuilder() |
28 .Set("name", "foo") | 28 .Set("name", "foo") |
29 .Set("version", "1.0"))) | 29 .Set("version", "1.0") |
| 30 .Build()) |
30 .Build(); | 31 .Build(); |
31 } | 32 } |
32 | 33 |
33 } // namespace | 34 } // namespace |
34 | 35 |
35 typedef InProcessBrowserTest ExtensionInstallPromptBrowserTest; | 36 typedef InProcessBrowserTest ExtensionInstallPromptBrowserTest; |
36 | 37 |
37 // Test that ExtensionInstallPrompt aborts the install if the web contents which | 38 // Test that ExtensionInstallPrompt aborts the install if the web contents which |
38 // were passed to the ExtensionInstallPrompt constructor get destroyed. | 39 // were passed to the ExtensionInstallPrompt constructor get destroyed. |
39 // CrxInstaller takes in ExtensionInstallPrompt in the constructor and does a | 40 // CrxInstaller takes in ExtensionInstallPrompt in the constructor and does a |
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
102 ExtensionInstallPrompt prompt(browser()->profile(), NULL); | 103 ExtensionInstallPrompt prompt(browser()->profile(), NULL); |
103 base::RunLoop run_loop; | 104 base::RunLoop run_loop; |
104 ExtensionInstallPromptTestHelper helper(run_loop.QuitClosure()); | 105 ExtensionInstallPromptTestHelper helper(run_loop.QuitClosure()); |
105 prompt.ShowDialog( | 106 prompt.ShowDialog( |
106 helper.GetCallback(), | 107 helper.GetCallback(), |
107 extension.get(), nullptr, | 108 extension.get(), nullptr, |
108 ExtensionInstallPrompt::GetDefaultShowDialogCallback()); | 109 ExtensionInstallPrompt::GetDefaultShowDialogCallback()); |
109 run_loop.Run(); | 110 run_loop.Run(); |
110 EXPECT_EQ(ExtensionInstallPrompt::Result::ACCEPTED, helper.result()); | 111 EXPECT_EQ(ExtensionInstallPrompt::Result::ACCEPTED, helper.result()); |
111 } | 112 } |
OLD | NEW |