Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3893)

Unified Diff: chrome/browser/extensions/extension_install_ui_browsertest.cc

Issue 10452009: Improve the UI for disabling off-store extension install. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: addressed comments, fixed tests Created 8 years, 7 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/extensions/extension_install_ui.cc ('k') | chrome/browser/extensions/webstore_installer.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/extensions/extension_install_ui_browsertest.cc
diff --git a/chrome/browser/extensions/extension_install_ui_browsertest.cc b/chrome/browser/extensions/extension_install_ui_browsertest.cc
index 29415c52fadc11ea084498a267aba610dcb2e285..2ce29c7a798e48f2f73ee0eee4a243d9f8e32e17 100644
--- a/chrome/browser/extensions/extension_install_ui_browsertest.cc
+++ b/chrome/browser/extensions/extension_install_ui_browsertest.cc
@@ -52,7 +52,8 @@ IN_PROC_BROWSER_TEST_F(ExtensionInstallUIBrowserTest,
MAYBE_TestThemeInstallUndoResetsToDefault) {
// Install theme once and undo to verify we go back to default theme.
FilePath theme_crx = PackExtension(test_data_dir_.AppendASCII("theme"));
- ASSERT_TRUE(InstallExtensionWithUI(theme_crx, 1));
+ ASSERT_TRUE(InstallExtensionWithUIAutoConfirm(
+ theme_crx, 1, browser()->profile()));
const Extension* theme = GetTheme();
ASSERT_TRUE(theme);
std::string theme_id = theme->id();
@@ -63,11 +64,13 @@ IN_PROC_BROWSER_TEST_F(ExtensionInstallUIBrowserTest,
// We set the |expected_change| to zero in these 'InstallExtensionWithUI'
// calls since the theme has already been installed above and this is an
// overinstall to set the active theme.
- ASSERT_TRUE(InstallExtensionWithUI(theme_crx, 0));
+ ASSERT_TRUE(InstallExtensionWithUIAutoConfirm(
+ theme_crx, 0, browser()->profile()));
theme = GetTheme();
ASSERT_TRUE(theme);
ASSERT_EQ(theme_id, theme->id());
- ASSERT_TRUE(InstallExtensionWithUI(theme_crx, 0));
+ ASSERT_TRUE(InstallExtensionWithUIAutoConfirm(
+ theme_crx, 0, browser()->profile()));
theme = GetTheme();
ASSERT_TRUE(theme);
ASSERT_EQ(theme_id, theme->id());
@@ -79,14 +82,16 @@ IN_PROC_BROWSER_TEST_F(ExtensionInstallUIBrowserTest,
TestThemeInstallUndoResetsToPreviousTheme) {
// Install first theme.
FilePath theme_path = test_data_dir_.AppendASCII("theme");
- ASSERT_TRUE(InstallExtensionWithUI(theme_path, 1));
+ ASSERT_TRUE(InstallExtensionWithUIAutoConfirm(
+ theme_path, 1, browser()->profile()));
const Extension* theme = GetTheme();
ASSERT_TRUE(theme);
std::string theme_id = theme->id();
// Then install second theme.
FilePath theme_path2 = test_data_dir_.AppendASCII("theme2");
- ASSERT_TRUE(InstallExtensionWithUI(theme_path2, 1));
+ ASSERT_TRUE(InstallExtensionWithUIAutoConfirm(
+ theme_path2, 1, browser()->profile()));
const Extension* theme2 = GetTheme();
ASSERT_TRUE(theme2);
EXPECT_FALSE(theme_id == theme2->id());
« no previous file with comments | « chrome/browser/extensions/extension_install_ui.cc ('k') | chrome/browser/extensions/webstore_installer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698