\r cleanup

base/trace_event.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/trace_event.h"
 
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "base/platform_thread.h"
@@ skipping 33 matching lines @@
 bool TraceLog::StartTracing() {
   TraceLog* trace = Singleton<TraceLog>::get();
   return trace->Start();
 }
 
 bool TraceLog::Start() {
   if (enabled_)
     return true;
   enabled_ = OpenLogFile();
   if (enabled_) {
-    Log("var raw_trace_events = [\r\n");
+    Log("var raw_trace_events = [\n");
     trace_start_time_ = TimeTicks::Now();
     timer_.Start(TimeDelta::FromMilliseconds(250), this, &TraceLog::Heartbeat);
   }
   return enabled_;
 }
 
 // static
 void TraceLog::StopTracing() {
   TraceLog* trace = Singleton<TraceLog>::get();
   return trace->Stop();
 }
 
 void TraceLog::Stop() {
   if (enabled_) {
     enabled_ = false;
-    Log("];\r\n");
+    Log("];\n");
     CloseLogFile();
     timer_.Stop();
   }
 }
 
 void TraceLog::Heartbeat() {
   std::string cpu = StringPrintf("%d", process_metrics_->GetCPUUsage());
   TRACE_EVENT_INSTANT("heartbeat.cpu", 0, cpu);
 }
 
@@ skipping 44 matching lines @@
 #ifdef USE_UNRELIABLE_NOW
   TimeTicks tick = TimeTicks::HighResNow();
 #else
   TimeTicks tick = TimeTicks::Now();
 #endif
   TimeDelta delta = tick - trace_start_time_;
   int64 usec = delta.InMicroseconds();
   std::string msg = 
     StringPrintf("{'pid':'0x%lx', 'tid':'0x%lx', 'type':'%s', "
                  "'name':'%s', 'id':'0x%lx', 'extra':'%s', 'file':'%s', "
-                 "'line_number':'%d', 'usec_begin': %I64d},\r\n", 
+                 "'line_number':'%d', 'usec_begin': %I64d},\n", 
                  base::GetCurrentProcId(),
                  PlatformThread::CurrentId(),
                  kEventTypeNames[type],
                  name.c_str(),
                  id,
                  extra.c_str(),
                  file, 
                  line,
                  usec);
 
   Log(msg);
 }
 
 void TraceLog::Log(const std::string& msg) {
   AutoLock lock(file_lock_);
 
   fprintf(log_file_, "%s", msg.c_str());
 }
 
 } // namespace base