Revert 27397 - First step towards NaClChrome integration:1. NaCl plugin becomes a builtin plugin in Chrome and runs in the renderer process.2. Most of the changes are related to launching the NaCl process (that loads and runs the NaCl module) and establishing the initial communication between that process and the NaCl plugin.3. Command line flag "internalnacl" is required to enable the builtin NaCl plugin. NaCl still cannot run in Chrome sandbox, the flag automatically disables the sandboxCommitted: http://src.chromium.org/viewvc/chrome?view=rev&revision=27315

Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=27324
Review URL: http://codereview.chromium.org/153002

TBR=gregoryd@google.com

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

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

4 files changed, 15 insertions, 9 deletions

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