Clean up of chrome_browser.gypi/nacl_host files.

BUG=none
TEST=trybots

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

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

6 files changed, 20 insertions, 24 deletions

diff --git a/chrome/browser/nacl_host/nacl_broker_host.cc b/chrome/browser/nacl_host/nacl_broker_host_win.cc
index 1ff5461..eefbccd 100644
--- a/chrome/browser/nacl_host/nacl_broker_host.cc
+++ b/chrome/browser/nacl_host/nacl_broker_host_win.cc
@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/nacl_host/nacl_broker_host.h"
+#include "chrome/browser/nacl_host/nacl_broker_host_win.h"
 
 #include "base/command_line.h"
 #include "base/path_service.h"
 #include "ipc/ipc_switches.h"
 #include "chrome/browser/browser_process.h"
-#include "chrome/browser/nacl_host/nacl_broker_service.h"
+#include "chrome/browser/nacl_host/nacl_broker_service_win.h"
 #include "chrome/browser/nacl_host/nacl_process_host.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_switches.h"
diff --git a/chrome/browser/nacl_host/nacl_broker_host.h b/chrome/browser/nacl_host/nacl_broker_host_win.h
index ced46e9..0bdc228 100644
--- a/chrome/browser/nacl_host/nacl_broker_host.h
+++ b/chrome/browser/nacl_host/nacl_broker_host_win.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_NACL_HOST_NACL_BROKER_HOST_H_
-#define CHROME_BROWSER_NACL_HOST_NACL_BROKER_HOST_H_
+#ifndef CHROME_BROWSER_NACL_HOST_NACL_BROKER_HOST_WIN_H_
+#define CHROME_BROWSER_NACL_HOST_NACL_BROKER_HOST_WIN_H_
 
 #include "base/basictypes.h"
 #include "base/process.h"
@@ -46,4 +46,4 @@ class NaClBrokerHost : public ChildProcessHost {
   DISALLOW_COPY_AND_ASSIGN(NaClBrokerHost);
 };
 
-#endif  // CHROME_BROWSER_NACL_HOST_NACL_BROKER_HOST_H_
+#endif  // CHROME_BROWSER_NACL_HOST_NACL_BROKER_HOST_WIN_H_
diff --git a/chrome/browser/nacl_host/nacl_broker_service.cc b/chrome/browser/nacl_host/nacl_broker_service_win.cc
index b4c54d7..d1f7923 100644
--- a/chrome/browser/nacl_host/nacl_broker_service.cc
+++ b/chrome/browser/nacl_host/nacl_broker_service_win.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/nacl_host/nacl_broker_service.h"
+#include "chrome/browser/nacl_host/nacl_broker_service_win.h"
 
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/nacl_host/nacl_process_host.h"
diff --git a/chrome/browser/nacl_host/nacl_broker_service.h b/chrome/browser/nacl_host/nacl_broker_service_win.h
index 3eb40f6..cb5b4c0 100644
--- a/chrome/browser/nacl_host/nacl_broker_service.h
+++ b/chrome/browser/nacl_host/nacl_broker_service_win.h
@@ -2,14 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_NACL_HOST_NACL_BROKER_SERVICE_H_
-#define CHROME_BROWSER_NACL_HOST_NACL_BROKER_SERVICE_H_
+#ifndef CHROME_BROWSER_NACL_HOST_NACL_BROKER_SERVICE_WIN_H_
+#define CHROME_BROWSER_NACL_HOST_NACL_BROKER_SERVICE_WIN_H_
 
 #include <map>
 
 #include "base/basictypes.h"
 #include "base/singleton.h"
-#include "chrome/browser/nacl_host/nacl_broker_host.h"
+#include "chrome/browser/nacl_host/nacl_broker_host_win.h"
 
 class NaClProcessHost;
 
@@ -54,4 +54,4 @@ class NaClBrokerService {
   DISALLOW_COPY_AND_ASSIGN(NaClBrokerService);
 };
 
-#endif  // CHROME_BROWSER_NACL_HOST_NACL_BROKER_SERVICE_H_
+#endif  // CHROME_BROWSER_NACL_HOST_NACL_BROKER_SERVICE_WIN_H_
diff --git a/chrome/browser/nacl_host/nacl_process_host.cc b/chrome/browser/nacl_host/nacl_process_host.cc
index 2648b3e..f28d31a 100644
--- a/chrome/browser/nacl_host/nacl_process_host.cc
+++ b/chrome/browser/nacl_host/nacl_process_host.cc
@@ -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.
 
@@ -11,7 +11,6 @@
 #endif
 
 #include "base/command_line.h"
-#include "chrome/browser/nacl_host/nacl_broker_service.h"
 #include "chrome/browser/renderer_host/resource_message_filter.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/logging_chrome.h"
@@ -22,6 +21,8 @@
 
 #if defined(OS_POSIX)
 #include "ipc/ipc_channel_posix.h"
+#elif defined(OS_WIN)
+#include "chrome/browser/nacl_host/nacl_broker_service_win.h"
 #endif
 
 NaClProcessHost::NaClProcessHost(
@@ -55,7 +56,6 @@ bool NaClProcessHost::Launch(ResourceMessageFilter* resource_message_filter,
   NOTIMPLEMENTED() << "Native Client disabled at build time";
   return false;
 #else
-
   // Create a connected socket
   if (nacl::SocketPair(pair_) == -1)
     return false;
@@ -98,16 +98,14 @@ bool NaClProcessHost::LaunchSelLdr() {
     NaClBrokerService::GetInstance()->Init(resource_dispatcher_host_);
     return NaClBrokerService::GetInstance()->LaunchLoader(this,
         ASCIIToWide(channel_id()));
-  } else  // NO_LINT
-#endif
-    ChildProcessHost::Launch(
-#if defined(OS_WIN)
-        FilePath(),
+  } else {
+    ChildProcessHost::Launch(FilePath(), cmd_line);
+  }
 #elif defined(OS_POSIX)
-        true, // use_zygote
-        base::environment_vector(),
+  ChildProcessHost::Launch(true,  // use_zygote
+                           base::environment_vector(),
+                           cmd_line);
 #endif
-        cmd_line);
 
   return true;
 }
@@ -154,7 +152,6 @@ void NaClProcessHost::OnProcessLaunched() {
                   PROCESS_DUP_HANDLE,
                   FALSE,
                   0);
-
 #else
   int flags = fcntl(pair_[0], F_GETFD);
   if (flags != -1) {
@@ -168,7 +165,6 @@ void NaClProcessHost::OnProcessLaunched() {
 
   // We use pid as process handle on Posix
   nacl_process_handle = handle();
-
 #endif
 
   // Get the pid of the NaCl process
diff --git a/chrome/browser/nacl_host/nacl_process_host.h b/chrome/browser/nacl_host/nacl_process_host.h
index 28893fc..b09d471 100644
--- a/chrome/browser/nacl_host/nacl_process_host.h
+++ b/chrome/browser/nacl_host/nacl_process_host.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.