Load EULA from resources only on UI thread for Chrome OS

BUG=chromium-os:13838
TEST=manual

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

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

1 files changed, 7 insertions, 3 deletions

diff --git a/chrome/browser/browser_about_handler.cc b/chrome/browser/browser_about_handler.cc
index 2b12494..958fe56 100644
--- a/chrome/browser/browser_about_handler.cc
+++ b/chrome/browser/browser_about_handler.cc
@@ -293,9 +293,9 @@ class ChromeOSTermsHandler
       // No EULA for given language - try en-US as default.
       path = StringPrintf(kEULAPathFormat, "en-US");
       if (!file_util::ReadFileToString(FilePath(path), &contents_)) {
-        // Last resort use EULA from resources.
-        contents_ = ResourceBundle::GetSharedInstance().GetRawDataResource(
-            IDR_TERMS_HTML).as_string();
+        // File with EULA not found, ResponseOnUIThread will load EULA from
+        // resources if contents_ is empty.
+        contents_.clear();
       }
     }
     BrowserThread::PostTask(
@@ -305,6 +305,10 @@ class ChromeOSTermsHandler
 
   void ResponseOnUIThread() {
     DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+    if (contents_.empty()) {
+      contents_ = ResourceBundle::GetSharedInstance().GetRawDataResource(
+          IDR_TERMS_HTML).as_string();
+    }
     source_->FinishDataRequest(contents_, request_id_);
   }