OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 "chrome/test/automation/automation_proxy.h" | 5 #include "chrome/test/automation/automation_proxy.h" |
6 | 6 |
7 #include <gtest/gtest.h> | 7 #include <gtest/gtest.h> |
8 | 8 |
9 #include <sstream> | 9 #include <sstream> |
10 | 10 |
11 #include "base/basictypes.h" | 11 #include "base/basictypes.h" |
12 #include "base/debug/trace_event.h" | 12 #include "base/debug/trace_event.h" |
13 #include "base/logging.h" | 13 #include "base/logging.h" |
14 #include "base/memory/ref_counted.h" | 14 #include "base/memory/ref_counted.h" |
15 #include "base/process_util.h" | 15 #include "base/process_util.h" |
16 #include "base/synchronization/waitable_event.h" | 16 #include "base/synchronization/waitable_event.h" |
17 #include "base/threading/platform_thread.h" | 17 #include "base/threading/platform_thread.h" |
18 #include "chrome/common/automation_constants.h" | 18 #include "chrome/common/automation_constants.h" |
19 #include "chrome/common/automation_messages.h" | 19 #include "chrome/common/automation_messages.h" |
20 #include "chrome/common/chrome_version_info.h" | 20 #include "chrome/common/chrome_version_info.h" |
21 #include "chrome/test/automation/automation_json_requests.h" | 21 #include "chrome/test/automation/automation_json_requests.h" |
22 #include "chrome/test/automation/browser_proxy.h" | 22 #include "chrome/test/automation/browser_proxy.h" |
23 #include "chrome/test/automation/extension_proxy.h" | 23 #include "chrome/test/automation/extension_proxy.h" |
24 #include "chrome/test/automation/tab_proxy.h" | 24 #include "chrome/test/automation/tab_proxy.h" |
25 #include "chrome/test/automation/window_proxy.h" | 25 #include "chrome/test/automation/window_proxy.h" |
26 #include "ipc/ipc_descriptors.h" | 26 #include "ipc/ipc_descriptors.h" |
27 #if defined(OS_WIN) | 27 #if defined(OS_WIN) |
28 // TODO(port): Enable when dialog_delegate is ported. | 28 // TODO(port): Enable when dialog_delegate is ported. |
29 #include "views/window/dialog_delegate.h" | 29 #include "ui/views/window/dialog_delegate.h" |
30 #endif | 30 #endif |
31 | 31 |
32 using base::TimeDelta; | 32 using base::TimeDelta; |
33 using base::TimeTicks; | 33 using base::TimeTicks; |
34 | 34 |
35 namespace { | 35 namespace { |
36 | 36 |
37 const char kChannelErrorVersionString[] = "***CHANNEL_ERROR***"; | 37 const char kChannelErrorVersionString[] = "***CHANNEL_ERROR***"; |
38 | 38 |
39 // This object allows messages received on the background thread to be | 39 // This object allows messages received on the background thread to be |
(...skipping 550 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
590 } | 590 } |
591 | 591 |
592 bool AutomationProxy::SendJSONRequest(const std::string& request, | 592 bool AutomationProxy::SendJSONRequest(const std::string& request, |
593 int timeout_ms, | 593 int timeout_ms, |
594 std::string* response) { | 594 std::string* response) { |
595 bool result = false; | 595 bool result = false; |
596 if (!SendAutomationJSONRequest(this, request, timeout_ms, response, &result)) | 596 if (!SendAutomationJSONRequest(this, request, timeout_ms, response, &result)) |
597 return false; | 597 return false; |
598 return result; | 598 return result; |
599 } | 599 } |
OLD | NEW |