Make the NaCl windows 64 bit binaries not depend on chrome targets.

chrome/common/chrome_content_client.cc

 // Copyright (c) 2011 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/common/chrome_content_client.h"
 
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "base/process_util.h"
 #include "base/string_number_conversions.h"
 #include "base/stringprintf.h"
 #include "base/string_split.h"
 #include "base/string_util.h"
 #include "base/win/windows_version.h"
 #include "chrome/common/child_process_logging.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/chrome_version_info.h"
+#include "chrome/common/render_messages.h"
 #include "content/common/pepper_plugin_registry.h"
 #include "remoting/client/plugin/pepper_entrypoints.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "webkit/glue/user_agent.h"
 #include "webkit/plugins/plugin_constants.h"
 
 #if defined(OS_WIN)
 #include "content/common/sandbox_policy.h"
 #include "sandbox/src/sandbox.h"
 #endif
 
-#if !defined(NACL_WIN64)  // The code this needs isn't linked on Win64 builds.
-#include "chrome/common/render_messages.h"
-#endif
-
 namespace {
 
 const char kPDFPluginName[] = "Chrome PDF Viewer";
 const char kPDFPluginMimeType[] = "application/pdf";
 const char kPDFPluginExtension[] = "pdf";
 const char kPDFPluginDescription[] = "Portable Document Format";
 const char kPDFPluginPrintPreviewMimeType
    [] = "application/x-google-chrome-print-preview-pdf";
 
 const char kNaClPluginName[] = "Native Client";
 const char kNaClPluginMimeType[] = "application/x-nacl";
 const char kNaClPluginExtension[] = "nexe";
 const char kNaClPluginDescription[] = "Native Client Executable";
 
 const char kNaClOldPluginName[] = "Chrome NaCl";
 
 #if defined(ENABLE_REMOTING)
 const char kRemotingViewerPluginName[] = "Remoting Viewer";
 const FilePath::CharType kRemotingViewerPluginPath[] =
     FILE_PATH_LITERAL("internal-remoting-viewer");
 // Use a consistent MIME-type regardless of branding.
 const char kRemotingViewerPluginMimeType[] =
     "application/vnd.chromium.remoting-viewer";
 // TODO(wez): Remove the old MIME-type once client code no longer needs it.
 const char kRemotingViewerPluginOldMimeType[] =
     "pepper-application/x-chromoting";
 #endif
 
-#if !defined(NACL_WIN64)  // The code this needs isn't linked on Win64 builds.
 // Appends the known built-in plugins to the given vector. Some built-in
 // plugins are "internal" which means they are compiled into the Chrome binary,
 // and some are extra shared libraries distributed with the browser (these are
 // not marked internal, aside from being automatically registered, they're just
 // regular plugins).
 void ComputeBuiltInPlugins(std::vector<PepperPluginInfo>* plugins) {
   // PDF.
   //
   // Once we're sandboxed, we can't know if the PDF plugin is available or not;
   // but (on Linux) this function is always called once before we're sandboxed.
@@ skipping 108 matching lines @@
                                           kFlashPluginSwfExtension,
                                           kFlashPluginSwfDescription);
   plugin.mime_types.push_back(swf_mime_type);
   webkit::WebPluginMimeType spl_mime_type(kFlashPluginSplMimeType,
                                           kFlashPluginSplExtension,
                                           kFlashPluginSplDescription);
   plugin.mime_types.push_back(spl_mime_type);
   plugins->push_back(plugin);
 }
 
-#endif  // !defined(NACL_WIN64)
-
 #if defined(OS_WIN)
 // Launches the privileged flash broker, used when flash is sandboxed.
 // The broker is the same flash dll, except that it uses a different
 // entrypoint (BrokerMain) and it is hosted in windows' generic surrogate
 // process rundll32. After launching the broker we need to pass to
 // the flash plugin the process id of the broker via the command line
 // using --flash-broker=pid.
 // More info about rundll32 at http://support.microsoft.com/kb/164787.
 bool LoadFlashBroker(const FilePath& plugin_path, CommandLine* cmd_line) {
   FilePath rundll;
@@ skipping 64 matching lines @@
 void ChromeContentClient::SetActiveURL(const GURL& url) {
   child_process_logging::SetActiveURL(url);
 }
 
 void ChromeContentClient::SetGpuInfo(const GPUInfo& gpu_info) {
   child_process_logging::SetGpuInfo(gpu_info);
 }
 
 void ChromeContentClient::AddPepperPlugins(
     std::vector<PepperPluginInfo>* plugins) {
-#if !defined(NACL_WIN64)  // The code this needs isn't linked on Win64 builds.
   ComputeBuiltInPlugins(plugins);
   AddOutOfProcessFlash(plugins);
-#endif
 }
 
 bool ChromeContentClient::CanSendWhileSwappedOut(const IPC::Message* msg) {
-#if !defined(NACL_WIN64)  // The code this needs isn't linked on Win64 builds.
   // Any Chrome-specific messages that must be allowed to be sent from swapped
   // out renderers.
   switch (msg->type()) {
     case ChromeViewHostMsg_DomOperationResponse::ID:
       return true;
     default:
       break;
   }
-#endif
   return false;
 }
 
 bool ChromeContentClient::CanHandleWhileSwappedOut(
     const IPC::Message& msg) {
-#if !defined(NACL_WIN64)  // The code this needs isn't linked on Win64 builds.
   // Any Chrome-specific messages (apart from those listed in
   // CanSendWhileSwappedOut) that must be handled by the browser when sent from
   // swapped out renderers.
   switch (msg.type()) {
     case ChromeViewHostMsg_Snapshot::ID:
       return true;
     default:
       break;
   }
-#endif
   return false;
 }
 
 std::string ChromeContentClient::GetUserAgent(bool mimic_windows) const {
   chrome::VersionInfo version_info;
   std::string product("Chrome/");
   product += version_info.is_valid() ? version_info.Version() : "0.0.0.0";
 
   return webkit_glue::BuildUserAgentHelper(mimic_windows, product);
 }
 
 string16 ChromeContentClient::GetLocalizedString(int message_id) const {
-#if defined(NACL_WIN64)  // The code this needs isn't linked on Win64 builds.
-  return string16();
-#else
   return l10n_util::GetStringUTF16(message_id);
-#endif
 }
 
 base::StringPiece ChromeContentClient::GetDataResource(int resource_id) const {
-#if defined(NACL_WIN64)  // The code this needs isn't linked on Win64 builds.
-  return base::StringPiece();
-#else
   return ResourceBundle::GetSharedInstance().GetRawDataResource(resource_id);
-#endif
 }
 
 #if defined(OS_WIN)
 bool ChromeContentClient::SandboxPlugin(CommandLine* command_line,
                                         sandbox::TargetPolicy* policy) {
   std::wstring plugin_dll = command_line->
       GetSwitchValueNative(switches::kPluginPath);
 
   FilePath builtin_flash;
   if (!PathService::Get(chrome::FILE_FLASH_PLUGIN, &builtin_flash))
@@ skipping 43 matching lines @@
     policy->SetJobLevel(sandbox::JOB_UNPROTECTED, 0);
     policy->SetTokenLevel(
         sandbox::USER_UNPROTECTED, sandbox::USER_UNPROTECTED);
   }
 
   return true;
 }
 #endif
 
 }  // namespace chrome