summaryrefslogtreecommitdiffstats
path: root/net/test
diff options
context:
space:
mode:
Diffstat (limited to 'net/test')
-rw-r--r--net/test/python_utils.cc4
-rw-r--r--net/test/python_utils_unittest.cc4
-rw-r--r--net/test/test_server.cc2
3 files changed, 5 insertions, 5 deletions
diff --git a/net/test/python_utils.cc b/net/test/python_utils.cc
index df404ad..0eec816 100644
--- a/net/test/python_utils.cc
+++ b/net/test/python_utils.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.
@@ -9,8 +9,8 @@
#include "base/file_path.h"
#include "base/file_util.h"
#include "base/logging.h"
+#include "base/memory/scoped_ptr.h"
#include "base/path_service.h"
-#include "base/scoped_ptr.h"
#include "base/utf_string_conversions.h"
const char kPythonPathEnv[] = "PYTHONPATH";
diff --git a/net/test/python_utils_unittest.cc b/net/test/python_utils_unittest.cc
index d0e568d..0114774 100644
--- a/net/test/python_utils_unittest.cc
+++ b/net/test/python_utils_unittest.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,8 +7,8 @@
#include "base/command_line.h"
#include "base/environment.h"
#include "base/file_path.h"
+#include "base/memory/scoped_ptr.h"
#include "base/process_util.h"
-#include "base/scoped_ptr.h"
#include "base/stringprintf.h"
#include "base/string_util.h"
#include "net/test/python_utils.h"
diff --git a/net/test/test_server.cc b/net/test/test_server.cc
index 8f5f3d2..de55808 100644
--- a/net/test/test_server.cc
+++ b/net/test/test_server.cc
@@ -20,8 +20,8 @@
#include "base/json/json_reader.h"
#include "base/file_util.h"
#include "base/logging.h"
+#include "base/memory/scoped_ptr.h"
#include "base/path_service.h"
-#include "base/scoped_ptr.h"
#include "base/string_number_conversions.h"
#include "base/utf_string_conversions.h"
#include "base/values.h"