Use DISALLOW_COPY_AND_ASSIGN instead of DISALLOW_EVIL_CONSTRUCTORS in sandbox directory.

BUG=None
TEST=trybots

Review URL: http://codereview.chromium.org/2643003

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

20 files changed, 45 insertions, 45 deletions

diff --git a/sandbox/src/broker_services.h b/sandbox/src/broker_services.h
index df6006e..3e57dd2 100644
--- a/sandbox/src/broker_services.h
+++ b/sandbox/src/broker_services.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2008 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.
 
@@ -85,7 +85,7 @@ class BrokerServicesBase : public BrokerServices,
   typedef std::list<JobTracker*> JobTrackerList;
   JobTrackerList tracker_list_;
 
-  DISALLOW_EVIL_CONSTRUCTORS(BrokerServicesBase);
+  DISALLOW_COPY_AND_ASSIGN(BrokerServicesBase);
 };
 
 }  // namespace sandbox
diff --git a/sandbox/src/crosscall_params.h b/sandbox/src/crosscall_params.h
index f6de823..939925c 100644
--- a/sandbox/src/crosscall_params.h
+++ b/sandbox/src/crosscall_params.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2008 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.
 
@@ -155,7 +155,7 @@ class CrossCallParams {
   uint32 is_in_out_;
   CrossCallReturn call_return;
   const size_t params_count_;
-  DISALLOW_EVIL_CONSTRUCTORS(CrossCallParams);
+  DISALLOW_COPY_AND_ASSIGN(CrossCallParams);
 };
 
 // ActualCallParams models an specific IPC call parameters with respect to the
@@ -272,7 +272,7 @@ class ActualCallParams : public CrossCallParams {
   ParamInfo param_info_[NUMBER_PARAMS + 1];
   char parameters_[BLOCK_SIZE - sizeof(CrossCallParams)
                    - sizeof(ParamInfo) * (NUMBER_PARAMS + 1)];
-  DISALLOW_EVIL_CONSTRUCTORS(ActualCallParams);
+  DISALLOW_COPY_AND_ASSIGN(ActualCallParams);
 };
 
 COMPILE_ASSERT(sizeof(ActualCallParams<1, 1024>) == 1024, bad_size_buffer);
diff --git a/sandbox/src/eat_resolver.h b/sandbox/src/eat_resolver.h
index 50cfd48..0d5b3e0 100644
--- a/sandbox/src/eat_resolver.h
+++ b/sandbox/src/eat_resolver.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2008 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.
 
@@ -39,7 +39,7 @@ class EatResolverThunk : public ResolverThunk {
   // The entry to patch.
   DWORD* eat_entry_;
 
-  DISALLOW_EVIL_CONSTRUCTORS(EatResolverThunk);
+  DISALLOW_COPY_AND_ASSIGN(EatResolverThunk);
 };
 
 }  // namespace sandbox
diff --git a/sandbox/src/filesystem_dispatcher.h b/sandbox/src/filesystem_dispatcher.h
index 83d20be..d828715 100644
--- a/sandbox/src/filesystem_dispatcher.h
+++ b/sandbox/src/filesystem_dispatcher.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2008 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.
 
@@ -49,7 +49,7 @@ class FilesystemDispatcher : public Dispatcher {
                             DWORD info_class);
 
   PolicyBase* policy_base_;
-  DISALLOW_EVIL_CONSTRUCTORS(FilesystemDispatcher);
+  DISALLOW_COPY_AND_ASSIGN(FilesystemDispatcher);
 };
 
 }  // namespace sandbox
diff --git a/sandbox/src/job.h b/sandbox/src/job.h
index 3824b87..a3f6738 100644
--- a/sandbox/src/job.h
+++ b/sandbox/src/job.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2008 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.
 
@@ -53,7 +53,7 @@ class Job {
   // Handle to the job referenced by the object.
   HANDLE job_handle_;
 
-  DISALLOW_EVIL_CONSTRUCTORS(Job);
+  DISALLOW_COPY_AND_ASSIGN(Job);
 };
 
 }  // namespace sandbox
diff --git a/sandbox/src/named_pipe_dispatcher.h b/sandbox/src/named_pipe_dispatcher.h
index 4fe521a..87a68b6 100644
--- a/sandbox/src/named_pipe_dispatcher.h
+++ b/sandbox/src/named_pipe_dispatcher.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2008 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.
 
@@ -29,7 +29,7 @@ class NamedPipeDispatcher : public Dispatcher {
                        DWORD default_timeout);
 
   PolicyBase* policy_base_;
-  DISALLOW_EVIL_CONSTRUCTORS(NamedPipeDispatcher);
+  DISALLOW_COPY_AND_ASSIGN(NamedPipeDispatcher);
 };
 
 }  // namespace sandbox
diff --git a/sandbox/src/policy_engine_opcodes.h b/sandbox/src/policy_engine_opcodes.h
index 7e70e695..6821413 100644
--- a/sandbox/src/policy_engine_opcodes.h
+++ b/sandbox/src/policy_engine_opcodes.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2008 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.
 
@@ -372,7 +372,7 @@ class OpcodeFactory {
   // allocated.
   char* memory_bottom_;
 
-  DISALLOW_EVIL_CONSTRUCTORS(OpcodeFactory);
+  DISALLOW_COPY_AND_ASSIGN(OpcodeFactory);
 };
 
 }  // namespace sandbox
diff --git a/sandbox/src/policy_engine_processor.h b/sandbox/src/policy_engine_processor.h
index 7b7f840..3327e36 100644
--- a/sandbox/src/policy_engine_processor.h
+++ b/sandbox/src/policy_engine_processor.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2008 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.
 
@@ -137,7 +137,7 @@ class PolicyProcessor {
   void SetInternalState(size_t index, EvalResult result);
 
   PolicyBuffer* policy_;
-  DISALLOW_EVIL_CONSTRUCTORS(PolicyProcessor);
+  DISALLOW_COPY_AND_ASSIGN(PolicyProcessor);
 };
 
 }  // namespace sandbox
diff --git a/sandbox/src/process_thread_dispatcher.h b/sandbox/src/process_thread_dispatcher.h
index 0403c50..45fad03 100644
--- a/sandbox/src/process_thread_dispatcher.h
+++ b/sandbox/src/process_thread_dispatcher.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2010 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.
 
@@ -39,7 +39,7 @@ class ThreadProcessDispatcher : public Dispatcher {
                       std::wstring* cur_dir, CountedBuffer* info);
 
   PolicyBase* policy_base_;
-  DISALLOW_EVIL_CONSTRUCTORS(ThreadProcessDispatcher);
+  DISALLOW_COPY_AND_ASSIGN(ThreadProcessDispatcher);
 };
 
 }  // namespace sandbox
diff --git a/sandbox/src/registry_dispatcher.h b/sandbox/src/registry_dispatcher.h
index c5dd881..6d1390d 100644
--- a/sandbox/src/registry_dispatcher.h
+++ b/sandbox/src/registry_dispatcher.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2010 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.
 
@@ -31,7 +31,7 @@ class RegistryDispatcher : public Dispatcher {
                  HANDLE root, DWORD desired_access);
 
   PolicyBase* policy_base_;
-  DISALLOW_EVIL_CONSTRUCTORS(RegistryDispatcher);
+  DISALLOW_COPY_AND_ASSIGN(RegistryDispatcher);
 };
 
 }  // namespace sandbox
diff --git a/sandbox/src/resolver.h b/sandbox/src/resolver.h
index bd33e90..0ee3e9a 100644
--- a/sandbox/src/resolver.h
+++ b/sandbox/src/resolver.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2008 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.
 
@@ -95,7 +95,7 @@ class ResolverThunk {
   // Holds the resolved interception interceptor.
   const void* interceptor_;
 
-  DISALLOW_EVIL_CONSTRUCTORS(ResolverThunk);
+  DISALLOW_COPY_AND_ASSIGN(ResolverThunk);
 };
 
 }  // namespace sandbox
diff --git a/sandbox/src/restricted_token.h b/sandbox/src/restricted_token.h
index 00aea0e..88bd70f 100644
--- a/sandbox/src/restricted_token.h
+++ b/sandbox/src/restricted_token.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2008 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.
 
@@ -190,7 +190,7 @@ class RestrictedToken {
   // Tells if the object is initialized or not (if Init() has been called)
   bool init_;
 
-  DISALLOW_EVIL_CONSTRUCTORS(RestrictedToken);
+  DISALLOW_COPY_AND_ASSIGN(RestrictedToken);
 };
 
 }  // namespace sandbox
diff --git a/sandbox/src/sandbox_nt_util.h b/sandbox/src/sandbox_nt_util.h
index d01407e..99657f5 100644
--- a/sandbox/src/sandbox_nt_util.h
+++ b/sandbox/src/sandbox_nt_util.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2010 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.
 
@@ -153,7 +153,7 @@ class AutoProtectMemory {
   size_t bytes_;
   ULONG old_protect_;
 
-  DISALLOW_EVIL_CONSTRUCTORS(AutoProtectMemory);
+  DISALLOW_COPY_AND_ASSIGN(AutoProtectMemory);
 };
 
 // Returns true if the file_rename_information structure is supported by our
diff --git a/sandbox/src/service_resolver.h b/sandbox/src/service_resolver.h
index f822dfd..469080a 100644
--- a/sandbox/src/service_resolver.h
+++ b/sandbox/src/service_resolver.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2008 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.
 
@@ -77,7 +77,7 @@ class ServiceResolverThunk : public ResolverThunk {
   bool relaxed_;
   ULONG relative_jump_;
 
-  DISALLOW_EVIL_CONSTRUCTORS(ServiceResolverThunk);
+  DISALLOW_COPY_AND_ASSIGN(ServiceResolverThunk);
 };
 
 // This is the concrete resolver used to perform service-call type functions
@@ -92,7 +92,7 @@ class Wow64ResolverThunk : public ServiceResolverThunk {
  private:
   virtual bool IsFunctionAService(void* local_thunk) const;
 
-  DISALLOW_EVIL_CONSTRUCTORS(Wow64ResolverThunk);
+  DISALLOW_COPY_AND_ASSIGN(Wow64ResolverThunk);
 };
 
 // This is the concrete resolver used to perform service-call type functions
@@ -109,7 +109,7 @@ class Win2kResolverThunk : public ServiceResolverThunk {
  private:
   virtual bool IsFunctionAService(void* local_thunk) const;
 
-  DISALLOW_EVIL_CONSTRUCTORS(Win2kResolverThunk);
+  DISALLOW_COPY_AND_ASSIGN(Win2kResolverThunk);
 };
 
 }  // namespace sandbox
diff --git a/sandbox/src/service_resolver_unittest.cc b/sandbox/src/service_resolver_unittest.cc
index ee26c9e..1756017 100644
--- a/sandbox/src/service_resolver_unittest.cc
+++ b/sandbox/src/service_resolver_unittest.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2008 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.
 
@@ -52,7 +52,7 @@ class ResolverThunkTest : public T {
   // Holds the address of the fake target.
   void* fake_target_;
 
-  DISALLOW_EVIL_CONSTRUCTORS(ResolverThunkTest);
+  DISALLOW_COPY_AND_ASSIGN(ResolverThunkTest);
 };
 
 typedef ResolverThunkTest<sandbox::Win2kResolverThunk> Win2kResolverTest;
diff --git a/sandbox/src/shared_handles.h b/sandbox/src/shared_handles.h
index b801fdf..2c76bfb 100644
--- a/sandbox/src/shared_handles.h
+++ b/sandbox/src/shared_handles.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2008 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.
 
@@ -100,7 +100,7 @@ class SharedHandles {
   SharedItem* FindByTag(uint32 tag);
 
   SharedMem shared_;
-  DISALLOW_EVIL_CONSTRUCTORS(SharedHandles);
+  DISALLOW_COPY_AND_ASSIGN(SharedHandles);
 };
 
 }  // namespace sandbox
diff --git a/sandbox/src/sharedmem_ipc_server.h b/sandbox/src/sharedmem_ipc_server.h
index 1041245..7d55157 100644
--- a/sandbox/src/sharedmem_ipc_server.h
+++ b/sandbox/src/sharedmem_ipc_server.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2010 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.
 
@@ -118,7 +118,7 @@ class SharedMemIPCServer {
   // The dispatcher handles 'ready' IPC calls.
   Dispatcher* call_dispatcher_;
 
-  DISALLOW_EVIL_CONSTRUCTORS(SharedMemIPCServer);
+  DISALLOW_COPY_AND_ASSIGN(SharedMemIPCServer);
 };
 
 }  // namespace sandbox
diff --git a/sandbox/src/sidestep_resolver.h b/sandbox/src/sidestep_resolver.h
index 48976fe..1e7fdac 100644
--- a/sandbox/src/sidestep_resolver.h
+++ b/sandbox/src/sidestep_resolver.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2008 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.
 
@@ -31,7 +31,7 @@ class SidestepResolverThunk : public ResolverThunk {
   virtual size_t GetThunkSize() const;
 
  private:
-  DISALLOW_EVIL_CONSTRUCTORS(SidestepResolverThunk);
+  DISALLOW_COPY_AND_ASSIGN(SidestepResolverThunk);
 };
 
 // This is the concrete resolver used to perform smart sidestep interceptions.
@@ -64,7 +64,7 @@ class SmartSidestepResolverThunk : public SidestepResolverThunk {
   // Returns true if return_address is inside the module loaded at base.
   static bool IsInternalCall(const void* base, void* return_address);
 
-  DISALLOW_EVIL_CONSTRUCTORS(SmartSidestepResolverThunk);
+  DISALLOW_COPY_AND_ASSIGN(SmartSidestepResolverThunk);
 };
 
 }  // namespace sandbox
diff --git a/sandbox/src/sync_dispatcher.h b/sandbox/src/sync_dispatcher.h
index 8bcfcf4..be9b9a2 100644
--- a/sandbox/src/sync_dispatcher.h
+++ b/sandbox/src/sync_dispatcher.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2008 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.
 
@@ -30,7 +30,7 @@ private:
                  DWORD inherit_handle);
 
   PolicyBase* policy_base_;
-  DISALLOW_EVIL_CONSTRUCTORS(SyncDispatcher);
+  DISALLOW_COPY_AND_ASSIGN(SyncDispatcher);
 };
 
 }  // namespace sandbox
diff --git a/sandbox/src/target_services.h b/sandbox/src/target_services.h
index 0b3bd85..7099098 100644
--- a/sandbox/src/target_services.h
+++ b/sandbox/src/target_services.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2008 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.
 
@@ -31,7 +31,7 @@ class ProcessState {
 
  public:
   int process_state_;
-  DISALLOW_EVIL_CONSTRUCTORS(ProcessState);
+  DISALLOW_COPY_AND_ASSIGN(ProcessState);
 };
 
 // This class is an implementation of the  TargetServices.
@@ -58,7 +58,7 @@ class TargetServicesBase : public TargetServices {
 
  private:
   ProcessState process_state_;
-  DISALLOW_EVIL_CONSTRUCTORS(TargetServicesBase);
+  DISALLOW_COPY_AND_ASSIGN(TargetServicesBase);
 };
 
 }  // namespace sandbox