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

This adds a new file into chrome/common and does a lot of renaming.

The current version is just a sketch of the headers, and nothing will
compile.

R=jam@chromium.org
BUG=76699
TEST=everything still compiles and runs

Review URL: http://codereview.chromium.org/7377010

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

18 files changed, 57 insertions, 52 deletions

diff --git a/chrome/browser/browser_main.cc b/chrome/browser/browser_main.cc
index 78d5ab4..e8232d7 100644
--- a/chrome/browser/browser_main.cc
+++ b/chrome/browser/browser_main.cc
@@ -78,6 +78,7 @@
 #include "chrome/browser/web_resource/gpu_blacklist_updater.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_paths.h"
+#include "chrome/common/chrome_result_codes.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/chrome_version_info.h"
 #include "chrome/common/env_vars.h"
@@ -94,7 +95,6 @@
 #include "content/common/content_client.h"
 #include "content/common/hi_res_timer_manager.h"
 #include "content/common/main_function_params.h"
-#include "content/common/result_codes.h"
 #include "grit/app_locale_settings.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
@@ -1428,12 +1428,12 @@ int BrowserMain(const MainFunctionParams& parameters) {
     TryChromeDialogView::Result answer =
         TryChromeDialogView::Show(try_chrome_int, &process_singleton);
     if (answer == TryChromeDialogView::NOT_NOW)
-      return ResultCodes::NORMAL_EXIT_CANCEL;
+      return chrome::RESULT_CODE_NORMAL_EXIT_CANCEL;
     if (answer == TryChromeDialogView::UNINSTALL_CHROME)
-      return ResultCodes::NORMAL_EXIT_EXP2;
+      return chrome::RESULT_CODE_NORMAL_EXIT_EXP2;
 #else
     // We don't support retention experiments on Mac or Linux.
-    return ResultCodes::NORMAL_EXIT;
+    return content::RESULT_CODE_NORMAL_EXIT;
 #endif  // defined(OS_WIN)
   }
 
@@ -1564,7 +1564,8 @@ int BrowserMain(const MainFunctionParams& parameters) {
     return HandleIconsCommands(parsed_command_line);
   if (parsed_command_line.HasSwitch(switches::kMakeDefaultBrowser)) {
     return ShellIntegration::SetAsDefaultBrowser() ?
-        ResultCodes::NORMAL_EXIT : ResultCodes::SHELL_INTEGRATION_FAILED;
+        static_cast<int>(content::RESULT_CODE_NORMAL_EXIT) :
+        static_cast<int>(chrome::RESULT_CODE_SHELL_INTEGRATION_FAILED);
   }
 
   // If the command line specifies --pack-extension, attempt the pack extension
@@ -1572,9 +1573,9 @@ int BrowserMain(const MainFunctionParams& parameters) {
   if (parsed_command_line.HasSwitch(switches::kPackExtension)) {
     ExtensionsStartupUtil extension_startup_util;
     if (extension_startup_util.PackExtension(parsed_command_line)) {
-      return ResultCodes::NORMAL_EXIT;
+      return content::RESULT_CODE_NORMAL_EXIT;
     } else {
-      return ResultCodes::PACK_EXTENSION_ERROR;
+      return chrome::RESULT_CODE_PACK_EXTENSION_ERROR;
     }
   }
 
@@ -1600,10 +1601,10 @@ int BrowserMain(const MainFunctionParams& parameters) {
         printf("%s\n", base::SysWideToNativeMB(UTF16ToWide(
             l10n_util::GetStringUTF16(IDS_USED_EXISTING_BROWSER))).c_str());
 #endif
-        return ResultCodes::NORMAL_EXIT;
+        return content::RESULT_CODE_NORMAL_EXIT;
 
       case ProcessSingleton::PROFILE_IN_USE:
-        return ResultCodes::PROFILE_IN_USE;
+        return chrome::RESULT_CODE_PROFILE_IN_USE;
 
       case ProcessSingleton::LOCK_ERROR:
         LOG(ERROR) << "Failed to create a ProcessSingleton for your profile "
@@ -1611,7 +1612,7 @@ int BrowserMain(const MainFunctionParams& parameters) {
                       "would start multiple browser processes rather than "
                       "opening a new window in the existing process. Aborting "
                       "now to avoid profile corruption.";
-        return ResultCodes::PROFILE_IN_USE;
+        return chrome::RESULT_CODE_PROFILE_IN_USE;
 
       default:
         NOTREACHED();
@@ -1659,7 +1660,7 @@ int BrowserMain(const MainFunctionParams& parameters) {
 
   Profile* profile = CreateProfile(parameters, user_data_dir);
   if (!profile)
-    return ResultCodes::NORMAL_EXIT;
+    return content::RESULT_CODE_NORMAL_EXIT;
 
   // Post-profile init ---------------------------------------------------------
 
@@ -1701,7 +1702,7 @@ int BrowserMain(const MainFunctionParams& parameters) {
 #if defined(OS_WIN)
   // Do the tasks if chrome has been upgraded while it was last running.
   if (!already_running && upgrade_util::DoUpgradeTasks(parsed_command_line))
-    return ResultCodes::NORMAL_EXIT;
+    return content::RESULT_CODE_NORMAL_EXIT;
 #endif
 
   // Check if there is any machine level Chrome installed on the current
@@ -1714,7 +1715,7 @@ int BrowserMain(const MainFunctionParams& parameters) {
   // Do not allow this to occur for Chrome Frame user-to-system handoffs.
   if (!parsed_command_line.HasSwitch(switches::kChromeFrame) &&
       CheckMachineLevelInstall())
-    return ResultCodes::MACHINE_LEVEL_INSTALL_EXISTS;
+    return chrome::RESULT_CODE_MACHINE_LEVEL_INSTALL_EXISTS;
 
   // Create the TranslateManager singleton.
   TranslateManager* translate_manager = TranslateManager::GetInstance();
@@ -1727,7 +1728,7 @@ int BrowserMain(const MainFunctionParams& parameters) {
     if (MaybeInstallFromDiskImage()) {
       // The application was installed and the installed copy has been
       // launched.  This process is now obsolete.  Exit.
-      return ResultCodes::NORMAL_EXIT;
+      return content::RESULT_CODE_NORMAL_EXIT;
     }
   }
 #endif
@@ -1919,9 +1920,9 @@ int BrowserMain(const MainFunctionParams& parameters) {
   if (parsed_command_line.HasSwitch(switches::kUninstallExtension)) {
     ExtensionsStartupUtil ext_startup_util;
     if (ext_startup_util.UninstallExtension(parsed_command_line, profile)) {
-      return ResultCodes::NORMAL_EXIT;
+      return content::RESULT_CODE_NORMAL_EXIT;
     } else {
-      return ResultCodes::UNINSTALL_EXTENSION_ERROR;
+      return chrome::RESULT_CODE_UNINSTALL_EXTENSION_ERROR;
     }
   }
 
@@ -1966,7 +1967,7 @@ int BrowserMain(const MainFunctionParams& parameters) {
   // Start watching all browser threads for responsiveness.
   ThreadWatcherList::StartWatchingAll(parsed_command_line);
 
-  int result_code = ResultCodes::NORMAL_EXIT;
+  int result_code = content::RESULT_CODE_NORMAL_EXIT;
   if (parameters.ui_task) {
     // We are in test mode. Run one task and enter the main message loop.
     if (pool)
diff --git a/chrome/browser/browser_main_gtk.cc b/chrome/browser/browser_main_gtk.cc
index 3701a57..98480e0 100644
--- a/chrome/browser/browser_main_gtk.cc
+++ b/chrome/browser/browser_main_gtk.cc
@@ -15,9 +15,9 @@
 #include "chrome/browser/metrics/metrics_service.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/common/chrome_switches.h"
+#include "chrome/common/chrome_result_codes.h"
 #include "content/browser/renderer_host/render_sandbox_host_linux.h"
 #include "content/browser/zygote_host_linux.h"
-#include "content/common/result_codes.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
@@ -186,7 +186,7 @@ void RecordBrowserStartupTime() {
 // From browser_main_win.h, stubs until we figure out the right thing...
 
 int DoUninstallTasks(bool chrome_still_running) {
-  return ResultCodes::NORMAL_EXIT;
+  return content::RESULT_CODE_NORMAL_EXIT;
 }
 
 int HandleIconsCommands(const CommandLine &parsed_command_line) {
diff --git a/chrome/browser/browser_main_mac.mm b/chrome/browser/browser_main_mac.mm
index c5e9ab5..4e91371 100644
--- a/chrome/browser/browser_main_mac.mm
+++ b/chrome/browser/browser_main_mac.mm
@@ -48,7 +48,7 @@ void WarnAboutMinimumSystemRequirements() {
 // From browser_main_win.h, stubs until we figure out the right thing...
 
 int DoUninstallTasks(bool chrome_still_running) {
-  return ResultCodes::NORMAL_EXIT;
+  return content::RESULT_CODE_NORMAL_EXIT;
 }
 
 int HandleIconsCommands(const CommandLine& parsed_command_line) {
diff --git a/chrome/browser/browser_main_win.cc b/chrome/browser/browser_main_win.cc
index 3611b21..0f52bea 100644
--- a/chrome/browser/browser_main_win.cc
+++ b/chrome/browser/browser_main_win.cc
@@ -25,6 +25,7 @@
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/views/uninstall_view.h"
 #include "chrome/common/chrome_constants.h"
+#include "chrome/common/chrome_result_codes.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/env_vars.h"
 #include "chrome/installer/util/browser_distribution.h"
@@ -32,7 +33,6 @@
 #include "chrome/installer/util/install_util.h"
 #include "chrome/installer/util/shell_util.h"
 #include "content/common/main_function_params.h"
-#include "content/common/result_codes.h"
 #include "crypto/nss_util.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
@@ -99,7 +99,7 @@ void RecordBrowserStartupTime() {
 }
 
 int AskForUninstallConfirmation() {
-  int ret = ResultCodes::NORMAL_EXIT;
+  int ret = content::RESULT_CODE_NORMAL_EXIT;
   views::Widget::CreateWindow(new UninstallView(ret))->Show();
   views::AcceleratorHandler accelerator_handler;
   MessageLoopForUI::current()->Run(&accelerator_handler);
@@ -120,15 +120,15 @@ int DoUninstallTasks(bool chrome_still_running) {
   // check once again after user acknowledges Uninstall dialog.
   if (chrome_still_running) {
     ShowCloseBrowserFirstMessageBox();
-    return ResultCodes::UNINSTALL_CHROME_ALIVE;
+    return chrome::RESULT_CODE_UNINSTALL_CHROME_ALIVE;
   }
   int ret = AskForUninstallConfirmation();
   if (browser_util::IsBrowserAlreadyRunning()) {
     ShowCloseBrowserFirstMessageBox();
-    return ResultCodes::UNINSTALL_CHROME_ALIVE;
+    return chrome::RESULT_CODE_UNINSTALL_CHROME_ALIVE;
   }
 
-  if (ret != ResultCodes::UNINSTALL_USER_CANCEL) {
+  if (ret != chrome::RESULT_CODE_UNINSTALL_USER_CANCEL) {
     // The following actions are just best effort.
     VLOG(1) << "Executing uninstall actions";
     if (!FirstRun::RemoveSentinel())
@@ -225,7 +225,7 @@ int HandleIconsCommands(const CommandLine& parsed_command_line) {
     } else if (version >= base::win::VERSION_XP) {
       cp_applet.assign(L"Add/Remove Programs");  // Windows XP.
     } else {
-      return ResultCodes::UNSUPPORTED_PARAM;  // Not supported
+      return chrome::RESULT_CODE_UNSUPPORTED_PARAM;  // Not supported
     }
 
     const string16 msg =
@@ -234,10 +234,12 @@ int HandleIconsCommands(const CommandLine& parsed_command_line) {
     const UINT flags = MB_OKCANCEL | MB_ICONWARNING | MB_TOPMOST;
     if (IDOK == ui::MessageBox(NULL, msg, caption, flags))
       ShellExecute(NULL, NULL, L"appwiz.cpl", NULL, NULL, SW_SHOWNORMAL);
-    return ResultCodes::NORMAL_EXIT;  // Exit as we are not launching browser.
+
+    // Exit as we are not launching the browser.
+    return content::RESULT_CODE_NORMAL_EXIT;
   }
   // We don't hide icons so we shouldn't do anything special to show them
-  return ResultCodes::UNSUPPORTED_PARAM;
+  return chrome::RESULT_CODE_UNSUPPORTED_PARAM;
 }
 
 // Check if there is any machine level Chrome installed on the current
diff --git a/chrome/browser/extensions/extension_crash_recovery_browsertest.cc b/chrome/browser/extensions/extension_crash_recovery_browsertest.cc
index b6e9db1..c325afa 100644
--- a/chrome/browser/extensions/extension_crash_recovery_browsertest.cc
+++ b/chrome/browser/extensions/extension_crash_recovery_browsertest.cc
@@ -73,7 +73,8 @@ class ExtensionCrashRecoveryTest : public ExtensionBrowserTest {
 
     RenderProcessHost* extension_rph =
         extension_host->render_view_host()->process();
-    base::KillProcess(extension_rph->GetHandle(), ResultCodes::KILLED, false);
+    base::KillProcess(extension_rph->GetHandle(), content::RESULT_CODE_KILLED,
+                      false);
     ASSERT_TRUE(WaitForExtensionCrash(extension_id));
     ASSERT_FALSE(
         GetExtensionProcessManager()->GetBackgroundHostForExtension(extension));
diff --git a/chrome/browser/extensions/extension_function.cc b/chrome/browser/extensions/extension_function.cc
index 5b814fd..0374dd0 100644
--- a/chrome/browser/extensions/extension_function.cc
+++ b/chrome/browser/extensions/extension_function.cc
@@ -112,7 +112,8 @@ void ExtensionFunction::HandleBadMessage(base::ProcessHandle process) {
     NOTREACHED();
     UserMetrics::RecordAction(UserMetricsAction("BadMessageTerminate_EFD"));
     if (process)
-      base::KillProcess(process, ResultCodes::KILLED_BAD_MESSAGE, false);
+      base::KillProcess(process, content::RESULT_CODE_KILLED_BAD_MESSAGE,
+                        false);
   }
 }
 UIThreadExtensionFunction::UIThreadExtensionFunction()
diff --git a/chrome/browser/first_run/first_run_import_observer.cc b/chrome/browser/first_run/first_run_import_observer.cc
index b82205c..0e07390 100644
--- a/chrome/browser/first_run/first_run_import_observer.cc
+++ b/chrome/browser/first_run/first_run_import_observer.cc
@@ -8,7 +8,7 @@
 #include "content/common/result_codes.h"
 
 FirstRunImportObserver::FirstRunImportObserver()
-    : loop_running_(false), import_result_(ResultCodes::NORMAL_EXIT) {
+    : loop_running_(false), import_result_(content::RESULT_CODE_NORMAL_EXIT) {
 }
 
 FirstRunImportObserver::~FirstRunImportObserver() {
@@ -25,6 +25,6 @@ void FirstRunImportObserver::Finish() {
 }
 
 void FirstRunImportObserver::ImportCompleted() {
-  import_result_ = ResultCodes::NORMAL_EXIT;
+  import_result_ = content::RESULT_CODE_NORMAL_EXIT;
   Finish();
 }
diff --git a/chrome/browser/first_run/first_run_win.cc b/chrome/browser/first_run/first_run_win.cc
index 2a62ad7..d4c91ceb 100644
--- a/chrome/browser/first_run/first_run_win.cc
+++ b/chrome/browser/first_run/first_run_win.cc
@@ -28,6 +28,7 @@
 #include "chrome/browser/importer/importer_progress_dialog.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/chrome_notification_types.h"
+#include "chrome/common/chrome_result_codes.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/worker_thread_ticker.h"
 #include "chrome/installer/util/browser_distribution.h"
@@ -38,7 +39,6 @@
 #include "chrome/installer/util/util_constants.h"
 #include "content/browser/user_metrics.h"
 #include "content/common/notification_service.h"
-#include "content/common/result_codes.h"
 #include "google_update_idl.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
@@ -184,7 +184,7 @@ class ImportProcessRunner : public base::win::ObjectWatcher::Delegate {
   // the import_process handle.
   explicit ImportProcessRunner(base::ProcessHandle import_process)
       : import_process_(import_process),
-        exit_code_(ResultCodes::NORMAL_EXIT) {
+        exit_code_(content::RESULT_CODE_NORMAL_EXIT) {
     watcher_.StartWatching(import_process, this);
     MessageLoop::current()->Run();
   }
@@ -246,7 +246,7 @@ class HungImporterMonitor : public WorkerThreadTicker::Callback {
     // while the other process still not pumping messages.
     HWND active_window = ::GetLastActivePopup(owner_window_);
     if (::IsHungAppWindow(active_window) || ::IsHungAppWindow(owner_window_)) {
-      ::TerminateProcess(import_process_, ResultCodes::IMPORTER_HUNG);
+      ::TerminateProcess(import_process_, chrome::RESULT_CODE_IMPORTER_HUNG);
       import_process_ = NULL;
     }
   }
@@ -356,7 +356,7 @@ bool FirstRun::ImportSettings(Profile* profile,
   if (profile)
     profile->GetPrefs()->ReloadPersistentPrefs();
 
-  return (import_runner.exit_code() == ResultCodes::NORMAL_EXIT);
+  return (import_runner.exit_code() == content::RESULT_CODE_NORMAL_EXIT);
 }
 
 // static
diff --git a/chrome/browser/hang_monitor/hung_window_detector.cc b/chrome/browser/hang_monitor/hung_window_detector.cc
index 39bedc6..035f270 100644
--- a/chrome/browser/hang_monitor/hung_window_detector.cc
+++ b/chrome/browser/hang_monitor/hung_window_detector.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+// 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.
 
@@ -148,7 +148,7 @@ bool HungWindowDetector::CheckChildWindow(HWND child_window) {
           if (process_id_check !=  child_window_process_id) {
             break;
           }
-          TerminateProcess(child_process, ResultCodes::HUNG);
+          TerminateProcess(child_process, content::RESULT_CODE_HUNG);
           WaitForSingleObject(child_process, kTerminateTimeout);
           child_process.Close();
           break;
diff --git a/chrome/browser/process_singleton_win.cc b/chrome/browser/process_singleton_win.cc
index b21610e..49a245a 100644
--- a/chrome/browser/process_singleton_win.cc
+++ b/chrome/browser/process_singleton_win.cc
@@ -155,7 +155,7 @@ ProcessSingleton::NotifyResult ProcessSingleton::NotifyOtherProcess() {
   }
 
   // Time to take action. Kill the browser process.
-  base::KillProcessById(process_id, ResultCodes::HUNG, true);
+  base::KillProcessById(process_id, content::RESULT_CODE_HUNG, true);
   remote_window_ = NULL;
   return PROCESS_NONE;
 }
diff --git a/chrome/browser/renderer_host/web_cache_manager_browsertest.cc b/chrome/browser/renderer_host/web_cache_manager_browsertest.cc
index b2e8471..235dc3d 100644
--- a/chrome/browser/renderer_host/web_cache_manager_browsertest.cc
+++ b/chrome/browser/renderer_host/web_cache_manager_browsertest.cc
@@ -34,7 +34,7 @@ IN_PROC_BROWSER_TEST_F(WebCacheManagerBrowserTest, DISABLED_CrashOnceOnly) {
   TabContents* tab = browser()->GetTabContentsAt(0);
   ASSERT_TRUE(tab != NULL);
   base::KillProcess(tab->GetRenderProcessHost()->GetHandle(),
-                    ResultCodes::KILLED, true);
+                    content::RESULT_CODE_KILLED, true);
 
   browser()->ActivateTabAt(0, true);
   browser()->NewTab();
diff --git a/chrome/browser/task_manager/task_manager.cc b/chrome/browser/task_manager/task_manager.cc
index 0e64113dd..0f2703b 100644
--- a/chrome/browser/task_manager/task_manager.cc
+++ b/chrome/browser/task_manager/task_manager.cc
@@ -957,7 +957,7 @@ void TaskManager::KillProcess(int index) {
   base::ProcessHandle process = model_->GetResourceProcessHandle(index);
   DCHECK(process);
   if (process != base::GetCurrentProcessHandle())
-    base::KillProcess(process, ResultCodes::KILLED, false);
+    base::KillProcess(process, content::RESULT_CODE_KILLED, false);
 }
 
 void TaskManager::ActivateProcess(int index) {
diff --git a/chrome/browser/ui/browser_init.cc b/chrome/browser/ui/browser_init.cc
index fd6bbd5..1060eb5 100644
--- a/chrome/browser/ui/browser_init.cc
+++ b/chrome/browser/ui/browser_init.cc
@@ -54,6 +54,7 @@
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_paths.h"
+#include "chrome/common/chrome_result_codes.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/extensions/extension_constants.h"
 #include "chrome/common/pref_names.h"
@@ -64,7 +65,6 @@
 #include "content/browser/renderer_host/render_process_host.h"
 #include "content/browser/tab_contents/navigation_details.h"
 #include "content/browser/tab_contents/tab_contents_view.h"
-#include "content/common/result_codes.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
@@ -550,7 +550,7 @@ bool BrowserInit::LaunchBrowser(const CommandLine& command_line,
   if (!launched) {
     LOG(ERROR) << "launch error";
     if (return_code)
-      *return_code = ResultCodes::INVALID_CMDLINE_URL;
+      *return_code = chrome::RESULT_CODE_INVALID_CMDLINE_URL;
     return false;
   }
 
diff --git a/chrome/browser/ui/browser_list.cc b/chrome/browser/ui/browser_list.cc
index 48a5d1b..ac7aa30 100644
--- a/chrome/browser/ui/browser_list.cc
+++ b/chrome/browser/ui/browser_list.cc
@@ -538,9 +538,9 @@ void BrowserList::SessionEnding() {
 #if defined(OS_WIN)
   // At this point the message loop is still running yet we've shut everything
   // down. If any messages are processed we'll likely crash. Exit now.
-  ExitProcess(ResultCodes::NORMAL_EXIT);
+  ExitProcess(content::RESULT_CODE_NORMAL_EXIT);
 #elif defined(OS_POSIX) && !defined(OS_MACOSX)
-  _exit(ResultCodes::NORMAL_EXIT);
+  _exit(content::RESULT_CODE_NORMAL_EXIT);
 #else
   NOTIMPLEMENTED();
 #endif
diff --git a/chrome/browser/ui/cocoa/hung_renderer_controller.mm b/chrome/browser/ui/cocoa/hung_renderer_controller.mm
index bbd0a60..f8dc950 100644
--- a/chrome/browser/ui/cocoa/hung_renderer_controller.mm
+++ b/chrome/browser/ui/cocoa/hung_renderer_controller.mm
@@ -86,7 +86,7 @@ HungRendererController* g_instance = NULL;
 - (IBAction)kill:(id)sender {
   if (hungContents_)
     base::KillProcess(hungContents_->GetRenderProcessHost()->GetHandle(),
-                      ResultCodes::HUNG, false);
+                      content::RESULT_CODE_HUNG, false);
   // Cannot call performClose:, because the close button is disabled.
   [self close];
 }
diff --git a/chrome/browser/ui/gtk/hung_renderer_dialog_gtk.cc b/chrome/browser/ui/gtk/hung_renderer_dialog_gtk.cc
index e4eecde..a8d9910 100644
--- a/chrome/browser/ui/gtk/hung_renderer_dialog_gtk.cc
+++ b/chrome/browser/ui/gtk/hung_renderer_dialog_gtk.cc
@@ -194,7 +194,7 @@ void HungRendererDialogGtk::OnResponse(GtkWidget* dialog, int response_id) {
       // Kill the process.
       if (contents_ && contents_->GetRenderProcessHost()) {
         base::KillProcess(contents_->GetRenderProcessHost()->GetHandle(),
-                          ResultCodes::HUNG, false);
+                          content::RESULT_CODE_HUNG, false);
       }
       break;
 
diff --git a/chrome/browser/ui/views/hung_renderer_view.cc b/chrome/browser/ui/views/hung_renderer_view.cc
index 117e86c..0a55287 100644
--- a/chrome/browser/ui/views/hung_renderer_view.cc
+++ b/chrome/browser/ui/views/hung_renderer_view.cc
@@ -339,7 +339,7 @@ void HungRendererDialogView::ButtonPressed(
     if (contents_ && contents_->GetRenderProcessHost()) {
       // Kill the process.
       TerminateProcess(contents_->GetRenderProcessHost()->GetHandle(),
-                       ResultCodes::HUNG);
+                       content::RESULT_CODE_HUNG);
     }
   }
 }
diff --git a/chrome/browser/ui/views/uninstall_view.cc b/chrome/browser/ui/views/uninstall_view.cc
index f0a9928..1e80a3b 100644
--- a/chrome/browser/ui/views/uninstall_view.cc
+++ b/chrome/browser/ui/views/uninstall_view.cc
@@ -9,9 +9,9 @@
 #include "base/string16.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/shell_integration.h"
+#include "chrome/common/chrome_result_codes.h"
 #include "chrome/installer/util/browser_distribution.h"
 #include "chrome/installer/util/shell_util.h"
-#include "content/common/result_codes.h"
 #include "grit/chromium_strings.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "views/controls/button/checkbox.h"
@@ -97,9 +97,9 @@ void UninstallView::SetupControls() {
 }
 
 bool UninstallView::Accept() {
-  user_selection_ = ResultCodes::NORMAL_EXIT;
+  user_selection_ = content::RESULT_CODE_NORMAL_EXIT;
   if (delete_profile_->checked())
-    user_selection_ = ResultCodes::UNINSTALL_DELETE_PROFILE;
+    user_selection_ = chrome::RESULT_CODE_UNINSTALL_DELETE_PROFILE;
   if (change_default_browser_ && change_default_browser_->checked()) {
     int index = browsers_combo_->selected_item();
     BrowsersMap::const_iterator it = browsers_->begin();
@@ -110,7 +110,7 @@ bool UninstallView::Accept() {
 }
 
 bool UninstallView::Cancel() {
-  user_selection_ = ResultCodes::UNINSTALL_USER_CANCEL;
+  user_selection_ = chrome::RESULT_CODE_UNINSTALL_USER_CANCEL;
   return true;
 }