summaryrefslogtreecommitdiffstats
path: root/chrome/test/webdriver
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/test/webdriver')
-rw-r--r--chrome/test/webdriver/automation.h4
-rw-r--r--chrome/test/webdriver/commands/command.h2
-rw-r--r--chrome/test/webdriver/commands/cookie_commands.cc2
-rw-r--r--chrome/test/webdriver/commands/implicit_wait_command_unittest.cc2
-rw-r--r--chrome/test/webdriver/commands/webdriver_command.cc4
-rw-r--r--chrome/test/webdriver/commands/webelement_commands.cc2
-rw-r--r--chrome/test/webdriver/cookie_unittest.cc2
-rw-r--r--chrome/test/webdriver/dispatch_unittest.cc2
-rw-r--r--chrome/test/webdriver/server.cc2
-rw-r--r--chrome/test/webdriver/session.cc2
-rw-r--r--chrome/test/webdriver/session.h2
-rw-r--r--chrome/test/webdriver/session_manager.h2
-rw-r--r--chrome/test/webdriver/utility_functions.cc4
13 files changed, 16 insertions, 16 deletions
diff --git a/chrome/test/webdriver/automation.h b/chrome/test/webdriver/automation.h
index 10cf0ac..76385de 100644
--- a/chrome/test/webdriver/automation.h
+++ b/chrome/test/webdriver/automation.h
@@ -9,9 +9,9 @@
#include <string>
#include <vector>
+#include "base/memory/ref_counted.h"
+#include "base/memory/scoped_ptr.h"
#include "base/task.h"
-#include "base/ref_counted.h"
-#include "base/scoped_ptr.h"
#include "chrome/common/automation_constants.h"
#include "ui/base/keycodes/keyboard_codes.h"
diff --git a/chrome/test/webdriver/commands/command.h b/chrome/test/webdriver/commands/command.h
index 2529d58..55f214b 100644
--- a/chrome/test/webdriver/commands/command.h
+++ b/chrome/test/webdriver/commands/command.h
@@ -9,7 +9,7 @@
#include <vector>
#include "base/basictypes.h"
-#include "base/scoped_ptr.h"
+#include "base/memory/scoped_ptr.h"
#include "base/values.h"
#include "base/mac/scoped_nsautorelease_pool.h"
diff --git a/chrome/test/webdriver/commands/cookie_commands.cc b/chrome/test/webdriver/commands/cookie_commands.cc
index 5ee13f5..74409fc 100644
--- a/chrome/test/webdriver/commands/cookie_commands.cc
+++ b/chrome/test/webdriver/commands/cookie_commands.cc
@@ -7,7 +7,7 @@
#include <string>
#include <vector>
-#include "base/scoped_ptr.h"
+#include "base/memory/scoped_ptr.h"
#include "base/string_split.h"
#include "base/string_util.h"
#include "base/values.h"
diff --git a/chrome/test/webdriver/commands/implicit_wait_command_unittest.cc b/chrome/test/webdriver/commands/implicit_wait_command_unittest.cc
index 0daa96c..4191f39 100644
--- a/chrome/test/webdriver/commands/implicit_wait_command_unittest.cc
+++ b/chrome/test/webdriver/commands/implicit_wait_command_unittest.cc
@@ -5,7 +5,7 @@
#include <string>
#include <vector>
-#include "base/scoped_ptr.h"
+#include "base/memory/scoped_ptr.h"
#include "base/values.h"
#include "chrome/test/webdriver/commands/implicit_wait_command.h"
#include "chrome/test/webdriver/commands/response.h"
diff --git a/chrome/test/webdriver/commands/webdriver_command.cc b/chrome/test/webdriver/commands/webdriver_command.cc
index 8d038f1..b715c2a 100644
--- a/chrome/test/webdriver/commands/webdriver_command.cc
+++ b/chrome/test/webdriver/commands/webdriver_command.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -7,7 +7,7 @@
#include <string>
#include "base/logging.h"
-#include "base/singleton.h"
+#include "base/memory/singleton.h"
#include "base/values.h"
#include "chrome/test/webdriver/commands/response.h"
#include "chrome/test/webdriver/session_manager.h"
diff --git a/chrome/test/webdriver/commands/webelement_commands.cc b/chrome/test/webdriver/commands/webelement_commands.cc
index 91fc690..63aa36f 100644
--- a/chrome/test/webdriver/commands/webelement_commands.cc
+++ b/chrome/test/webdriver/commands/webelement_commands.cc
@@ -4,7 +4,7 @@
#include "chrome/test/webdriver/commands/webelement_commands.h"
-#include "base/scoped_ptr.h"
+#include "base/memory/scoped_ptr.h"
#include "base/stringprintf.h"
#include "base/third_party/icu/icu_utf.h"
#include "base/values.h"
diff --git a/chrome/test/webdriver/cookie_unittest.cc b/chrome/test/webdriver/cookie_unittest.cc
index 69323da..0fa6a0b 100644
--- a/chrome/test/webdriver/cookie_unittest.cc
+++ b/chrome/test/webdriver/cookie_unittest.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "base/scoped_ptr.h"
+#include "base/memory/scoped_ptr.h"
#include "base/stringprintf.h"
#include "base/values.h"
#include "chrome/test/webdriver/cookie.h"
diff --git a/chrome/test/webdriver/dispatch_unittest.cc b/chrome/test/webdriver/dispatch_unittest.cc
index e84dd11..167f684 100644
--- a/chrome/test/webdriver/dispatch_unittest.cc
+++ b/chrome/test/webdriver/dispatch_unittest.cc
@@ -4,7 +4,7 @@
#include "base/format_macros.h"
#include "base/json/json_reader.h"
-#include "base/scoped_ptr.h"
+#include "base/memory/scoped_ptr.h"
#include "base/stringprintf.h"
#include "base/values.h"
#include "chrome/test/webdriver/commands/response.h"
diff --git a/chrome/test/webdriver/server.cc b/chrome/test/webdriver/server.cc
index b94d348..2c5d934 100644
--- a/chrome/test/webdriver/server.cc
+++ b/chrome/test/webdriver/server.cc
@@ -17,8 +17,8 @@
#include "base/file_path.h"
#include "base/file_util.h"
#include "base/logging.h"
+#include "base/memory/scoped_ptr.h"
#include "base/string_number_conversions.h"
-#include "base/scoped_ptr.h"
#include "base/string_split.h"
#include "base/string_util.h"
#include "base/synchronization/waitable_event.h"
diff --git a/chrome/test/webdriver/session.cc b/chrome/test/webdriver/session.cc
index e1951a3..b96b7d7 100644
--- a/chrome/test/webdriver/session.cc
+++ b/chrome/test/webdriver/session.cc
@@ -13,10 +13,10 @@
#include "base/json/json_reader.h"
#include "base/json/json_writer.h"
#include "base/logging.h"
+#include "base/memory/scoped_ptr.h"
#include "base/message_loop_proxy.h"
#include "base/process.h"
#include "base/process_util.h"
-#include "base/scoped_ptr.h"
#include "base/stringprintf.h"
#include "base/string_number_conversions.h"
#include "base/string_split.h"
diff --git a/chrome/test/webdriver/session.h b/chrome/test/webdriver/session.h
index dbb083d..88742c4 100644
--- a/chrome/test/webdriver/session.h
+++ b/chrome/test/webdriver/session.h
@@ -9,7 +9,7 @@
#include <string>
#include <vector>
-#include "base/scoped_ptr.h"
+#include "base/memory/scoped_ptr.h"
#include "base/string16.h"
#include "base/threading/thread.h"
#include "chrome/common/automation_constants.h"
diff --git a/chrome/test/webdriver/session_manager.h b/chrome/test/webdriver/session_manager.h
index a99d989..5f7ce39 100644
--- a/chrome/test/webdriver/session_manager.h
+++ b/chrome/test/webdriver/session_manager.h
@@ -9,7 +9,7 @@
#include <string>
#include "base/file_path.h"
-#include "base/singleton.h"
+#include "base/memory/singleton.h"
#include "base/synchronization/lock.h"
#include "chrome/test/webdriver/session.h"
diff --git a/chrome/test/webdriver/utility_functions.cc b/chrome/test/webdriver/utility_functions.cc
index 5908548..c912267 100644
--- a/chrome/test/webdriver/utility_functions.cc
+++ b/chrome/test/webdriver/utility_functions.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -13,8 +13,8 @@
#include "base/format_macros.h"
#include "base/json/json_reader.h"
#include "base/logging.h"
+#include "base/memory/scoped_ptr.h"
#include "base/rand_util.h"
-#include "base/scoped_ptr.h"
#include "base/stringprintf.h"
namespace webdriver {
generated by cgit v1.1 at 2025-01-30 11:42:07 +0000