| 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/base_paths.h" | 5 #include "base/base_paths.h" |
| 6 #include "base/json/json_writer.h" | 6 #include "base/json/json_writer.h" |
| 7 #include "base/logging.h" | 7 #include "base/logging.h" |
| 8 #include "base/memory/scoped_ptr.h" | 8 #include "base/memory/scoped_ptr.h" |
| 9 #include "base/path_service.h" | 9 #include "base/path_service.h" |
| 10 #include "base/string_util.h" | 10 #include "base/string_util.h" |
| (...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 48 // We add this so that pyauto can execute javascript in the renderer and | 48 // We add this so that pyauto can execute javascript in the renderer and |
| 49 // read values back. | 49 // read values back. |
| 50 dom_automation_enabled_ = true; | 50 dom_automation_enabled_ = true; |
| 51 message_loop_ = GetSharedMessageLoop(base::MessageLoop::TYPE_DEFAULT); | 51 message_loop_ = GetSharedMessageLoop(base::MessageLoop::TYPE_DEFAULT); |
| 52 } | 52 } |
| 53 | 53 |
| 54 PyUITestBase::~PyUITestBase() { | 54 PyUITestBase::~PyUITestBase() { |
| 55 } | 55 } |
| 56 | 56 |
| 57 // static, refer .h for why it needs to be static | 57 // static, refer .h for why it needs to be static |
| 58 MessageLoop* PyUITestBase::message_loop_ = NULL; | 58 base::MessageLoop* PyUITestBase::message_loop_ = NULL; |
| 59 | 59 |
| 60 // static | 60 // static |
| 61 MessageLoop* PyUITestBase::GetSharedMessageLoop( | 61 base::MessageLoop* PyUITestBase::GetSharedMessageLoop( |
| 62 base::MessageLoop::Type msg_loop_type) { | 62 base::MessageLoop::Type msg_loop_type) { |
| 63 if (!message_loop_) // Create a shared instance of MessageLoop | 63 if (!message_loop_) // Create a shared instance of MessageLoop |
| 64 message_loop_ = new base::MessageLoop(msg_loop_type); | 64 message_loop_ = new base::MessageLoop(msg_loop_type); |
| 65 return message_loop_; | 65 return message_loop_; |
| 66 } | 66 } |
| 67 | 67 |
| 68 void PyUITestBase::Initialize(const base::FilePath& browser_dir) { | 68 void PyUITestBase::Initialize(const base::FilePath& browser_dir) { |
| 69 UITestBase::SetBrowserDirectory(browser_dir); | 69 UITestBase::SetBrowserDirectory(browser_dir); |
| 70 } | 70 } |
| 71 | 71 |
| (...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 154 base::StringPrintf("Chrome automation timed out after %d seconds", | 154 base::StringPrintf("Chrome automation timed out after %d seconds", |
| 155 static_cast<int>(duration.InSeconds())), | 155 static_cast<int>(duration.InSeconds())), |
| 156 request, true, response); | 156 request, true, response); |
| 157 } else { | 157 } else { |
| 158 // TODO(craigdh): Determine specific cause. | 158 // TODO(craigdh): Determine specific cause. |
| 159 ErrorResponse( | 159 ErrorResponse( |
| 160 "Chrome automation failed prior to timing out, did chrome crash?", | 160 "Chrome automation failed prior to timing out, did chrome crash?", |
| 161 request, false, response); | 161 request, false, response); |
| 162 } | 162 } |
| 163 } | 163 } |
| OLD | NEW |