Take two at splitting result codes between content and chrome.

chrome/app/dummy_main_functions.cc

Index: chrome/app/dummy_main_functions.cc
diff --git a/chrome/app/dummy_main_functions.cc b/chrome/app/dummy_main_functions.cc
index f3b4a61e1516d27e726579e33e3cafa2dad4afa5..4240564622295243aebeea8b926548b032ffcade 100644
--- a/chrome/app/dummy_main_functions.cc
+++ b/chrome/app/dummy_main_functions.cc
@@ -2,45 +2,45 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include "chrome/common/chrome_result_codes.h"
 #include "content/common/main_function_params.h"
-#include "content/common/result_codes.h"
 
 // Native Client binary for 64-bit Windows can run only the NaCl loader or
 // the sandbox broker processes. Other process types are not supported.
 int BrowserMain(const MainFunctionParams& parameters) {
-  return ResultCodes::BAD_PROCESS_TYPE;
+  return chrome::RESULT_CODE_BAD_PROCESS_TYPE;
 }
 
 int RendererMain(const MainFunctionParams& parameters) {
-  return ResultCodes::BAD_PROCESS_TYPE;
+  return chrome::RESULT_CODE_BAD_PROCESS_TYPE;
 }
 
 int PluginMain(const MainFunctionParams& parameters) {
-  return ResultCodes::BAD_PROCESS_TYPE;
+  return chrome::RESULT_CODE_BAD_PROCESS_TYPE;
 }
 
 int PpapiPluginMain(const MainFunctionParams& parameters) {
-  return ResultCodes::BAD_PROCESS_TYPE;
+  return chrome::RESULT_CODE_BAD_PROCESS_TYPE;
 }
 
 int PpapiBrokerMain(const MainFunctionParams& parameters) {
-  return ResultCodes::BAD_PROCESS_TYPE;
+  return chrome::RESULT_CODE_BAD_PROCESS_TYPE;
 }
 
 int WorkerMain(const MainFunctionParams& parameters) {
-  return ResultCodes::BAD_PROCESS_TYPE;
+  return chrome::RESULT_CODE_BAD_PROCESS_TYPE;
 }
 
 int UtilityMain(const MainFunctionParams& parameters) {
-  return ResultCodes::BAD_PROCESS_TYPE;
+  return chrome::RESULT_CODE_BAD_PROCESS_TYPE;
 }
 
 int ProfileImportMain(const MainFunctionParams& parameters) {
-  return ResultCodes::BAD_PROCESS_TYPE;
+  return chrome::RESULT_CODE_BAD_PROCESS_TYPE;
 }
 
 int ZygoteMain(const MainFunctionParams& parameters) {
-  return ResultCodes::BAD_PROCESS_TYPE;
+  return chrome::RESULT_CODE_BAD_PROCESS_TYPE;
 }
 
 int DiagnosticsMain(const CommandLine& command_line) {
@@ -48,9 +48,9 @@ int DiagnosticsMain(const CommandLine& command_line) {
 }
 
 int GpuMain(const MainFunctionParams&) {
-  return ResultCodes::BAD_PROCESS_TYPE;
+  return chrome::RESULT_CODE_BAD_PROCESS_TYPE;
 }
 
 int ServiceProcessMain(const MainFunctionParams& parameters) {
-  return ResultCodes::BAD_PROCESS_TYPE;
+  return chrome::RESULT_CODE_BAD_PROCESS_TYPE;
 }