Reverting 7570.

Review URL: http://codereview.chromium.org/16528

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@7574 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 4 insertions, 11 deletions

diff --git a/chrome/common/l10n_util_unittest.cc b/chrome/common/l10n_util_unittest.cc
index 18cb8f0..ee14f23 100644
--- a/chrome/common/l10n_util_unittest.cc
+++ b/chrome/common/l10n_util_unittest.cc
@@ -2,27 +2,21 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "build/build_config.h"
-
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "base/string_util.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/l10n_util.h"
-#if !defined(OS_MACOSX)
 #include "chrome/test/data/resource.h"
-#endif
 #include "testing/gtest/include/gtest/gtest.h"
-#include "testing/platform_test.h"
 #include "unicode/locid.h"
 
 namespace {
 
-class L10nUtilTest: public PlatformTest {
+class L10nUtilTest: public testing::Test {
 };
 
-#if defined(OS_WIN)
-TEST_F(L10nUtilTest, GetString) {
+TEST(L10nUtilTest, GetString) {
   std::wstring s = l10n_util::GetString(IDS_SIMPLE);
   EXPECT_EQ(std::wstring(L"Hello World!"), s);
 
@@ -32,9 +26,8 @@ TEST_F(L10nUtilTest, GetString) {
   s = l10n_util::GetStringF(IDS_PLACEHOLDERS_2, 20);
   EXPECT_EQ(std::wstring(L"You owe me $20."), s);
 }
-#endif  // defined(OS_WIN)
 
-TEST_F(L10nUtilTest, TruncateString) {
+TEST(L10nUtilTest, TruncateString) {
   std::wstring string(L"foooooey    bxxxar baz");
 
   // Make sure it doesn't modify the string if length > string length.
@@ -68,7 +61,7 @@ void SetICUDefaultLocale(const std::wstring& locale_string) {
   EXPECT_TRUE(U_SUCCESS(error_code));
 }
 
-TEST_F(L10nUtilTest, GetAppLocale) {
+TEST(L10nUtilTest, GetAppLocale) {
   // Use a temporary locale dir so we don't have to actually build the locale
   // dlls for this test.
   std::wstring orig_locale_dir;