Move nacl_cmd_line to components/nacl/common.

Move the files and create a target for them, which is included in chrome_common.gypi.

This is part of componentizing NaCl code.
BUG=244791

Review URL: https://chromiumcodereview.appspot.com/18098009

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

8 files changed, 39 insertions, 12 deletions

diff --git a/chrome/browser/nacl_host/nacl_broker_host_win.cc b/chrome/browser/nacl_host/nacl_broker_host_win.cc
index f0eca4d..bcb250b 100644
--- a/chrome/browser/nacl_host/nacl_broker_host_win.cc
+++ b/chrome/browser/nacl_host/nacl_broker_host_win.cc
@@ -10,8 +10,8 @@
 #include "ipc/ipc_switches.h"
 #include "chrome/browser/nacl_host/nacl_broker_service_win.h"
 #include "chrome/browser/nacl_host/nacl_browser.h"
-#include "chrome/common/nacl_cmd_line.h"
 #include "chrome/common/nacl_messages.h"
+#include "components/nacl/common/nacl_cmd_line.h"
 #include "components/nacl/common/nacl_process_type.h"
 #include "components/nacl/common/nacl_switches.h"
 #include "content/public/browser/browser_child_process_host.h"
diff --git a/chrome/browser/nacl_host/nacl_process_host.cc b/chrome/browser/nacl_host/nacl_process_host.cc
index 5866cdb..2316856 100644
--- a/chrome/browser/nacl_host/nacl_process_host.cc
+++ b/chrome/browser/nacl_host/nacl_process_host.cc
@@ -25,10 +25,10 @@
 #include "build/build_config.h"
 #include "chrome/browser/nacl_host/nacl_browser.h"
 #include "chrome/browser/nacl_host/nacl_host_message_filter.h"
-#include "chrome/common/nacl_cmd_line.h"
 #include "chrome/common/nacl_host_messages.h"
 #include "chrome/common/nacl_messages.h"
 #include "components/nacl/common/nacl_browser_delegate.h"
+#include "components/nacl/common/nacl_cmd_line.h"
 #include "components/nacl/common/nacl_process_type.h"
 #include "components/nacl/common/nacl_switches.h"
 #include "content/public/browser/browser_child_process_host.h"
diff --git a/chrome/chrome_common.gypi b/chrome/chrome_common.gypi
index c5b673b..f9a593a 100644
--- a/chrome/chrome_common.gypi
+++ b/chrome/chrome_common.gypi
@@ -407,8 +407,6 @@
         'common/multi_process_lock_linux.cc',
         'common/multi_process_lock_mac.cc',
         'common/multi_process_lock_win.cc',
-        'common/nacl_cmd_line.cc',
-        'common/nacl_cmd_line.h',
         'common/nacl_host_messages.h',
         'common/nacl_messages.cc',
         'common/nacl_messages.h',
@@ -535,6 +533,7 @@
             '<(DEPTH)/chrome/app/policy/cloud_policy_codegen.gyp:policy',
             '<(DEPTH)/chrome/common/extensions/api/api.gyp:api',
             '<(DEPTH)/components/components.gyp:autofill_core_common',
+            '<(DEPTH)/components/nacl_common.gyp:nacl_common',
             '<(DEPTH)/ipc/ipc.gyp:ipc',
             '<(DEPTH)/printing/printing.gyp:printing',
             '<(DEPTH)/third_party/adobe/flash/flash_player.gyp:flapper_version_h',
diff --git a/chrome/nacl.gypi b/chrome/nacl.gypi
index d9d4ec1..7fcf051 100644
--- a/chrome/nacl.gypi
+++ b/chrome/nacl.gypi
@@ -108,17 +108,18 @@
                 '../native_client/src/trusted/service_runtime/service_runtime.gyp:sel_main_chrome64',
                 '../ppapi/ppapi_internal.gyp:ppapi_shared_win64',
                 '../ppapi/ppapi_internal.gyp:ppapi_ipc_win64',
+                '../components/nacl_common.gyp:nacl_common_win64',
               ],
               'export_dependent_settings': [
                 '../ppapi/ppapi_internal.gyp:ppapi_ipc_win64',
               ],
               'sources': [
-                'common/nacl_cmd_line.cc',
                 'common/nacl_debug_exception_handler_win.cc',
                 'common/nacl_messages.cc',
                 'common/nacl_types.cc',
                 'nacl/nacl_broker_listener.cc',
                 'nacl/nacl_broker_listener.h',
+                '../components/nacl/common/nacl_cmd_line.cc',
               ],
               'include_dirs': [
                 '..',
diff --git a/chrome/nacl/nacl_broker_listener.cc b/chrome/nacl/nacl_broker_listener.cc
index 3bb4834..b01e7e3 100644
--- a/chrome/nacl/nacl_broker_listener.cc
+++ b/chrome/nacl/nacl_broker_listener.cc
@@ -12,9 +12,9 @@
 #include "base/path_service.h"
 #include "base/process_util.h"
 #include "chrome/common/chrome_switches.h"
-#include "chrome/common/nacl_cmd_line.h"
 #include "chrome/common/nacl_debug_exception_handler_win.h"
 #include "chrome/common/nacl_messages.h"
+#include "components/nacl/common/nacl_cmd_line.h"
 #include "components/nacl/common/nacl_switches.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/common/sandbox_init.h"
diff --git a/chrome/common/nacl_cmd_line.cc b/components/nacl/common/nacl_cmd_line.cc
index 9fb1a0e..b21a671 100644
--- a/chrome/common/nacl_cmd_line.cc
+++ b/components/nacl/common/nacl_cmd_line.cc
@@ -1,10 +1,10 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2013 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 "base/base_switches.h"
 #include "base/basictypes.h"
 #include "base/command_line.h"
-#include "chrome/common/chrome_switches.h"
 #include "components/nacl/common/nacl_switches.h"
 #include "content/public/common/content_switches.h"
 
diff --git a/chrome/common/nacl_cmd_line.h b/components/nacl/common/nacl_cmd_line.h
index 2975850..4e4e753 100644
--- a/chrome/common/nacl_cmd_line.h
+++ b/components/nacl/common/nacl_cmd_line.h
@@ -1,9 +1,9 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright 2013 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_COMMON_NACL_CMD_LINE_H_
-#define CHROME_COMMON_NACL_CMD_LINE_H_
+#ifndef COMPONENTS_NACL_COMMON_NACL_CMD_LINE_H_
+#define COMPONENTS_NACL_COMMON_NACL_CMD_LINE_H_
 
 class CommandLine;
 
@@ -13,4 +13,4 @@ namespace nacl {
   void CopyNaClCommandLineArguments(CommandLine* cmd_line);
 }
 
-#endif  // CHROME_COMMON_NACL_CMD_LINE_H_
+#endif  // COMPONENTS_NACL_COMMON_NACL_CMD_LINE_H_
diff --git a/components/nacl_common.gyp b/components/nacl_common.gyp
index 00137c5..642d61a 100644
--- a/components/nacl_common.gyp
+++ b/components/nacl_common.gyp
@@ -15,6 +15,17 @@
         '..',
       ],
     },
+    {
+      'target_name': 'nacl_common',
+      'type': 'static_library',
+      'sources': [
+        'nacl/common/nacl_cmd_line.cc',
+        'nacl/common/nacl_cmd_line.h',
+      ],
+      'include_dirs': [
+        '..',
+      ],
+    },
   ],
   'conditions': [
     ['OS=="win" and target_arch=="ia32"', {
@@ -35,6 +46,22 @@
             },
           },
         },
+        {
+          'target_name': 'nacl_common_win64',
+          'type': 'static_library',
+          'sources': [
+            'nacl/common/nacl_cmd_line.cc',
+            'nacl/common/nacl_cmd_line.h',
+          ],
+          'include_dirs': [
+            '..',
+          ],
+          'configurations': {
+            'Common_Base': {
+              'msvs_target_platform': 'x64',
+            },
+          },
+        },
       ],
     }],
   ],