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/time.cc | |
| 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/time.cc')
| -rw-r--r-- | base/time.cc | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/base/time.cc b/base/time.cc index 859810e..766f599 100644 --- a/base/time.cc +++ b/base/time.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2009 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. @@ -98,18 +98,16 @@ Time Time::LocalMidnight() const { } // static -bool Time::FromString(const char* time_string, Time* parsed_time) { +bool Time::FromString(const wchar_t* time_string, Time* parsed_time) { DCHECK((time_string != NULL) && (parsed_time != NULL)); - - if (time_string[0] == '\0') + std::string ascii_time_string = SysWideToUTF8(time_string); + if (ascii_time_string.length() == 0) return false; - PRTime result_time = 0; - PRStatus result = PR_ParseTimeString(time_string, PR_FALSE, + PRStatus result = PR_ParseTimeString(ascii_time_string.c_str(), PR_FALSE, &result_time); if (PR_SUCCESS != result) return false; - result_time += kTimeTToMicrosecondsOffset; *parsed_time = Time(result_time); return true; |