diff options
| author | finnur@chromium.org <finnur@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-08 13:28:31 +0000 |
|---|---|---|
| committer | finnur@chromium.org <finnur@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-08 13:28:31 +0000 |
| commit | 645b929b9d7af38965320089e453bc3c44823781 (patch) | |
| tree | 00f845c349b0c2a30ed75507c17df9c369fedf94 | |
| parent | ef98734057347d0baea73855339ba2441e7c59f9 (diff) | |
| download | chromium_src-645b929b9d7af38965320089e453bc3c44823781.zip chromium_src-645b929b9d7af38965320089e453bc3c44823781.tar.gz chromium_src-645b929b9d7af38965320089e453bc3c44823781.tar.bz2 | |
Adding ScopedAllowIO to GetRlzParameterValue() while we evaluate wether the access to IO is ok here.
TBR=jochen
BUG=62337
TEST=None
Review URL: http://codereview.chromium.org/4686001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@65371 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/search_engines/search_terms_data.cc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/chrome/browser/search_engines/search_terms_data.cc b/chrome/browser/search_engines/search_terms_data.cc index d3bb0a4..834d09a 100644 --- a/chrome/browser/search_engines/search_terms_data.cc +++ b/chrome/browser/search_engines/search_terms_data.cc @@ -5,6 +5,7 @@ #include "chrome/browser/search_engines/search_terms_data.h" #include "base/logging.h" +#include "base/thread_restrictions.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/browser_thread.h" #include "chrome/browser/google/google_url_tracker.h" @@ -79,6 +80,8 @@ std::wstring UIThreadSearchTermsData::GetRlzParameterValue() const { // For organic brandcodes do not use rlz at all. Empty brandcode usually // means a chromium install. This is ok. std::wstring brand; + // See http://crbug.com/62337. + base::ThreadRestrictions::ScopedAllowIO allow_io; if (GoogleUpdateSettings::GetBrand(&brand) && !brand.empty() && !GoogleUpdateSettings::IsOrganic(brand)) RLZTracker::GetAccessPointRlz(rlz_lib::CHROME_OMNIBOX, &rlz_string); |