Port DictionaryValue to use string16 instead of wstring.

chrome/browser/page_state.cc

 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/basictypes.h"
 #include "base/logging.h"
 #include "base/string_util.h"
 #include "chrome/browser/page_state.h"
 #include "chrome/common/json_value_serializer.h"
 #include "googleurl/src/gurl.h"
@@ skipping 10 matching lines @@
   url_parse::Component queryComp, keyComp, valueComp;
   queryComp.len = static_cast<int>(query_string.size());
   while (url_parse::ExtractQueryKeyValue(query_string.c_str(), &queryComp,
                                          &keyComp, &valueComp)) {
     if (keyComp.is_nonempty()) {
       std::string escaped = query_string.substr(valueComp.begin,
                                                 valueComp.len);
       // 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(UTF8ToWide(query_string.substr(keyComp.begin, keyComp.len)),
+      state_->Set(UTF8ToUTF16(query_string.substr(keyComp.begin, keyComp.len)),
                   new StringValue(value));
     }
   }
 }
 
 void PageState::InitWithBytes(const std::string& bytes) {
   // Reset our state. We create a new empty one just in case
   // deserialization fails
   state_.reset(new DictionaryValue);
 
@@ skipping 10 matching lines @@
 }
 
 void PageState::GetByteRepresentation(std::string* out) const {
   JSONStringValueSerializer serializer(out);
   if (!serializer.Serialize(*state_))
     NOTREACHED();
 }
 
 void PageState::SetProperty(const std::wstring& key,
                                    const std::wstring& value) {
-  state_->Set(key, new StringValue(value));
+  state_->Set(WideToUTF16Hack(key), new StringValue(value));
 }
 
-bool PageState::GetProperty(const std::wstring& key, std::wstring* value) const {
+bool PageState::GetProperty(const std::wstring& wkey,
+                            std::wstring* value) const {
+  string16 key(WideToUTF16(wkey));
   if (state_->HasKey(key)) {
     Value* v;
     state_->Get(key, &v);
     if (v->GetType() == Value::TYPE_STRING) {
       StringValue* sv = reinterpret_cast<StringValue*>(v);
       sv->GetAsString(value);
       return true;
     }
   }
   return false;
@@ skipping 22 matching lines @@
   }
   return false;
 }
 
 PageState* PageState::Copy() const {
   PageState* copy = new PageState();
   if (state_.get())
     copy->state_.reset(static_cast<DictionaryValue*>(state_->DeepCopy()));
   return copy;
 }