diff options
| author | morrita@chromium.org <morrita@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-28 05:34:27 +0000 |
|---|---|---|
| committer | morrita@chromium.org <morrita@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-28 05:34:27 +0000 |
| commit | ce681a8b14c05752f9279e7ed945943506f7d628 (patch) | |
| tree | 0525ceb2c94766bd1344726f14c7528e6c0e8689 /chrome/browser/web_resource | |
| parent | 60527a34dfeacad59e7eac002ecc5db516c1898f (diff) | |
| download | chromium_src-ce681a8b14c05752f9279e7ed945943506f7d628.zip chromium_src-ce681a8b14c05752f9279e7ed945943506f7d628.tar.gz chromium_src-ce681a8b14c05752f9279e7ed945943506f7d628.tar.bz2 | |
Revert 94426 - Removed wchat_t from Time::FromString.
Also, some of the test case are moved for pr_time_unittests to time_unitests.
BUG=77962
TEST=base_unittests:TimeTest.*
Review URL: http://codereview.chromium.org/7470038
TBR=shinyak@google.com
Review URL: http://codereview.chromium.org/7520021
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@94427 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/web_resource')
| -rw-r--r-- | chrome/browser/web_resource/promo_resource_service.cc | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/chrome/browser/web_resource/promo_resource_service.cc b/chrome/browser/web_resource/promo_resource_service.cc index 01aed7e..8c9e9a4 100644 --- a/chrome/browser/web_resource/promo_resource_service.cc +++ b/chrome/browser/web_resource/promo_resource_service.cc @@ -268,8 +268,10 @@ void PromoResourceService::UnpackPromoSignal( promo_end_string.length() > 0) { base::Time start_time; base::Time end_time; - if (base::Time::FromString(promo_start_string.c_str(), &start_time) && - base::Time::FromString(promo_end_string.c_str(), &end_time)) { + if (base::Time::FromString( + ASCIIToWide(promo_start_string).c_str(), &start_time) && + base::Time::FromString( + ASCIIToWide(promo_end_string).c_str(), &end_time)) { // Add group time slice, adjusted from hours to seconds. promo_start = start_time.ToDoubleT() + (prefs_->FindPreference(prefs::kNTPPromoGroup) ? @@ -428,8 +430,10 @@ void PromoResourceService::UnpackLogoSignal( logo_end_string.length() > 0) { base::Time start_time; base::Time end_time; - if (base::Time::FromString(logo_start_string.c_str(), &start_time) && - base::Time::FromString(logo_end_string.c_str(), &end_time)) { + if (base::Time::FromString( + ASCIIToWide(logo_start_string).c_str(), &start_time) && + base::Time::FromString( + ASCIIToWide(logo_end_string).c_str(), &end_time)) { logo_start = start_time.ToDoubleT(); logo_end = end_time.ToDoubleT(); } |