diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-07 02:10:18 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-07 02:10:18 +0000 |
| commit | 73a797fb8e6c05e7756d30d7baef447267deacd1 (patch) | |
| tree | e5be765e7deee04ee7c75195659a6fabb08ecfef /net/tools | |
| parent | 347dc0a147199514afaaaa1f0d5949a41083efcb (diff) | |
| download | chromium_src-73a797fb8e6c05e7756d30d7baef447267deacd1.zip chromium_src-73a797fb8e6c05e7756d30d7baef447267deacd1.tar.gz chromium_src-73a797fb8e6c05e7756d30d7baef447267deacd1.tar.bz2 | |
Get rid of DISALLOW_EVIL_CONSTRUCTORS macro usage in our code base.
TODO: Fix the remaining usages in third_party libraries and get rid of the macro in question.
BUG=None
TEST=trybots
Review URL: http://codereview.chromium.org/2657005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@49032 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/tools')
| -rw-r--r-- | net/tools/fetch/http_listen_socket.h | 4 | ||||
| -rw-r--r-- | net/tools/fetch/http_server.h | 4 | ||||
| -rw-r--r-- | net/tools/fetch/http_session.h | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/net/tools/fetch/http_listen_socket.h b/net/tools/fetch/http_listen_socket.h index 73f09f6..15df455 100644 --- a/net/tools/fetch/http_listen_socket.h +++ b/net/tools/fetch/http_listen_socket.h @@ -1,4 +1,4 @@ -// Copyright (c) 2009 The Chromium Authors. All rights reserved. +// 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. @@ -54,7 +54,7 @@ class HttpListenSocket : public ListenSocket, HttpListenSocket::Delegate* delegate_; std::string recv_data_; - DISALLOW_EVIL_CONSTRUCTORS(HttpListenSocket); + DISALLOW_COPY_AND_ASSIGN(HttpListenSocket); }; #endif // NET_BASE_TOOLS_HTTP_LISTEN_SOCKET_H_ diff --git a/net/tools/fetch/http_server.h b/net/tools/fetch/http_server.h index 67d1ef5..1a3d402 100644 --- a/net/tools/fetch/http_server.h +++ b/net/tools/fetch/http_server.h @@ -1,4 +1,4 @@ -// Copyright (c) 2009 The Chromium Authors. All rights reserved. +// 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. @@ -18,7 +18,7 @@ public: private: scoped_ptr<HttpSession> session_; - DISALLOW_EVIL_CONSTRUCTORS(HttpServer); + DISALLOW_COPY_AND_ASSIGN(HttpServer); }; #endif // NET_BASE_TOOLS_HTTP_SERVER_H_ diff --git a/net/tools/fetch/http_session.h b/net/tools/fetch/http_session.h index 4d9e84b..a1d57bf 100644 --- a/net/tools/fetch/http_session.h +++ b/net/tools/fetch/http_session.h @@ -1,4 +1,4 @@ -// Copyright (c) 2009 The Chromium Authors. All rights reserved. +// 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. @@ -20,7 +20,7 @@ class HttpSession : HttpListenSocket::Delegate { private: scoped_refptr<HttpListenSocket> socket_; - DISALLOW_EVIL_CONSTRUCTORS(HttpSession); + DISALLOW_COPY_AND_ASSIGN(HttpSession); }; #endif // NET_BASE_TOOLS_HTTP_SESSION_H_ |