| 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 "base/macros.h" | 5 #include "base/macros.h" |
| 6 #include "base/run_loop.h" | 6 #include "base/run_loop.h" |
| 7 #include "chrome/browser/extensions/extension_service.h" | 7 #include "chrome/browser/extensions/extension_service.h" |
| 8 #include "chrome/browser/extensions/extension_uninstall_dialog.h" | 8 #include "chrome/browser/extensions/extension_uninstall_dialog.h" |
| 9 #include "chrome/browser/ui/browser.h" | 9 #include "chrome/browser/ui/browser.h" |
| 10 #include "chrome/browser/ui/browser_window.h" | 10 #include "chrome/browser/ui/browser_window.h" |
| (...skipping 171 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 182 run_loop.Run(); | 182 run_loop.Run(); |
| 183 // The delegate should not be canceled because the user chose to uninstall the | 183 // The delegate should not be canceled because the user chose to uninstall the |
| 184 // extension, which should be successful. | 184 // extension, which should be successful. |
| 185 EXPECT_TRUE(!delegate.canceled()); | 185 EXPECT_TRUE(!delegate.canceled()); |
| 186 } | 186 } |
| 187 | 187 |
| 188 // Test that when the user clicks the Report Abuse checkbox and clicks Uninstall | 188 // Test that when the user clicks the Report Abuse checkbox and clicks Uninstall |
| 189 // on the ExtensionUninstallDialog, the extension's uninstall url (when it is | 189 // on the ExtensionUninstallDialog, the extension's uninstall url (when it is |
| 190 // specified) and the CWS Report Abuse survey are opened in the browser, also | 190 // specified) and the CWS Report Abuse survey are opened in the browser, also |
| 191 // testing that the CWS survey is the active tab. | 191 // testing that the CWS survey is the active tab. |
| 192 IN_PROC_BROWSER_TEST_F(ExtensionUninstallDialogViewBrowserTest, | 192 #if defined(OS_WIN) |
| 193 EnsureCWSReportAbusePageIsActiveTabAfterUninstall) { | 193 // Flaky on windows: http://crbug.com/725197 |
| 194 #define MAYBE_EnsureCWSReportAbusePageIsActiveTabAfterUninstall \ |
| 195 DISABLED_EnsureCWSReportAbusePageIsActiveTabAfterUninstall |
| 196 #else |
| 197 #define MAYBE_EnsureCWSReportAbusePageIsActiveTabAfterUninstall \ |
| 198 EnsureCWSReportAbusePageIsActiveTabAfterUninstall |
| 199 #endif |
| 200 IN_PROC_BROWSER_TEST_F( |
| 201 ExtensionUninstallDialogViewBrowserTest, |
| 202 MAYBE_EnsureCWSReportAbusePageIsActiveTabAfterUninstall) { |
| 194 scoped_refptr<extensions::Extension> extension(BuildTestExtension()); | 203 scoped_refptr<extensions::Extension> extension(BuildTestExtension()); |
| 195 ExtensionService* extension_service = | 204 ExtensionService* extension_service = |
| 196 extensions::ExtensionSystem::Get(browser()->profile()) | 205 extensions::ExtensionSystem::Get(browser()->profile()) |
| 197 ->extension_service(); | 206 ->extension_service(); |
| 198 SetUninstallURL( | 207 SetUninstallURL( |
| 199 extensions::ExtensionPrefs::Get(extension_service->GetBrowserContext()), | 208 extensions::ExtensionPrefs::Get(extension_service->GetBrowserContext()), |
| 200 extension->id()); | 209 extension->id()); |
| 201 extension_service->AddExtension(extension.get()); | 210 extension_service->AddExtension(extension.get()); |
| 202 | 211 |
| 203 // Auto-confirm the uninstall dialog. | 212 // Auto-confirm the uninstall dialog. |
| (...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 240 ->tab_strip_model() | 249 ->tab_strip_model() |
| 241 ->GetWebContentsAt(1) | 250 ->GetWebContentsAt(1) |
| 242 ->GetLastCommittedURL() | 251 ->GetLastCommittedURL() |
| 243 .spec()); | 252 .spec()); |
| 244 | 253 |
| 245 run_loop.Run(); | 254 run_loop.Run(); |
| 246 // The delegate should not be canceled because the user chose to uninstall the | 255 // The delegate should not be canceled because the user chose to uninstall the |
| 247 // extension, which should be successful. | 256 // extension, which should be successful. |
| 248 EXPECT_TRUE(!delegate.canceled()); | 257 EXPECT_TRUE(!delegate.canceled()); |
| 249 } | 258 } |
| OLD | NEW |