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

chrome/browser/first_run/first_run_win.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/browser/first_run/first_run.h"
 
 #include <shlobj.h>
 #include <windows.h>
 
 #include <set>
@@ skipping 10 matching lines @@
 #include "base/win/windows_version.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_updater.h"
 #include "chrome/browser/first_run/first_run_import_observer.h"
 #include "chrome/browser/importer/importer_host.h"
 #include "chrome/browser/importer/importer_list.h"
 #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"
 #include "chrome/installer/util/google_update_constants.h"
 #include "chrome/installer/util/google_update_settings.h"
 #include "chrome/installer/util/install_util.h"
 #include "chrome/installer/util/shell_util.h"
 #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"
 #include "grit/locale_settings.h"
 #include "grit/theme_resources.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/ui_base_switches.h"
 
 namespace {
 
@@ skipping 124 matching lines @@
 // process has ended and what was the result of the operation as reported by
 // the process exit code. This class executes in the context of the main chrome
 // process.
 class ImportProcessRunner : public base::win::ObjectWatcher::Delegate {
  public:
   // The constructor takes the importer process to watch and then it does a
   // message loop blocking wait until the process ends. This object now owns
   // 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();
   }
   virtual ~ImportProcessRunner() {
     ::CloseHandle(import_process_);
   }
   // Returns the child process exit code. There are 2 expected values:
   // NORMAL_EXIT, or IMPORTER_HUNG.
   int exit_code() const { return exit_code_; }
 
@@ skipping 41 matching lines @@
   virtual void OnTick() {
     if (!import_process_)
       return;
     // We find the top active popup that we own, this will be either the
     // owner_window_ itself or the dialog window of the other process. In
     // both cases it is worth hung testing because both windows share the
     // same message queue and at some point the other window could be gone
     // 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;
     }
   }
 
   HWND owner_window_;
   base::ProcessHandle import_process_;
   WorkerThreadTicker ticker_;
   DISALLOW_COPY_AND_ASSIGN(HungImporterMonitor);
 };
 
@@ skipping 89 matching lines @@
   // We block inside the import_runner ctor, pumping messages until the
   // importer process ends. This can happen either by completing the import
   // or by hang_monitor killing it.
   ImportProcessRunner import_runner(import_process);
 
   // Import process finished. Reload the prefs, because importer may set
   // the pref value.
   if (profile)
     profile->GetPrefs()->ReloadPersistentPrefs();
 
-  return (import_runner.exit_code() == ResultCodes::NORMAL_EXIT);
+  return (import_runner.exit_code() == content::RESULT_CODE_NORMAL_EXIT);
 }
 
 // static
 bool FirstRun::ImportSettings(Profile* profile,
                               scoped_refptr<ImporterHost> importer_host,
                               scoped_refptr<ImporterList> importer_list,
                               int items_to_import) {
   return ImportSettings(
       profile,
       importer_list->GetSourceProfileAt(0).importer_type,
@@ skipping 34 matching lines @@
       parent_window,
       static_cast<uint16>(items_to_import),
       importer_host,
       &importer_observer,
       importer_list->GetSourceProfileForImporterType(importer_type),
       profile,
       true);
   importer_observer.RunLoop();
   return importer_observer.import_result();
 }