From 413dd576d83d230c0e0d8a7a9cd1ebc077e014b9 Mon Sep 17 00:00:00 2001
From: "mmentovai@google.com"
 <mmentovai@google.com@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Wed, 27 Aug 2008 20:37:52 +0000
Subject: Some more passing tests in base for Linux

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@1460 0039d316-1c4b-4281-b951-d872f2087c98
---
 base/SConscript          |  9 ++---
 base/file_util_linux.cc  | 88 +++++++++++++++++-------------------------------
 base/file_util_posix.cc  |  1 -
 base/file_version_info.h |  3 +-
 4 files changed, 37 insertions(+), 64 deletions(-)

(limited to 'base')

diff --git a/base/SConscript b/base/SConscript
index 800b0d3..eb1ff71 100644
--- a/base/SConscript
+++ b/base/SConscript
@@ -150,6 +150,7 @@ if env['PLATFORM'] in ('darwin', 'posix'):
   input_files.extend([
       'condition_variable_posix.cc',
       'debug_util_posix.cc',
+      'file_util_posix.cc',
       'lock_impl_posix.cc',
       'platform_thread_posix.cc',
       'process_util_posix.cc',
@@ -247,10 +248,13 @@ test_files = [
     'at_exit_unittest.cc',
     'command_line_unittest.cc',
     'condition_variable_unittest.cc',
+    'histogram_unittest.cc',
     'json_reader_unittest.cc',
     'json_writer_unittest.cc',
     'linked_ptr_unittest.cc',
+    'message_loop_unittest.cc',
     'observer_list_unittest.cc',
+    'path_service_unittest.cc',
     'pickle_unittest.cc',
     'pr_time_unittest.cc',
     'ref_counted_unittest.cc',
@@ -265,6 +269,7 @@ test_files = [
     'string_util_unittest.cc',
     'thread_unittest.cc',
     'time_unittest.cc',
+    'timer_unittest.cc',
     'tracked_objects_unittest.cc',
     'tuple_unittest.cc',
     'values_unittest.cc',
@@ -284,18 +289,14 @@ if env['PLATFORM'] == 'win32':
   test_files.extend([
     'clipboard_unittest.cc',
     'file_util_unittest.cc',
-    'histogram_unittest.cc',
     'hmac_unittest.cc',
     'idletimer_unittest.cc',
-    'message_loop_unittest.cc',
-    'path_service_unittest.cc',
     'process_util_unittest.cc',
     'run_all_unittests.cc',
     'shared_event_unittest.cc',
     'shared_memory_unittest.cc',
     'stats_table_unittest.cc',
     'thread_local_storage_unittest.cc',
-    'timer_unittest.cc',
     'watchdog_unittest.cc',
     'gfx/native_theme_unittest.cc',
     'gfx/uniscribe_unittest.cc',
diff --git a/base/file_util_linux.cc b/base/file_util_linux.cc
index 6f55042..bfcc816 100644
--- a/base/file_util_linux.cc
+++ b/base/file_util_linux.cc
@@ -1,57 +1,31 @@
-// Copyright (c) 2006-2008 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.
-
-#include "base/file_util.h"
-
-#include <string>
-
-#include "base/logging.h"
-#include "base/string_util.h"
-
-namespace file_util {
-
-const wchar_t kPathSeparator = L'/';
-
-bool AbsolutePath(std::wstring* path) {
-  NOTIMPLEMENTED();
-  return false;
-}
-  
-bool GetTempDir(std::wstring* path) {
-  const char* tmp = getenv("TMPDIR");
-  if (tmp)
-    *path = UTF8ToWide(tmp);
-  else
-    *path = L"/tmp";
-  return true;
-}
-
-bool CopyFile(const std::wstring& from_path, const std::wstring& to_path) {
-  // TODO(erikkay): implement
-  NOTIMPLEMENTED();
-  return false;
-}
-
-bool PathExists(const std::wstring& path) {
-  NOTIMPLEMENTED();
-  return false;
-}
-
-bool GetCurrentDirectory(std::wstring* path) {
-  NOTIMPLEMENTED();
-  return false;
-}
-
-bool CreateDirectory(const std::wstring& full_path) {
-  NOTIMPLEMENTED();
-  return false;
-}
-
-bool SetCurrentDirectory(const std::wstring& current_directory) {
-  NOTIMPLEMENTED();
-  return false;
-}
-
-} // namespace file_util
-
+// Copyright (c) 2006-2008 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.
+
+#include "base/file_util.h"
+
+#include <string>
+
+#include "base/logging.h"
+#include "base/string_util.h"
+
+namespace file_util {
+
+const wchar_t kPathSeparator = L'/';
+
+bool GetTempDir(std::wstring* path) {
+  const char* tmp = getenv("TMPDIR");
+  if (tmp)
+    *path = UTF8ToWide(tmp);
+  else
+    *path = L"/tmp";
+  return true;
+}
+
+bool CopyFile(const std::wstring& from_path, const std::wstring& to_path) {
+  // TODO(erikkay): implement
+  NOTIMPLEMENTED();
+  return false;
+}
+
+}  // namespace file_util
diff --git a/base/file_util_posix.cc b/base/file_util_posix.cc
index f478732..444cf64 100644
--- a/base/file_util_posix.cc
+++ b/base/file_util_posix.cc
@@ -10,7 +10,6 @@
 #include <libgen.h>
 #include <sys/errno.h>
 #include <sys/stat.h>
-#include <sys/syslimits.h>
 #include <time.h>
 
 #include <fstream>
diff --git a/base/file_version_info.h b/base/file_version_info.h
index 7d50eac..d2d6630 100644
--- a/base/file_version_info.h
+++ b/base/file_version_info.h
@@ -31,8 +31,7 @@ class FileVersionInfo {
 
   // Creates a FileVersionInfo for the current module. Returns NULL in case
   // of error. The returned object should be deleted when you are done with it.
-  static FileVersionInfo*
-      FileVersionInfo::CreateFileVersionInfoForCurrentModule();
+  static FileVersionInfo* CreateFileVersionInfoForCurrentModule();
 
   ~FileVersionInfo();
 
-- 
cgit v1.1