Commit 9a6b54bf authored by tapted's avatar tapted Committed by Commit bot

Fix mac_views_browser compile after r435575 (extension_uninstall_dialog_view_browsertest.cc)

go/macviewsbuilder broke after r435575. It removed a flag that
extension_uninstall_dialog_view_browsertest.cc was using.

But extension_uninstall_dialog_view_browsertest.cc is only built on
mac_views_browser builds, which doesn't need flags in the first place
(it's a compile/build flag).

One of the tests does sadly fail (see http://crbug.com/671098), but
that's because it depends on things that should be gone by the time
mac_views_browser is a thing.

BUG=425229, 671098

Review-Url: https://codereview.chromium.org/2547923005
Cr-Commit-Position: refs/heads/master@{#436240}
parent b91ca356
...@@ -15,12 +15,6 @@ ...@@ -15,12 +15,6 @@
#include "extensions/common/extension_builder.h" #include "extensions/common/extension_builder.h"
#include "extensions/common/value_builder.h" #include "extensions/common/value_builder.h"
#if defined(OS_MACOSX)
#include "base/command_line.h"
#include "chrome/browser/ui/browser_dialogs.h"
#include "content/public/common/content_switches.h"
#endif
namespace { namespace {
scoped_refptr<extensions::Extension> BuildTestExtension() { scoped_refptr<extensions::Extension> BuildTestExtension() {
...@@ -60,17 +54,11 @@ class TestExtensionUninstallDialogDelegate ...@@ -60,17 +54,11 @@ class TestExtensionUninstallDialogDelegate
typedef InProcessBrowserTest ExtensionUninstallDialogViewBrowserTest; typedef InProcessBrowserTest ExtensionUninstallDialogViewBrowserTest;
// Test that ExtensionUninstallDialog cancels the uninstall if the aura::Window // Test that ExtensionUninstallDialog cancels the uninstall if the Window which
// which is passed to ExtensionUninstallDialog::Create() is destroyed before // is passed to ExtensionUninstallDialog::Create() is destroyed before
// ExtensionUninstallDialogDelegateView is created. // ExtensionUninstallDialogDelegateView is created.
IN_PROC_BROWSER_TEST_F(ExtensionUninstallDialogViewBrowserTest, IN_PROC_BROWSER_TEST_F(ExtensionUninstallDialogViewBrowserTest,
TrackParentWindowDestruction) { TrackParentWindowDestruction) {
#if defined(OS_MACOSX)
base::CommandLine::ForCurrentProcess()->
AppendSwitchASCII(switches::kEnableFeatures,
chrome::kMacViewsWebUIDialogs.name);
#endif
scoped_refptr<extensions::Extension> extension(BuildTestExtension()); scoped_refptr<extensions::Extension> extension(BuildTestExtension());
extensions::ExtensionSystem::Get(browser()->profile())->extension_service() extensions::ExtensionSystem::Get(browser()->profile())->extension_service()
->AddExtension(extension.get()); ->AddExtension(extension.get());
...@@ -91,17 +79,11 @@ IN_PROC_BROWSER_TEST_F(ExtensionUninstallDialogViewBrowserTest, ...@@ -91,17 +79,11 @@ IN_PROC_BROWSER_TEST_F(ExtensionUninstallDialogViewBrowserTest,
EXPECT_TRUE(delegate.canceled()); EXPECT_TRUE(delegate.canceled());
} }
// Test that ExtensionUninstallDialog cancels the uninstall if the aura::Window // Test that ExtensionUninstallDialog cancels the uninstall if the Window which
// which is passed to ExtensionUninstallDialog::Create() is destroyed after // is passed to ExtensionUninstallDialog::Create() is destroyed after
// ExtensionUninstallDialogDelegateView is created. // ExtensionUninstallDialogDelegateView is created.
IN_PROC_BROWSER_TEST_F(ExtensionUninstallDialogViewBrowserTest, IN_PROC_BROWSER_TEST_F(ExtensionUninstallDialogViewBrowserTest,
TrackParentWindowDestructionAfterViewCreation) { TrackParentWindowDestructionAfterViewCreation) {
#if defined(OS_MACOSX)
base::CommandLine::ForCurrentProcess()->
AppendSwitchASCII(switches::kEnableFeatures,
chrome::kMacViewsWebUIDialogs.name);
#endif
scoped_refptr<extensions::Extension> extension(BuildTestExtension()); scoped_refptr<extensions::Extension> extension(BuildTestExtension());
extensions::ExtensionSystem::Get(browser()->profile())->extension_service() extensions::ExtensionSystem::Get(browser()->profile())->extension_service()
->AddExtension(extension.get()); ->AddExtension(extension.get());
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment