From 8e50b600ed1e65789109022709cf5c349748fb4c Mon Sep 17 00:00:00 2001 From: "nsylvain@chromium.org" Date: Tue, 3 Mar 2009 22:59:43 +0000 Subject: revert broken change 10833 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@10837 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/browser/page_state.cc | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'chrome/browser/page_state.cc') diff --git a/chrome/browser/page_state.cc b/chrome/browser/page_state.cc index c970bbe..827416c 100644 --- a/chrome/browser/page_state.cc +++ b/chrome/browser/page_state.cc @@ -28,7 +28,7 @@ void PageState::InitWithURL(const GURL& url) { // We know that the query string is UTF-8 since it's an internal URL. std::wstring value = UTF8ToWide( UnescapeURLComponent(escaped, UnescapeRule::REPLACE_PLUS_WITH_SPACE)); - state_->Set(UTF8ToUTF16(query_string.substr(keyComp.begin, keyComp.len)), + state_->Set(UTF8ToWide(query_string.substr(keyComp.begin, keyComp.len)), new StringValue(value)); } } @@ -59,12 +59,10 @@ void PageState::GetByteRepresentation(std::string* out) const { void PageState::SetProperty(const std::wstring& key, const std::wstring& value) { - state_->Set(WideToUTF16Hack(key), new StringValue(value)); + state_->Set(key, new StringValue(value)); } -bool PageState::GetProperty(const std::wstring& wkey, - std::wstring* value) const { - string16 key(WideToUTF16(wkey)); +bool PageState::GetProperty(const std::wstring& key, std::wstring* value) const { if (state_->HasKey(key)) { Value* v; state_->Get(key, &v); -- cgit v1.1