diff options
| author | maruel@chromium.org <maruel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-12-19 16:35:09 +0000 |
|---|---|---|
| committer | maruel@chromium.org <maruel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-12-19 16:35:09 +0000 |
| commit | 81dcc5ed39dc069c84b2a2ba0abbfd6e7446b6f4 (patch) | |
| tree | 7d9d9676bfa69036b5f3c678ef55b765221f3e05 /chrome | |
| parent | 0e4b078a98964e26cd116c1fd63def356ad67111 (diff) | |
| download | chromium_src-81dcc5ed39dc069c84b2a2ba0abbfd6e7446b6f4.zip chromium_src-81dcc5ed39dc069c84b2a2ba0abbfd6e7446b6f4.tar.gz chromium_src-81dcc5ed39dc069c84b2a2ba0abbfd6e7446b6f4.tar.bz2 | |
Reverting 7296.
From http://build.chromium.org/buildbot/waterfall/waterfall?builder=Chromium%20Reliability
There is a clear increase of crashes after this change. It really seems like a heap overflow but it's hard to tell. Reverting to see if it helps the reliability tests. If not, we can reapply this change and find another culprit.
Review URL: http://codereview.chromium.org/15081
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@7304 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/browser/net/dns_global.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/chrome/browser/net/dns_global.cc b/chrome/browser/net/dns_global.cc index 096af58..eb8d79f 100644 --- a/chrome/browser/net/dns_global.cc +++ b/chrome/browser/net/dns_global.cc @@ -251,7 +251,7 @@ void PrefetchObserver::SaveStartupListAsPref(PrefService* local_state) { for (Results::iterator it = first_resolutions->begin(); it != first_resolutions->end(); it++) { - const std::string hostname = it->first; + const std::wstring hostname = ASCIIToWide(it->first); startup_list->Append(Value::CreateStringValue(hostname)); } } @@ -440,9 +440,9 @@ void DnsPrefetchHostNamesAtStartup(PrefService* user_prefs, for (ListValue::iterator it = startup_list->begin(); it != startup_list->end(); it++) { - std::string hostname; - (*it)->GetAsString(&hostname); - hostnames.push_back(hostname); + std::wstring w_hostname; + (*it)->GetAsString(&w_hostname); + hostnames.push_back(WideToASCII(w_hostname)); } } |