diff options
| author | Kristian Monsen <kristianm@google.com> | 2011-06-28 21:49:31 +0100 |
|---|---|---|
| committer | Kristian Monsen <kristianm@google.com> | 2011-07-08 17:55:00 +0100 |
| commit | ddb351dbec246cf1fab5ec20d2d5520909041de1 (patch) | |
| tree | 158e3fb57bdcac07c7f1e767fde3c70687c9fbb1 /net/test | |
| parent | 6b92e04f5f151c896e3088e86f70db7081009308 (diff) | |
| download | external_chromium-ddb351dbec246cf1fab5ec20d2d5520909041de1.zip external_chromium-ddb351dbec246cf1fab5ec20d2d5520909041de1.tar.gz external_chromium-ddb351dbec246cf1fab5ec20d2d5520909041de1.tar.bz2 | |
Merge Chromium at r12.0.742.93: Initial merge by git
Change-Id: Ic5ee2fec31358bbee305f7e915442377bfa6cda6
Diffstat (limited to 'net/test')
| -rw-r--r-- | net/test/OWNERS | 1 | ||||
| -rw-r--r-- | net/test/python_utils.cc | 4 | ||||
| -rw-r--r-- | net/test/python_utils_unittest.cc | 4 | ||||
| -rw-r--r-- | net/test/test_server.cc | 7 |
4 files changed, 7 insertions, 9 deletions
diff --git a/net/test/OWNERS b/net/test/OWNERS new file mode 100644 index 0000000..92ecc88 --- /dev/null +++ b/net/test/OWNERS @@ -0,0 +1 @@ +phajdan.jr@chromium.org 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..2b61ec6 100644 --- a/net/test/test_server.cc +++ b/net/test/test_server.cc @@ -17,11 +17,11 @@ #include "base/base64.h" #include "base/command_line.h" #include "base/debug/leak_annotations.h" -#include "base/json/json_reader.h" #include "base/file_util.h" +#include "base/json/json_reader.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" @@ -345,9 +345,6 @@ bool TestServer::AddCommandLineArguments(CommandLine* command_line) const { command_line->AppendSwitchASCII("port", base::IntToString(host_port_pair_.port())); command_line->AppendSwitchPath("data-dir", document_root_); - command_line->AppendSwitchPath("policy-cert-chain", - certificates_dir_.AppendASCII("ok_cert.pem")); - command_line->AppendSwitchPath("policy-cert-chain", GetRootCertificatePath()); if (logging::GetMinLogLevel() == logging::LOG_VERBOSE) { command_line->AppendArg("--log-to-console"); |