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 /base/metrics | |
| 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 'base/metrics')
| -rw-r--r-- | base/metrics/field_trial.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/base/metrics/field_trial.cc b/base/metrics/field_trial.cc index 99dce41..2c87f07 100644 --- a/base/metrics/field_trial.cc +++ b/base/metrics/field_trial.cc @@ -157,7 +157,8 @@ FieldTrial::~FieldTrial() {} Time FieldTrial::GetBuildTime() { Time integral_build_time; const char* kDateTime = __DATE__ " " __TIME__; - bool result = Time::FromString(kDateTime, &integral_build_time); + bool result = Time::FromString(ASCIIToWide(kDateTime).c_str(), + &integral_build_time); DCHECK(result); return integral_build_time; } |