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 "content/shell/renderer/test_runner/web_test_proxy.h" | 5 #include "content/shell/renderer/test_runner/web_test_proxy.h" |
6 | 6 |
7 #include <cctype> | 7 #include <cctype> |
8 | 8 |
9 #include "base/callback_helpers.h" | 9 #include "base/callback_helpers.h" |
10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
11 #include "base/logging.h" | 11 #include "base/logging.h" |
12 #include "base/strings/string_util.h" | 12 #include "base/strings/string_util.h" |
13 #include "base/strings/stringprintf.h" | 13 #include "base/strings/stringprintf.h" |
14 #include "base/strings/utf_string_conversions.h" | 14 #include "base/strings/utf_string_conversions.h" |
15 #include "base/trace_event/trace_event.h" | 15 #include "base/trace_event/trace_event.h" |
16 #include "content/public/common/content_switches.h" | |
17 #include "content/shell/renderer/test_runner/accessibility_controller.h" | 16 #include "content/shell/renderer/test_runner/accessibility_controller.h" |
18 #include "content/shell/renderer/test_runner/event_sender.h" | 17 #include "content/shell/renderer/test_runner/event_sender.h" |
19 #include "content/shell/renderer/test_runner/mock_color_chooser.h" | 18 #include "content/shell/renderer/test_runner/mock_color_chooser.h" |
20 #include "content/shell/renderer/test_runner/mock_credential_manager_client.h" | 19 #include "content/shell/renderer/test_runner/mock_credential_manager_client.h" |
21 #include "content/shell/renderer/test_runner/mock_screen_orientation_client.h" | 20 #include "content/shell/renderer/test_runner/mock_screen_orientation_client.h" |
22 #include "content/shell/renderer/test_runner/mock_web_speech_recognizer.h" | 21 #include "content/shell/renderer/test_runner/mock_web_speech_recognizer.h" |
23 #include "content/shell/renderer/test_runner/mock_web_user_media_client.h" | 22 #include "content/shell/renderer/test_runner/mock_web_user_media_client.h" |
24 #include "content/shell/renderer/test_runner/spell_check_client.h" | 23 #include "content/shell/renderer/test_runner/spell_check_client.h" |
25 #include "content/shell/renderer/test_runner/test_interfaces.h" | 24 #include "content/shell/renderer/test_runner/test_interfaces.h" |
26 #include "content/shell/renderer/test_runner/test_plugin.h" | 25 #include "content/shell/renderer/test_runner/test_plugin.h" |
(...skipping 356 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
383 return result; | 382 return result; |
384 } | 383 } |
385 } | 384 } |
386 | 385 |
387 WebTestProxyBase::WebTestProxyBase() | 386 WebTestProxyBase::WebTestProxyBase() |
388 : test_interfaces_(NULL), | 387 : test_interfaces_(NULL), |
389 delegate_(NULL), | 388 delegate_(NULL), |
390 web_widget_(NULL), | 389 web_widget_(NULL), |
391 spellcheck_(new SpellCheckClient(this)), | 390 spellcheck_(new SpellCheckClient(this)), |
392 chooser_count_(0) { | 391 chooser_count_(0) { |
393 // TODO(enne): using the scheduler introduces additional composite steps | |
394 // that create flakiness. This should go away eventually. | |
395 base::CommandLine::ForCurrentProcess()->AppendSwitch( | |
396 switches::kDisableSingleThreadProxyScheduler); | |
397 Reset(); | 392 Reset(); |
398 } | 393 } |
399 | 394 |
400 WebTestProxyBase::~WebTestProxyBase() { | 395 WebTestProxyBase::~WebTestProxyBase() { |
401 test_interfaces_->WindowClosed(this); | 396 test_interfaces_->WindowClosed(this); |
402 } | 397 } |
403 | 398 |
404 void WebTestProxyBase::SetInterfaces(WebTestInterfaces* interfaces) { | 399 void WebTestProxyBase::SetInterfaces(WebTestInterfaces* interfaces) { |
405 test_interfaces_ = interfaces->GetTestInterfaces(); | 400 test_interfaces_ = interfaces->GetTestInterfaces(); |
406 test_interfaces_->WindowOpened(this); | 401 test_interfaces_->WindowOpened(this); |
(...skipping 987 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1394 // to cancel the input method's ongoing composition session. | 1389 // to cancel the input method's ongoing composition session. |
1395 if (web_widget_) | 1390 if (web_widget_) |
1396 web_widget_->confirmComposition(); | 1391 web_widget_->confirmComposition(); |
1397 } | 1392 } |
1398 | 1393 |
1399 blink::WebString WebTestProxyBase::acceptLanguages() { | 1394 blink::WebString WebTestProxyBase::acceptLanguages() { |
1400 return blink::WebString::fromUTF8(accept_languages_); | 1395 return blink::WebString::fromUTF8(accept_languages_); |
1401 } | 1396 } |
1402 | 1397 |
1403 } // namespace content | 1398 } // namespace content |
OLD | NEW |