| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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 <array> | 5 #include <array> |
| 6 | 6 |
| 7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
| 8 #include "base/macros.h" | 8 #include "base/macros.h" |
| 9 #include "base/path_service.h" | 9 #include "base/path_service.h" |
| 10 #include "base/strings/string_number_conversions.h" | 10 #include "base/strings/string_number_conversions.h" |
| (...skipping 155 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 166 | 166 |
| 167 } // namespace | 167 } // namespace |
| 168 | 168 |
| 169 // Flaky on Windows: http://crbug.com/301887 | 169 // Flaky on Windows: http://crbug.com/301887 |
| 170 #if defined(OS_WIN) | 170 #if defined(OS_WIN) |
| 171 #define MAYBE_ChooseDesktopMedia DISABLED_ChooseDesktopMedia | 171 #define MAYBE_ChooseDesktopMedia DISABLED_ChooseDesktopMedia |
| 172 #else | 172 #else |
| 173 #define MAYBE_ChooseDesktopMedia ChooseDesktopMedia | 173 #define MAYBE_ChooseDesktopMedia ChooseDesktopMedia |
| 174 #endif | 174 #endif |
| 175 IN_PROC_BROWSER_TEST_F(DesktopCaptureApiTest, MAYBE_ChooseDesktopMedia) { | 175 IN_PROC_BROWSER_TEST_F(DesktopCaptureApiTest, MAYBE_ChooseDesktopMedia) { |
| 176 // For tabshare, we need to turn on the flag. | |
| 177 base::CommandLine::ForCurrentProcess()->AppendSwitch( | |
| 178 extensions::switches::kEnableTabForDesktopShare); | |
| 179 | |
| 180 // Each element in the following array corresponds to one test in | 176 // Each element in the following array corresponds to one test in |
| 181 // chrome/test/data/extensions/api_test/desktop_capture/test.js . | 177 // chrome/test/data/extensions/api_test/desktop_capture/test.js . |
| 182 TestFlags test_flags[] = { | 178 TestFlags test_flags[] = { |
| 183 // pickerUiCanceled() | 179 // pickerUiCanceled() |
| 184 {true, true, false, false, content::DesktopMediaID()}, | 180 {true, true, false, false, content::DesktopMediaID()}, |
| 185 // chooseMedia() | 181 // chooseMedia() |
| 186 {true, true, false, false, | 182 {true, true, false, false, |
| 187 content::DesktopMediaID(content::DesktopMediaID::TYPE_SCREEN, | 183 content::DesktopMediaID(content::DesktopMediaID::TYPE_SCREEN, |
| 188 content::DesktopMediaID::kNullId)}, | 184 content::DesktopMediaID::kNullId)}, |
| 189 // screensOnly() | 185 // screensOnly() |
| (...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 284 EXPECT_TRUE(result); | 280 EXPECT_TRUE(result); |
| 285 EXPECT_TRUE(test_flags[2].picker_created); | 281 EXPECT_TRUE(test_flags[2].picker_created); |
| 286 EXPECT_FALSE(test_flags[2].picker_deleted); | 282 EXPECT_FALSE(test_flags[2].picker_deleted); |
| 287 | 283 |
| 288 web_contents->Close(); | 284 web_contents->Close(); |
| 289 destroyed_watcher.Wait(); | 285 destroyed_watcher.Wait(); |
| 290 EXPECT_TRUE(test_flags[2].picker_deleted); | 286 EXPECT_TRUE(test_flags[2].picker_deleted); |
| 291 } | 287 } |
| 292 | 288 |
| 293 } // namespace extensions | 289 } // namespace extensions |
| OLD | NEW |