4 files changed, 9 insertions, 15 deletions
diff --git a/chrome/nacl/nacl_main.cc b/chrome/nacl/nacl_main.cc
index f519748..0516495 100644
--- a/chrome/nacl/nacl_main.cc
+++ b/chrome/nacl/nacl_main.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2009 The Chromium Authors. All rights reserved.
+// 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.
 
diff --git a/chrome/nacl/nacl_thread.cc b/chrome/nacl/nacl_thread.cc
index ff4f508..3ed7c93 100644
--- a/chrome/nacl/nacl_thread.cc
+++ b/chrome/nacl/nacl_thread.cc
@@ -1,10 +1,9 @@
-// Copyright (c) 2006-2009 The Chromium Authors. All rights reserved.
+// 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.
 
 #include "chrome/nacl/nacl_thread.h"
 
-#include "build/build_config.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/common/nacl_messages.h"
 #include "native_client/src/trusted/service_runtime/include/sys/nacl_imc_api.h"
@@ -27,7 +26,7 @@ void NaClThread::OnControlMessageReceived(const IPC::Message& msg) {
   IPC_END_MESSAGE_MAP()
 }
 
-void NaClThread::OnStartSelLdr(const int channel_descriptor,
-                               const nacl::FileDescriptor handle) {
+void NaClThread::OnStartSelLdr(int channel_descriptor,
+                               nacl::FileDescriptor handle) {
   SelMain(channel_descriptor, NATIVE_HANDLE(handle));
 }
diff --git a/chrome/nacl/nacl_thread.h b/chrome/nacl/nacl_thread.h
index a69ce3a..fd8fe76 100644
--- a/chrome/nacl/nacl_thread.h
+++ b/chrome/nacl/nacl_thread.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2009 The Chromium Authors. All rights reserved.
+// 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.
 
@@ -23,13 +23,10 @@ class NaClThread : public ChildThread {
 
  private:
   virtual void OnControlMessageReceived(const IPC::Message& msg);
-  void OnStartSelLdr(const int channel_descriptor,
-                     const nacl::FileDescriptor handle);
-  // TODO(gregoryd): do we need to override Cleanup as in PluginThread?
-
-  scoped_ptr<NotificationService> notification_service_;
+  void OnStartSelLdr(int channel_descriptor, nacl::FileDescriptor handle);
 
-  DISALLOW_EVIL_CONSTRUCTORS(NaClThread);
+  // TODO(gregoryd): do we need to override Cleanup as in PluginThread?
+  DISALLOW_COPY_AND_ASSIGN(NaClThread);
 };
 
 #endif  // CHROME_NACL_NACL_THREAD_H_
diff --git a/chrome/nacl/sel_main.cc b/chrome/nacl/sel_main.cc
index 7174706..7258205 100644
--- a/chrome/nacl/sel_main.cc
+++ b/chrome/nacl/sel_main.cc
@@ -1,9 +1,7 @@
-// Copyright (c) 2006-2009 The Chromium Authors. All rights reserved.
+// 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.
 
-#include "build/build_config.h"
-
 #include "native_client/src/include/portability.h"
 
 #if NACL_OSX