| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/command_line.h" | 5 #include "base/command_line.h" |
| 6 #include "base/stringprintf.h" | 6 #include "base/stringprintf.h" |
| 7 #include "base/utf_string_conversions.h" | 7 #include "base/utf_string_conversions.h" |
| 8 #include "chrome/browser/extensions/extension_host.h" | 8 #include "chrome/browser/extensions/extension_host.h" |
| 9 #include "chrome/browser/extensions/extension_install_ui.h" | 9 #include "chrome/browser/extensions/extension_install_ui.h" |
| 10 #include "chrome/browser/extensions/extension_service.h" | 10 #include "chrome/browser/extensions/extension_service.h" |
| (...skipping 130 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 141 } | 141 } |
| 142 | 142 |
| 143 IN_PROC_BROWSER_TEST_F(WebstoreStartupInstallerTest, FindLink) { | 143 IN_PROC_BROWSER_TEST_F(WebstoreStartupInstallerTest, FindLink) { |
| 144 ui_test_utils::NavigateToURL( | 144 ui_test_utils::NavigateToURL( |
| 145 browser(), GenerateTestServerUrl(kAppDomain, "find_link.html")); | 145 browser(), GenerateTestServerUrl(kAppDomain, "find_link.html")); |
| 146 | 146 |
| 147 RunTest("runTest"); | 147 RunTest("runTest"); |
| 148 } | 148 } |
| 149 | 149 |
| 150 // Crashes at random intervals on MacOS: http://crbug.com/95713. | 150 // Crashes at random intervals on MacOS: http://crbug.com/95713. |
| 151 #if defined(OS_MACOSX) | 151 // Flakes on Windows: http://crbug.com/229947 |
| 152 #if defined(OS_MACOSX) || defined(OS_WIN) |
| 152 #define Maybe_ArgumentValidation DISABLED_ArgumentValidation | 153 #define Maybe_ArgumentValidation DISABLED_ArgumentValidation |
| 153 #else | 154 #else |
| 154 #define Maybe_ArgumentValidation ArgumentValidation | 155 #define Maybe_ArgumentValidation ArgumentValidation |
| 155 #endif | 156 #endif |
| 156 IN_PROC_BROWSER_TEST_F(WebstoreStartupInstallerTest, Maybe_ArgumentValidation) { | 157 IN_PROC_BROWSER_TEST_F(WebstoreStartupInstallerTest, Maybe_ArgumentValidation) { |
| 157 CommandLine::ForCurrentProcess()->AppendSwitchASCII( | 158 CommandLine::ForCurrentProcess()->AppendSwitchASCII( |
| 158 switches::kAppsGalleryInstallAutoConfirmForTests, "cancel"); | 159 switches::kAppsGalleryInstallAutoConfirmForTests, "cancel"); |
| 159 | 160 |
| 160 // Each of these tests has to run separately, since one page/tab can | 161 // Each of these tests has to run separately, since one page/tab can |
| 161 // only have one in-progress install request. These tests don't all pass | 162 // only have one in-progress install request. These tests don't all pass |
| (...skipping 207 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 369 switches::kLimitedInstallFromWebstore, "2"); | 370 switches::kLimitedInstallFromWebstore, "2"); |
| 370 command_line->AppendSwitchASCII( | 371 command_line->AppendSwitchASCII( |
| 371 switches::kAppsGalleryInstallAutoConfirmForTests, "cancel"); | 372 switches::kAppsGalleryInstallAutoConfirmForTests, "cancel"); |
| 372 extensions::StartupHelper helper; | 373 extensions::StartupHelper helper; |
| 373 helper.LimitedInstallFromWebstore(*command_line, browser()->profile(), | 374 helper.LimitedInstallFromWebstore(*command_line, browser()->profile(), |
| 374 MessageLoop::QuitWhenIdleClosure()); | 375 MessageLoop::QuitWhenIdleClosure()); |
| 375 MessageLoop::current()->Run(); | 376 MessageLoop::current()->Run(); |
| 376 EXPECT_FALSE(saw_install()); | 377 EXPECT_FALSE(saw_install()); |
| 377 EXPECT_EQ(0, browser_open_count()); | 378 EXPECT_EQ(0, browser_open_count()); |
| 378 } | 379 } |
| OLD | NEW |