diff options
| author | shinyak@google.com <shinyak@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-26 18:17:03 +0000 |
|---|---|---|
| committer | shinyak@google.com <shinyak@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-26 18:17:03 +0000 |
| commit | 5086cfc86ff0050abbf63972bd70cbc48d5e7f57 (patch) | |
| tree | 98855082b195a1a0648475a57d7ba3778ff14f20 /chrome | |
| parent | a60865a91102be0b19d826fb9d26f0bc98066ca6 (diff) | |
| download | chromium_src-5086cfc86ff0050abbf63972bd70cbc48d5e7f57.zip chromium_src-5086cfc86ff0050abbf63972bd70cbc48d5e7f57.tar.gz chromium_src-5086cfc86ff0050abbf63972bd70cbc48d5e7f57.tar.bz2 | |
Removed wchar_t from Time::FromString.
Also, some of the test case are moved from pr_time_unittests to time_unittests.
BUG=77962
TEST=base_unittests:TimeTest.*
Review URL: http://codereview.chromium.org/6903022
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@83048 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/browser/web_resource/promo_resource_service.cc | 8 | ||||
| -rw-r--r-- | chrome/common/metrics_helpers.cc | 2 | ||||
| -rw-r--r-- | chrome/test/webdriver/cookie.cc | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/chrome/browser/web_resource/promo_resource_service.cc b/chrome/browser/web_resource/promo_resource_service.cc index d9f526f..e3f43e9 100644 --- a/chrome/browser/web_resource/promo_resource_service.cc +++ b/chrome/browser/web_resource/promo_resource_service.cc @@ -252,9 +252,9 @@ void PromoResourceService::UnpackPromoSignal( base::Time start_time; base::Time end_time; if (base::Time::FromString( - ASCIIToWide(promo_start_string).c_str(), &start_time) && + promo_start_string.c_str(), &start_time) && base::Time::FromString( - ASCIIToWide(promo_end_string).c_str(), &end_time)) { + 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) ? @@ -389,9 +389,9 @@ void PromoResourceService::UnpackLogoSignal( base::Time start_time; base::Time end_time; if (base::Time::FromString( - ASCIIToWide(logo_start_string).c_str(), &start_time) && + logo_start_string.c_str(), &start_time) && base::Time::FromString( - ASCIIToWide(logo_end_string).c_str(), &end_time)) { + logo_end_string.c_str(), &end_time)) { logo_start = start_time.ToDoubleT(); logo_end = end_time.ToDoubleT(); } diff --git a/chrome/common/metrics_helpers.cc b/chrome/common/metrics_helpers.cc index 55c28bd..dde9859 100644 --- a/chrome/common/metrics_helpers.cc +++ b/chrome/common/metrics_helpers.cc @@ -372,7 +372,7 @@ int64 MetricsLogBase::GetBuildTime() { if (!integral_build_time) { Time time; const char* kDateTime = __DATE__ " " __TIME__ " GMT"; - bool result = Time::FromString(ASCIIToWide(kDateTime).c_str(), &time); + bool result = Time::FromString(kDateTime, &time); DCHECK(result); integral_build_time = static_cast<int64>(time.ToTimeT()); } diff --git a/chrome/test/webdriver/cookie.cc b/chrome/test/webdriver/cookie.cc index fdabc5e..d1baafb 100644 --- a/chrome/test/webdriver/cookie.cc +++ b/chrome/test/webdriver/cookie.cc @@ -40,7 +40,7 @@ Cookie::Cookie(const std::string& cookie) { if (pc.HasExpires()) { base::Time parsed_time; - if (base::Time::FromString(UTF8ToWide(pc.Expires()).c_str(), &parsed_time)) + if (base::Time::FromString(pc.Expires().c_str(), &parsed_time)) expiration_ = parsed_time; } } |