Reuse the eula terms from the chrome resources

- that outta reduce the fat that setup.exe gained
- this is the chrome side of the fix

BUG=8894

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

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

1 files changed, 13 insertions, 9 deletions

diff --git a/chrome/browser/browser_main.cc b/chrome/browser/browser_main.cc
index e0e4f74..4309f9d 100644
--- a/chrome/browser/browser_main.cc
+++ b/chrome/browser/browser_main.cc
@@ -269,15 +269,6 @@ int BrowserMain(const MainFunctionParams& parameters) {
       local_state->SetString(prefs::kApplicationLocale, install_lang);
     if (GoogleUpdateSettings::GetCollectStatsConsent())
       local_state->SetBoolean(prefs::kMetricsReportingEnabled, true);
-    // On first run, we  need to process the master preferences before the
-    // browser's profile_manager object is created.
-    first_run_ui_bypass =
-        !FirstRun::ProcessMasterPreferences(user_data_dir, FilePath(), NULL);
-
-    // If we are running in App mode, we do not want to show the importer
-    // (first run) UI.
-    if (!first_run_ui_bypass && parsed_command_line.HasSwitch(switches::kApp))
-      first_run_ui_bypass = true;
   }
 
   // If the local state file for the current profile doesn't exist and the
@@ -310,6 +301,19 @@ int BrowserMain(const MainFunctionParams& parameters) {
     ResourceBundle::GetSharedInstance().LoadThemeResources();
   }
 
+  if (is_first_run) {
+    // On first run, we  need to process the master preferences before the
+    // browser's profile_manager object is created, but after ResourceBundle
+    // is initialized.
+    first_run_ui_bypass =
+        !FirstRun::ProcessMasterPreferences(user_data_dir, FilePath(), NULL);
+
+    // If we are running in App mode, we do not want to show the importer
+    // (first run) UI.
+    if (!first_run_ui_bypass && parsed_command_line.HasSwitch(switches::kApp))
+      first_run_ui_bypass = true;
+  }
+
   if (!parsed_command_line.HasSwitch(switches::kNoErrorDialogs)) {
     // Display a warning if the user is running windows 2000.
     // TODO(port). We should probably change this to a "check for minimum