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

12 files changed, 36 insertions, 45 deletions

diff --git a/chrome/browser/automation/automation_provider.cc b/chrome/browser/automation/automation_provider.cc
index 21a7614..8b0063a 100644
--- a/chrome/browser/automation/automation_provider.cc
+++ b/chrome/browser/automation/automation_provider.cc
@@ -89,7 +89,7 @@
 #include "webkit/glue/plugins/plugin_list.h"
 
 #if defined(OS_WIN)
-#include "chrome/browser/external_tab_container.h"
+#include "chrome/browser/external_tab_container_win.h"
 #endif  // defined(OS_WIN)
 
 using base::Time;
diff --git a/chrome/browser/automation/automation_provider_win.cc b/chrome/browser/automation/automation_provider_win.cc
index 89345f0..6e92685 100644
--- a/chrome/browser/automation/automation_provider_win.cc
+++ b/chrome/browser/automation/automation_provider_win.cc
@@ -12,7 +12,7 @@
 #include "chrome/browser/automation/ui_controls.h"
 #include "chrome/browser/browser_window.h"
 #include "chrome/browser/extensions/extension_message_service.h"
-#include "chrome/browser/external_tab_container.h"
+#include "chrome/browser/external_tab_container_win.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/renderer_host/render_view_host.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
diff --git a/chrome/browser/external_tab_container.cc b/chrome/browser/external_tab_container_win.cc
index 5fd672b..94aec46 100644
--- a/chrome/browser/external_tab_container.cc
+++ b/chrome/browser/external_tab_container_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/external_tab_container.h"
+#include "chrome/browser/external_tab_container_win.h"
 
 #include <string>
 
diff --git a/chrome/browser/external_tab_container.h b/chrome/browser/external_tab_container_win.h
index a5bf26d..133be98 100644
--- a/chrome/browser/external_tab_container.h
+++ b/chrome/browser/external_tab_container_win.h
@@ -1,9 +1,9 @@
-// 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.
 
-#ifndef CHROME_BROWSER_EXTERNAL_TAB_CONTAINER_H_
-#define CHROME_BROWSER_EXTERNAL_TAB_CONTAINER_H_
+#ifndef CHROME_BROWSER_EXTERNAL_TAB_CONTAINER_WIN_H_
+#define CHROME_BROWSER_EXTERNAL_TAB_CONTAINER_WIN_H_
 
 #include <vector>
 #include <map>
@@ -333,4 +333,4 @@ class ExternalTabContainer : public TabContentsDelegate,
   DISALLOW_COPY_AND_ASSIGN(ExternalTabContainer);
 };
 
-#endif  // CHROME_BROWSER_EXTERNAL_TAB_CONTAINER_H_
+#endif  // CHROME_BROWSER_EXTERNAL_TAB_CONTAINER_WIN_H_
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.
 
diff --git a/chrome/browser/views/browser_bubble.cc b/chrome/browser/views/browser_bubble.cc
index b199680..c3d2268 100644
--- a/chrome/browser/views/browser_bubble.cc
+++ b/chrome/browser/views/browser_bubble.cc
@@ -7,7 +7,7 @@
 #include "app/l10n_util.h"
 #include "chrome/browser/views/frame/browser_view.h"
 #if defined(OS_WIN)
-#include "chrome/browser/external_tab_container.h"
+#include "chrome/browser/external_tab_container_win.h"
 #endif
 #include "views/widget/root_view.h"
 #include "views/window/window.h"
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index 3cd9e04..97f3717 100755
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -248,8 +248,8 @@
         'browser/bookmarks/bookmark_storage.h',
         'browser/bookmarks/bookmark_utils.cc',
         'browser/bookmarks/bookmark_utils.h',
-	'browser/bookmarks/recently_used_folders_combo_model.cc',
-	'browser/bookmarks/rencetly_used_folders_combo_model.h',
+        'browser/bookmarks/recently_used_folders_combo_model.cc',
+        'browser/bookmarks/rencetly_used_folders_combo_model.h',
         'browser/browser.cc',
         'browser/browser.h',
         'browser/browser_about_handler.cc',
@@ -1177,8 +1177,8 @@
         'browser/extensions/user_script_master.h',
         'browser/external_protocol_handler.cc',
         'browser/external_protocol_handler.h',
-        'browser/external_tab_container.cc',
-        'browser/external_tab_container.h',
+        'browser/external_tab_container_win.cc',
+        'browser/external_tab_container_win.h',
         'browser/global_keyboard_shortcuts_mac.h',
         'browser/global_keyboard_shortcuts_mac.mm',
         'browser/fav_icon_helper.cc',
@@ -1683,6 +1683,10 @@
         'browser/metrics/user_metrics.h',
         'browser/modal_html_dialog_delegate.cc',
         'browser/modal_html_dialog_delegate.h',
+        'browser/nacl_host/nacl_broker_host_win.cc',
+        'browser/nacl_host/nacl_broker_host_win.h',
+        'browser/nacl_host/nacl_broker_service_win.cc',
+        'browser/nacl_host/nacl_broker_service_win.h',
         'browser/nacl_host/nacl_process_host.cc',
         'browser/nacl_host/nacl_process_host.h',
         'browser/net/browser_url_util.cc',
@@ -2700,9 +2704,6 @@
             'browser/views/extensions/extension_shelf.h',
             'browser/views/extensions/extension_view.cc',
             'browser/views/extensions/extension_view.h',
-             # Windows-specific files.
-            'browser/password_manager/password_store_win.cc',
-            'browser/password_manager/password_store_win.h',
           ],
           'sources': [
             'browser/crash_handler_host_linux.h',
@@ -2936,11 +2937,6 @@
             '../views/views.gyp:views',
           ],
           'sources': [
-            # NaCl broker is used on Windows only
-            'browser/nacl_host/nacl_broker_host.cc',
-            'browser/nacl_host/nacl_broker_host.h',
-            'browser/nacl_host/nacl_broker_service.cc',
-            'browser/nacl_host/nacl_broker_service.h',
             'browser/net/ssl_config_service_manager_system.cc',
             # Using built-in rule in vstudio for midl.
             'browser/history/history_indexer.idl',
@@ -3352,7 +3348,6 @@
             'browser/bookmarks/bookmark_menu_controller.h',
             'browser/browser_accessibility.cc',
             'browser/browser_accessibility_manager.cc',
-            'browser/external_tab_container.cc',
             'browser/google_update.cc',
             'browser/history/history_indexer.idl',
             'browser/history_tab_ui.cc',