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 "chrome/test/chromedriver/chromedriver.h" | 5 #include "chrome/test/chromedriver/chromedriver.h" |
6 | 6 |
7 #include "base/json/json_reader.h" | 7 #include "base/json/json_reader.h" |
8 #include "base/json/json_writer.h" | 8 #include "base/json/json_writer.h" |
9 #include "base/lazy_instance.h" | 9 #include "base/lazy_instance.h" |
10 #include "base/memory/scoped_ptr.h" | 10 #include "base/memory/scoped_ptr.h" |
11 #include "base/synchronization/lock.h" | 11 #include "base/synchronization/lock.h" |
12 #include "base/values.h" | 12 #include "base/values.h" |
| 13 #include "chrome/test/chromedriver/chrome/status.h" |
13 #include "chrome/test/chromedriver/command_executor.h" | 14 #include "chrome/test/chromedriver/command_executor.h" |
14 #include "chrome/test/chromedriver/status.h" | |
15 | 15 |
16 namespace { | 16 namespace { |
17 | 17 |
18 // Guards |g_executor_initialized|. | 18 // Guards |g_executor_initialized|. |
19 base::LazyInstance<base::Lock> g_lazy_lock = LAZY_INSTANCE_INITIALIZER; | 19 base::LazyInstance<base::Lock> g_lazy_lock = LAZY_INSTANCE_INITIALIZER; |
20 bool g_executor_initialized = false; | 20 bool g_executor_initialized = false; |
21 CommandExecutor* g_command_executor = NULL; | 21 CommandExecutor* g_command_executor = NULL; |
22 | 22 |
23 void SetResponse(StatusCode status, | 23 void SetResponse(StatusCode status, |
24 const base::Value* value, | 24 const base::Value* value, |
(...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
116 // temp directories, unless we make Chrome clean its own directory too. | 116 // temp directories, unless we make Chrome clean its own directory too. |
117 // If Chrome crashes the directory would be leaked. | 117 // If Chrome crashes the directory would be leaked. |
118 base::DictionaryValue params; | 118 base::DictionaryValue params; |
119 StatusCode status_code; | 119 StatusCode status_code; |
120 scoped_ptr<base::Value> value; | 120 scoped_ptr<base::Value> value; |
121 std::string session_id; | 121 std::string session_id; |
122 g_command_executor->ExecuteCommand( | 122 g_command_executor->ExecuteCommand( |
123 "quitAll", params, "", &status_code, &value, &session_id); | 123 "quitAll", params, "", &status_code, &value, &session_id); |
124 delete g_command_executor; | 124 delete g_command_executor; |
125 } | 125 } |
OLD | NEW |