Take two at splitting result codes between content and chrome.

chrome/browser/first_run/first_run_import_observer.cc

Index: chrome/browser/first_run/first_run_import_observer.cc
diff --git a/chrome/browser/first_run/first_run_import_observer.cc b/chrome/browser/first_run/first_run_import_observer.cc
index b82205ca7b15cee898c03fa8bbd3e1095666db60..0e07390f2693fd55530be984394795458a08fe69 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();
 }