Enabled WebFrameTest, stubbed out a gtk test shell function.

base/logging.cc

 // 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/logging.h"
 
 #if defined(OS_WIN)
 #include <windows.h>
 typedef HANDLE FileHandle;
 typedef HANDLE MutexHandle;
@@ skipping 18 matching lines @@
 
 #include <ctime>
 #include <iomanip>
 #include <cstring>
 #include <algorithm>
 
 #include "base/base_switches.h"
 #include "base/command_line.h"
 #include "base/debug_util.h"
 #include "base/lock_impl.h"
+#include "base/platform_thread.h"
+#include "base/process_util.h"
 #include "base/string_piece.h"
 #include "base/string_util.h"
 #include "base/sys_string_conversions.h"
-  
+#include "base/time.h"
+
 namespace logging {
 
 bool g_enable_dcheck = false;
 
 const char* const log_severity_names[LOG_NUM_SEVERITIES] = {
   "INFO", "WARNING", "ERROR", "FATAL" };
 
 int min_log_level = 0;
 LogLockingState lock_log_file = LOCK_LOG_FILE;
 
@@ skipping 46 matching lines @@
 // When we don't use a lock, we are using a global mutex. We need to do this
 // because LockFileEx is not thread safe.
 #if defined(OS_WIN)
 MutexHandle log_mutex = NULL;
 #elif defined(OS_POSIX)
 pthread_mutex_t log_mutex = PTHREAD_MUTEX_INITIALIZER;
 #endif
 
 // Helper functions to wrap platform differences.
 
-int32 CurrentProcessId() {
-#if defined(OS_WIN)
-  return GetCurrentProcessId();
-#elif defined(OS_POSIX)
-  return getpid();
-#endif
-}
-
-int32 CurrentThreadId() {
-#if defined(OS_WIN)
-  return GetCurrentThreadId();
-#elif defined(OS_MACOSX)
-  return mach_thread_self();
-#else
-  NOTIMPLEMENTED();
-  return 0;
-#endif
-}
-
-uint64 TickCount() {
-#if defined(OS_WIN)
-  return GetTickCount();
-#elif defined(OS_MACOSX)
-  return mach_absolute_time();
-#else
-  NOTIMPLEMENTED();
-  return 0;
-#endif
-}
-
 void CloseFile(FileHandle log) {
 #if defined(OS_WIN)
   CloseHandle(log);
 #else
   fclose(log);
 #endif
 }
 
 void DeleteFilePath(const PathString& log_name) {
 #if defined(OS_WIN)
@@ skipping 206 matching lines @@
 void LogMessage::Init(const char* file, int line) {
   // log only the filename
   const char* last_slash = strrchr(file, '\\');
   if (last_slash)
     file = last_slash + 1;
 
   // TODO(darin): It might be nice if the columns were fixed width.
 
   stream_ <<  '[';
   if (log_process_id)
-    stream_ << CurrentProcessId() << ':';
+    stream_ << process_util::GetCurrentProcId() << ':';
   if (log_thread_id)
-    stream_ << CurrentThreadId() << ':';
+    stream_ << PlatformThread::CurrentId() << ':';
   if (log_timestamp) {
      time_t t = time(NULL);
 #if _MSC_VER >= 1400
     struct tm local_time = {0};
     localtime_s(&local_time, &t);
     struct tm* tm_time = &local_time;
 #else
     struct tm* tm_time = localtime(&t);
 #endif
     stream_ << std::setfill('0')
             << std::setw(2) << 1 + tm_time->tm_mon
             << std::setw(2) << tm_time->tm_mday
             << '/'
             << std::setw(2) << tm_time->tm_hour
             << std::setw(2) << tm_time->tm_min
             << std::setw(2) << tm_time->tm_sec
             << ':';
   }
   if (log_tickcount)
-    stream_ << TickCount() << ':';
+    stream_ << base::TimeTicks::Now().ToInternalValue() << ':';
   stream_ << log_severity_names[severity_] << ":" << file << "(" << line << ")] ";
 
   message_start_ = stream_.tellp();
 }
 
 LogMessage::~LogMessage() {
   // TODO(brettw) modify the macros so that nothing is executed when the log
   // level is too high.
   if (severity_ < min_log_level)
     return;
@@ skipping 111 matching lines @@
   CloseFile(log_file);
   log_file = NULL;
 }
 
 } // namespace logging
 
 std::ostream& operator<<(std::ostream& out, const wchar_t* wstr) {
   return out << base::SysWideToUTF8(std::wstring(wstr));
 }