Move debug-related stuff from base to the base/debug directory and use the...

net/test/test_server.cc

 // Copyright (c) 2010 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.
 
 #include "net/test/test_server.h"
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
 #include "build/build_config.h"
 
 #if defined(OS_MACOSX)
 #include "net/base/x509_certificate.h"
 #endif
 
 #include "base/command_line.h"
+#include "base/debug/leak_annotations.h"
 #include "base/file_util.h"
-#include "base/leak_annotations.h"
 #include "base/logging.h"
 #include "base/path_service.h"
 #include "base/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "googleurl/src/gurl.h"
 #include "net/base/cert_test_util.h"
 #include "net/base/host_port_pair.h"
 #include "net/base/host_resolver.h"
 #include "net/base/test_completion_callback.h"
 #include "net/socket/tcp_client_socket.h"
@@ skipping 273 matching lines @@
       return certificates_dir_.AppendASCII("ok_cert.pem");
     case TYPE_HTTPS_EXPIRED_CERTIFICATE:
       return certificates_dir_.AppendASCII("expired_cert.pem");
     default:
       NOTREACHED();
   }
   return FilePath();
 }
 
 }  // namespace net