Remove Mac-specific code to make a generic POSIX string_util for Mac and Linux.

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

2 files changed, 1 insertions, 17 deletions

diff --git a/base/SConscript b/base/SConscript
index c338994..1b12a2a 100644
--- a/base/SConscript
+++ b/base/SConscript
@@ -165,7 +165,7 @@ if env['PLATFORM'] == 'posix':
   input_files.extend([
       'atomicops_internals_x86_gcc.cc',
       'file_util_linux.cc',
-      'string_util_mac.cc',
+      'string_util_posix.cc',
       'sys_string_conversions_linux.cc',
   ])
 
diff --git a/base/string_util_mac.cc b/base/string_util_posix.cc
index 310f93b..320764f 100644
--- a/base/string_util_mac.cc
+++ b/base/string_util_posix.cc
@@ -29,34 +29,18 @@
 
 #include "base/string_util.h"
 
-#include <CoreFoundation/CoreFoundation.h>
 #include <pthread.h>
 #include <string>
 #include <vector>
 #include "base/logging.h"
-#include "base/scoped_cftyperef.h"
 #include "unicode/numfmt.h"
 
 static NumberFormat* number_format_singleton = NULL;
-static CFDateFormatterRef date_formatter = NULL;
-static CFDateFormatterRef time_formatter = NULL;
 
 static void DoInitializeStatics() {
   UErrorCode status = U_ZERO_ERROR;
   number_format_singleton = NumberFormat::createInstance(status);
   DCHECK(U_SUCCESS(status));
-
-  scoped_cftyperef<CFLocaleRef> user_locale(CFLocaleCopyCurrent());
-  date_formatter = CFDateFormatterCreate(NULL,
-                                         user_locale,
-                                         kCFDateFormatterShortStyle,   // date
-                                         NULL);                        // time
-  DCHECK(date_formatter);
-  time_formatter = CFDateFormatterCreate(NULL,
-                                         user_locale,
-                                         NULL,                         // date
-                                         kCFDateFormatterShortStyle);  // time
-  DCHECK(time_formatter);
 }
 
 static void InitializeStatics() {