Porting changes in chrome/{browser,common}, also enabling more unit tests....

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 59 matching lines @@
     if (v->GetType() == Value::TYPE_STRING) {
       StringValue* sv = reinterpret_cast<StringValue*>(v);
       sv->GetAsString(value);
       return true;
     }
   }
   return false;
 }
 
 void PageState::SetInt64Property(const std::wstring& key, int64 value) {
-  wchar_t buff[64];
-  _i64tow_s(value, buff, arraysize(buff), 10);
-  SetProperty(key, buff);
+  SetProperty(key, Int64ToWString(value));
 }
 
 bool PageState::GetInt64Property(const std::wstring& key, int64* value) const {
   std::wstring v;
   if (GetProperty(key, &v)) {
-    *value = _wtoi64(v.c_str());
-    return true;
+    return StringToInt64(v, value);
   }
   return false;
 }
 
 void PageState::SetIntProperty(const std::wstring& key, int value) {
-  wchar_t buff[64];
-  _itow_s(value, buff, arraysize(buff), 10);
-  SetProperty(key, buff);
+  SetProperty(key, IntToWString(value));
 }
 
 bool PageState::GetIntProperty(const std::wstring& key, int* value) const {
   std::wstring v;
   if (GetProperty(key, &v)) {
-    *value = _wtoi(v.c_str());
-    return true;
+    return StringToInt(v, value);
   }
   return false;
 }
 
 PageState* PageState::Copy() const {
   PageState* copy = new PageState();
   if (state_.get())
     copy->state_.reset(static_cast<DictionaryValue*>(state_->DeepCopy()));
   return copy;
 }