svn prop fixes. Applied to all files not in third_party.

* Removed eol-style, executable and mergeinfo from BMP/GIF/ICO/JPEG files, and set correct mime-type.
* Removed executable and mergeinfo from .c/.cc/.cpp/.h/.m/.mm and .gyp files, and set eol-style to LF.

TBR=evanm
BUG=none
TEST=none


git-svn-id: svn://svn.chromium.org/chrome/trunk/src@40991 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 49 insertions, 49 deletions

diff --git a/net/tools/fetch/http_server.h b/net/tools/fetch/http_server.h
index 6b8e719..67d1ef5 100644
--- a/net/tools/fetch/http_server.h
+++ b/net/tools/fetch/http_server.h
@@ -1,25 +1,25 @@
-// Copyright (c) 2009 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.

-

-#ifndef NET_BASE_TOOLS_HTTP_SERVER_H_

-#define NET_BASE_TOOLS_HTTP_SERVER_H_

-

-#include "base/basictypes.h"

-#include "net/tools/fetch/http_session.h"

-

-// Implements a simple, single-threaded HttpServer.

-// Right now, this class implements no functionality above and beyond

-// the HttpSession.

-class HttpServer {

-public:

-  HttpServer(std::string ip, int port);

-  ~HttpServer();

-

-private:

-  scoped_ptr<HttpSession> session_;

-  DISALLOW_EVIL_CONSTRUCTORS(HttpServer);

-};

-

-#endif // NET_BASE_TOOLS_HTTP_SERVER_H_

-

+// Copyright (c) 2009 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.
+
+#ifndef NET_BASE_TOOLS_HTTP_SERVER_H_
+#define NET_BASE_TOOLS_HTTP_SERVER_H_
+
+#include "base/basictypes.h"
+#include "net/tools/fetch/http_session.h"
+
+// Implements a simple, single-threaded HttpServer.
+// Right now, this class implements no functionality above and beyond
+// the HttpSession.
+class HttpServer {
+public:
+  HttpServer(std::string ip, int port);
+  ~HttpServer();
+
+private:
+  scoped_ptr<HttpSession> session_;
+  DISALLOW_EVIL_CONSTRUCTORS(HttpServer);
+};
+
+#endif // NET_BASE_TOOLS_HTTP_SERVER_H_
+
diff --git a/net/tools/fetch/http_server_request_info.h b/net/tools/fetch/http_server_request_info.h
index 7af161f..239d3b9 100644
--- a/net/tools/fetch/http_server_request_info.h
+++ b/net/tools/fetch/http_server_request_info.h
@@ -1,24 +1,24 @@
-// Copyright (c) 2009 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.

-

-#ifndef NET_BASE_TOOLS_HTTP_SERVER_REQUEST_INFO_H_

-#define NET_BASE_TOOLS_HTTP_SERVER_REQUEST_INFO_H_

-

-#include <string>

-

-#include "net/http/http_request_info.h"

-

-// Meta information about an HTTP request.

-// This is geared toward servers in that it keeps a map of the headers and

-// values rather than just a list of header strings (which net::HttpRequestInfo

-// does).

-class HttpServerRequestInfo : public net::HttpRequestInfo {

- public:

-  HttpServerRequestInfo() : net::HttpRequestInfo() {}

-

-  // A map of the names -> values for HTTP headers.

-  std::map<std::string, std::string> headers;

-};

-

-#endif  // NET_BASE_TOOLS_HTTP_SERVER_REQUEST_INFO_H_

+// Copyright (c) 2009 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.
+
+#ifndef NET_BASE_TOOLS_HTTP_SERVER_REQUEST_INFO_H_
+#define NET_BASE_TOOLS_HTTP_SERVER_REQUEST_INFO_H_
+
+#include <string>
+
+#include "net/http/http_request_info.h"
+
+// Meta information about an HTTP request.
+// This is geared toward servers in that it keeps a map of the headers and
+// values rather than just a list of header strings (which net::HttpRequestInfo
+// does).
+class HttpServerRequestInfo : public net::HttpRequestInfo {
+ public:
+  HttpServerRequestInfo() : net::HttpRequestInfo() {}
+
+  // A map of the names -> values for HTTP headers.
+  std::map<std::string, std::string> headers;
+};
+
+#endif  // NET_BASE_TOOLS_HTTP_SERVER_REQUEST_INFO_H_