This change will split the result codes between content and chrome.

chrome/nacl/nacl_main.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 "build/build_config.h"
 
 #if defined(OS_WIN)
 #include <windows.h>
 #endif
 
 #include "base/command_line.h"
 #include "base/message_loop.h"
 #include "base/string_util.h"
 #include "base/system_monitor/system_monitor.h"
 #include "chrome/common/chrome_constants.h"
+#include "chrome/common/chrome_result_codes.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/logging_chrome.h"
 #include "chrome/nacl/nacl_launcher_thread.h"
 #include "chrome/nacl/nacl_main_platform_delegate.h"
 #include "content/common/child_process.h"
 #include "content/common/hi_res_timer_manager.h"
 #include "content/common/main_function_params.h"
-#include "content/common/result_codes.h"
 #include "content/common/sandbox_policy.h"
 
 #if defined(OS_WIN)
 #include "chrome/nacl/broker_thread.h"
 #include "sandbox/src/sandbox.h"
 #endif
 
 #ifdef _WIN64
 
 // main() routine for the NaCl broker process.
@@ skipping 34 matching lines @@
   {
     ChildProcess broker_process;
     broker_process.set_main_thread(new NaClBrokerThread());
     MessageLoop::current()->Run();
   }
 
   return 0;
 }
 #else
 int NaClBrokerMain(const MainFunctionParams& parameters) {
-  return ResultCodes::BAD_PROCESS_TYPE;
+  return chrome::RESULT_CODE_BAD_PROCESS_TYPE;
 }
 #endif  // _WIN64
 
 // This function provides some ways to test crash and assertion handling
 // behavior of the renderer.
 static void HandleNaClTestParameters(const CommandLine& command_line) {
   if (command_line.HasSwitch(switches::kNaClStartupDialog)) {
     ChildProcess::WaitForDebugger("NativeClient");
   }
 }
@@ skipping 39 matching lines @@
     // require waiting for a timeout.
     VLOG(1) << "Sandbox test failed: Not launching NaCl process";
   }
 #else
   NOTIMPLEMENTED() << " not implemented startup, plugin startup dialog etc.";
 #endif
 
   platform.PlatformUninitialize();
   return 0;
 }