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

chrome/installer/util/google_chrome_distribution.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.
 //
 // This file defines specific implementation of BrowserDistribution class for
 // Google Chrome.
 
 #include "chrome/installer/util/google_chrome_distribution.h"
 
 #include <windows.h>
 #include <wtsapi32.h>
 #include <msi.h>
 #include <sddl.h>
 
 #include "base/command_line.h"
 #include "base/file_path.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/path_service.h"
 #include "base/rand_util.h"
 #include "base/string_split.h"
 #include "base/string_number_conversions.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "base/win/registry.h"
 #include "base/win/windows_version.h"
 #include "chrome/common/attrition_experiments.h"
+#include "chrome/common/chrome_result_codes.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/installer/util/channel_info.h"
 #include "chrome/installer/util/product.h"
 #include "chrome/installer/util/install_util.h"
 #include "chrome/installer/util/l10n_string_util.h"
 #include "chrome/installer/util/google_update_constants.h"
 #include "chrome/installer/util/google_update_settings.h"
 #include "chrome/installer/util/helper.h"
 #include "chrome/installer/util/util_constants.h"
 #include "chrome/installer/util/wmi.h"
 #include "content/common/json_value_serializer.h"
-#include "content/common/result_codes.h"
 
 #include "installer_util_strings.h"  // NOLINT
 
 #pragma comment(lib, "wtsapi32.lib")
 
 namespace {
 
 const wchar_t kChromeGuid[] = L"{8A69D345-D564-463c-AFF1-A69D9E530F96}";
 const wchar_t kBrowserAppId[] = L"Chrome";
 
@@ skipping 719 matching lines @@
         options.command_line_string().find(L" -- " + url));
   }
   // Launch chrome now. It will show the toast UI.
   int32 exit_code = 0;
   if (!installation.LaunchChromeAndWait(application_path, options, &exit_code))
     return;
 
   // The chrome process has exited, figure out what happened.
   const wchar_t* outcome = NULL;
   switch (exit_code) {
-    case ResultCodes::NORMAL_EXIT:
+    case content::RESULT_CODE_NORMAL_EXIT:
       outcome = kToastExpTriesOkGroup;
       break;
-    case ResultCodes::NORMAL_EXIT_CANCEL:
+    case chrome::RESULT_CODE_NORMAL_EXIT_CANCEL:
       outcome = kToastExpCancelGroup;
       break;
-    case ResultCodes::NORMAL_EXIT_EXP2:
+    case chrome::RESULT_CODE_NORMAL_EXIT_EXP2:
       outcome = kToastExpUninstallGroup;
       break;
     default:
       outcome = kToastExpTriesErrorGroup;
   };
 
   // Write to the |client| key for the last time.
   SetClient(experiment_group + outcome, true);
 
   if (outcome != kToastExpUninstallGroup)
     return;
 
   // The user wants to uninstall. This is a best effort operation. Note that
   // we waited for chrome to exit so the uninstall would not detect chrome
   // running.
   bool system_level_toast = CommandLine::ForCurrentProcess()->HasSwitch(
       installer::switches::kSystemLevelToast);
 
   CommandLine cmd(InstallUtil::GetChromeUninstallCmd(system_level_toast,
                                                      GetType()));
   base::LaunchApp(cmd, false, false, NULL);
 }
 #endif