Take two at splitting result codes between content and chrome.

content/common/result_codes.h contains only the codes defined in content. chrome/common/chrome_result_codes.h contains the codes defined in chrome and also includes (for convenience) the content header.

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

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

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

8 files changed, 12 insertions, 10 deletions

diff --git a/content/browser/browser_message_filter.cc b/content/browser/browser_message_filter.cc
index d141c5b..7d1c240 100644
--- a/content/browser/browser_message_filter.cc
+++ b/content/browser/browser_message_filter.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 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.
 
@@ -92,7 +92,8 @@ bool BrowserMessageFilter::DispatchMessage(const IPC::Message& message) {
 }
 
 void BrowserMessageFilter::BadMessageReceived() {
-  base::KillProcess(peer_handle(), ResultCodes::KILLED_BAD_MESSAGE, false);
+  base::KillProcess(peer_handle(), content::RESULT_CODE_KILLED_BAD_MESSAGE,
+                    false);
 }
 
 bool BrowserMessageFilter::CheckCanDispatchOnUI(const IPC::Message& message,
diff --git a/content/browser/child_process_launcher.cc b/content/browser/child_process_launcher.cc
index 7bada19..79d5429 100644
--- a/content/browser/child_process_launcher.cc
+++ b/content/browser/child_process_launcher.cc
@@ -269,7 +269,7 @@ class ChildProcessLauncher::Context
     base::Process process(handle);
      // Client has gone away, so just kill the process.  Using exit code 0
     // means that UMA won't treat this as a crash.
-    process.Terminate(ResultCodes::NORMAL_EXIT);
+    process.Terminate(content::RESULT_CODE_NORMAL_EXIT);
     // On POSIX, we must additionally reap the child.
 #if defined(OS_POSIX)
 #if !defined(OS_MACOSX)
diff --git a/content/browser/child_process_security_policy_browsertest.cc b/content/browser/child_process_security_policy_browsertest.cc
index 14d4b80..91bb58e 100644
--- a/content/browser/child_process_security_policy_browsertest.cc
+++ b/content/browser/child_process_security_policy_browsertest.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 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.
 
@@ -44,7 +44,7 @@ IN_PROC_BROWSER_TEST_F(ChildProcessSecurityPolicyInProcessBrowserTest, NoLeak) {
   TabContents* tab = browser()->GetTabContentsAt(0);
   ASSERT_TRUE(tab != NULL);
   base::KillProcess(tab->GetRenderProcessHost()->GetHandle(),
-                    ResultCodes::KILLED, true);
+                    content::RESULT_CODE_KILLED, true);
 
   tab->controller().Reload(true);
   EXPECT_EQ(
diff --git a/content/browser/handle_enumerator_win.cc b/content/browser/handle_enumerator_win.cc
index f16e491..0d5ba51 100644
--- a/content/browser/handle_enumerator_win.cc
+++ b/content/browser/handle_enumerator_win.cc
@@ -156,7 +156,7 @@ void HandleEnumerator::FindProcessOnUIThread() {
 void HandleEnumerator::EnumerateHandlesAndTerminateProcess() {
   HandleEnumerator::EnumerateHandles();
   base::Process process(handle_);
-  process.Terminate(ResultCodes::NORMAL_EXIT);
+  process.Terminate(content::RESULT_CODE_NORMAL_EXIT);
   process.Close();
 }
 
diff --git a/content/browser/renderer_host/browser_render_process_host.cc b/content/browser/renderer_host/browser_render_process_host.cc
index 2de3765..123eb22 100644
--- a/content/browser/renderer_host/browser_render_process_host.cc
+++ b/content/browser/renderer_host/browser_render_process_host.cc
@@ -441,7 +441,8 @@ void BrowserRenderProcessHost::ReceivedBadMessage() {
     CHECK(false);
   }
   NOTREACHED();
-  base::KillProcess(GetHandle(), ResultCodes::KILLED_BAD_MESSAGE, false);
+  base::KillProcess(GetHandle(), content::RESULT_CODE_KILLED_BAD_MESSAGE,
+                    false);
 }
 
 void BrowserRenderProcessHost::WidgetRestored() {
diff --git a/content/browser/worker_host/worker_process_host.cc b/content/browser/worker_host/worker_process_host.cc
index 59fdcee8..d6e559c 100644
--- a/content/browser/worker_host/worker_process_host.cc
+++ b/content/browser/worker_host/worker_process_host.cc
@@ -316,7 +316,7 @@ bool WorkerProcessHost::OnMessageReceived(const IPC::Message& message) {
   if (!msg_is_ok) {
     NOTREACHED();
     UserMetrics::RecordAction(UserMetricsAction("BadMessageTerminate_WPH"));
-    base::KillProcess(handle(), ResultCodes::KILLED_BAD_MESSAGE, false);
+    base::KillProcess(handle(), content::RESULT_CODE_KILLED_BAD_MESSAGE, false);
   }
 
   if (handled)
diff --git a/content/browser/zygote_host_linux.cc b/content/browser/zygote_host_linux.cc
index fc9a520..7917e34 100644
--- a/content/browser/zygote_host_linux.cc
+++ b/content/browser/zygote_host_linux.cc
@@ -337,7 +337,7 @@ base::TerminationStatus ZygoteHost::GetTerminationStatus(
 
   // Set this now to handle the early termination cases.
   if (exit_code)
-    *exit_code = ResultCodes::NORMAL_EXIT;
+    *exit_code = content::RESULT_CODE_NORMAL_EXIT;
 
   static const unsigned kMaxMessageLength = 128;
   char buf[kMaxMessageLength];
diff --git a/content/browser/zygote_main_linux.cc b/content/browser/zygote_main_linux.cc
index 95b3975..4391807 100644
--- a/content/browser/zygote_main_linux.cc
+++ b/content/browser/zygote_main_linux.cc
@@ -235,7 +235,7 @@ class Zygote {
       // Assume that if we can't find the child in the sandbox, then
       // it terminated normally.
       status = base::TERMINATION_STATUS_NORMAL_TERMINATION;
-      exit_code = ResultCodes::NORMAL_EXIT;
+      exit_code = content::RESULT_CODE_NORMAL_EXIT;
     }
 
     Pickle write_pickle;