diff options
author | shinyak@google.com <shinyak@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-28 04:53:17 +0000 |
---|---|---|
committer | shinyak@google.com <shinyak@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-28 04:53:17 +0000 |
commit | 60527a34dfeacad59e7eac002ecc5db516c1898f (patch) | |
tree | 7b96c3eaa4ae6f40e73637081cf42f69dbc581eb /chrome/browser/web_resource | |
parent | 6f5fa9f917396a24ef3b38a6358c15e96d4b6512 (diff) | |
download | chromium_src-60527a34dfeacad59e7eac002ecc5db516c1898f.zip chromium_src-60527a34dfeacad59e7eac002ecc5db516c1898f.tar.gz chromium_src-60527a34dfeacad59e7eac002ecc5db516c1898f.tar.bz2 |
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
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@94426 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, 4 insertions, 8 deletions
diff --git a/chrome/browser/web_resource/promo_resource_service.cc b/chrome/browser/web_resource/promo_resource_service.cc index 8c9e9a4..01aed7e 100644 --- a/chrome/browser/web_resource/promo_resource_service.cc +++ b/chrome/browser/web_resource/promo_resource_service.cc @@ -268,10 +268,8 @@ void PromoResourceService::UnpackPromoSignal( promo_end_string.length() > 0) { base::Time start_time; base::Time 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)) { + if (base::Time::FromString(promo_start_string.c_str(), &start_time) && + base::Time::FromString(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) ? @@ -430,10 +428,8 @@ void PromoResourceService::UnpackLogoSignal( logo_end_string.length() > 0) { base::Time start_time; base::Time 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)) { + if (base::Time::FromString(logo_start_string.c_str(), &start_time) && + base::Time::FromString(logo_end_string.c_str(), &end_time)) { logo_start = start_time.ToDoubleT(); logo_end = end_time.ToDoubleT(); } |