| Index: chrome/browser/extensions/api/webstore_private/webstore_private_apitest.cc
|
| diff --git a/chrome/browser/extensions/api/webstore_private/webstore_private_apitest.cc b/chrome/browser/extensions/api/webstore_private/webstore_private_apitest.cc
|
| index a30585f4a85802ef2d90ef33a96c79ea502c0671..98df25a6dac051e030f0df951163fd51d3a37b06 100644
|
| --- a/chrome/browser/extensions/api/webstore_private/webstore_private_apitest.cc
|
| +++ b/chrome/browser/extensions/api/webstore_private/webstore_private_apitest.cc
|
| @@ -87,12 +87,14 @@ class WebstoreInstallListener : public WebstoreInstaller::Delegate {
|
| } // namespace
|
|
|
| // A base class for tests below.
|
| -class ExtensionNoConfirmWebstorePrivateApiTest : public ExtensionApiTest {
|
| +class ExtensionWebstorePrivateApiTest : public ExtensionApiTest {
|
| public:
|
| void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
|
| ExtensionApiTest::SetUpCommandLine(command_line);
|
| command_line->AppendSwitchASCII(
|
| switches::kAppsGalleryURL, "http://www.example.com");
|
| + command_line->AppendSwitchASCII(
|
| + switches::kAppsGalleryInstallAutoConfirmForTests, "accept");
|
| }
|
|
|
| void SetUpInProcessBrowserTestFixture() OVERRIDE {
|
| @@ -148,16 +150,6 @@ class ExtensionNoConfirmWebstorePrivateApiTest : public ExtensionApiTest {
|
| ScopedTempDir tmp_;
|
| };
|
|
|
| -class ExtensionWebstorePrivateApiTest :
|
| - public ExtensionNoConfirmWebstorePrivateApiTest {
|
| - public:
|
| - void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
|
| - ExtensionNoConfirmWebstorePrivateApiTest::SetUpCommandLine(command_line);
|
| - command_line->AppendSwitchASCII(
|
| - switches::kAppsGalleryInstallAutoConfirmForTests, "accept");
|
| - }
|
| -};
|
| -
|
| class ExtensionWebstorePrivateBundleTest
|
| : public ExtensionWebstorePrivateApiTest {
|
| public:
|
| @@ -353,8 +345,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionWebstorePrivateApiTest, BeginInstall) {
|
| }
|
|
|
| // Tests that themes are installed without an install prompt.
|
| -IN_PROC_BROWSER_TEST_F(ExtensionNoConfirmWebstorePrivateApiTest,
|
| - InstallTheme) {
|
| +IN_PROC_BROWSER_TEST_F(ExtensionWebstorePrivateApiTest, InstallTheme) {
|
| WebstoreInstallListener listener;
|
| WebstorePrivateApi::SetWebstoreInstallerDelegateForTesting(&listener);
|
| ASSERT_TRUE(RunInstallTest("theme.html", "../../../theme.crx"));
|
|
|