diff options
| author | joaodasilva@chromium.org <joaodasilva@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-20 17:44:05 +0000 |
|---|---|---|
| committer | joaodasilva@chromium.org <joaodasilva@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-20 17:44:05 +0000 |
| commit | 3ae445e87c76883a093adcd2ab64082210102820 (patch) | |
| tree | 8ef1bfc5e268a91f2ae167ae50321bc53cc9e581 /chrome | |
| parent | d539beae684ad05d65dad3338c442bf472e89279 (diff) | |
| download | chromium_src-3ae445e87c76883a093adcd2ab64082210102820.zip chromium_src-3ae445e87c76883a093adcd2ab64082210102820.tar.gz chromium_src-3ae445e87c76883a093adcd2ab64082210102820.tar.bz2 | |
Cleanup in base/test.
This is related to http://codereview.chromium.org/7003028/.
BUG=60476
TEST=None
Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=89664
Review URL: http://codereview.chromium.org/7129056
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@89681 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/chrome_tests.gypi | 5 | ||||
| -rw-r--r-- | chrome/common/time_format_browsertest.cc | 15 |
2 files changed, 11 insertions, 9 deletions
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi index c7e8094..2d614fb 100644 --- a/chrome/chrome_tests.gypi +++ b/chrome/chrome_tests.gypi @@ -2682,6 +2682,11 @@ 'browser/extensions/browser_action_test_util_mac.mm', ], }], + ['os_posix == 0', { + 'sources!': [ + 'common/time_format_browsertest.cc', + ], + }], ['os_posix == 1 and OS != "mac"', { 'conditions': [ ['linux_use_tcmalloc==1', { diff --git a/chrome/common/time_format_browsertest.cc b/chrome/common/time_format_browsertest.cc index 3aa8582..812a0e2 100644 --- a/chrome/common/time_format_browsertest.cc +++ b/chrome/common/time_format_browsertest.cc @@ -11,20 +11,20 @@ // this test is executed on its own process. #include "base/string16.h" -#include "base/test/test_util.h" +#include "base/test/scoped_locale.h" #include "base/utf_string_conversions.h" #include "chrome/common/time_format.h" #include "chrome/test/in_process_browser_test.h" -#if defined(OS_POSIX) using base::TimeDelta; -class TimeFormatBrowserTest: public InProcessBrowserTest { +class TimeFormatBrowserTest : public InProcessBrowserTest { public: - TimeFormatBrowserTest(): scoped_locale_("fr_FR.utf-8") {} + TimeFormatBrowserTest() : scoped_locale_("fr_FR.utf-8") { + } private: - base::ScopedSetLocale scoped_locale_; + base::ScopedLocale scoped_locale_; }; IN_PROC_BROWSER_TEST_F(TimeFormatBrowserTest, DecimalPointNotDot) { @@ -35,8 +35,5 @@ IN_PROC_BROWSER_TEST_F(TimeFormatBrowserTest, DecimalPointNotDot) { // http://crbug.com/60476 string16 one_min = TimeFormat::TimeRemainingShort(TimeDelta::FromMinutes(1)); - EXPECT_EQ(ASCIIToUTF16("1 min"), one_min) << "fr_FR.utf-8 locale generates " - << one_min; + EXPECT_EQ(ASCIIToUTF16("1 min"), one_min); } - -#endif // defined(OS_POSIX) |