Bug 951207 - Rename the chromium LOG macro to CHROMIUM_LOG; r=bent

ipc/chromium/src/base/chrome_application_mac.mm

@@ -21,8 +21,8 @@ @implementation CrApplication
 + (NSApplication*)sharedApplication {
   NSApplication* app = [super sharedApplication];
   if (![NSApp isKindOfClass:self]) {
-    LOG(ERROR) << "NSApp should be of type " << [[self className] UTF8String]
-               << ", not " << [[NSApp className] UTF8String];
+    CHROMIUM_LOG(ERROR) << "NSApp should be of type " << [[self className] UTF8String]
+                        << ", not " << [[NSApp className] UTF8String];
     DCHECK(false) << "NSApp is of wrong type";
   }
   return app;

ipc/chromium/src/base/debug_util_win.cc

@@ -116,27 +116,27 @@ class SymbolContext {
   }
 
   // Returns the error code of a failed initialization.  This should only be
-  // called if Init() has been called.  We do not LOG(FATAL) here because
-  // this code is called might be triggered by a LOG(FATAL) itself.  Instead,
+  // called if Init() has been called.  We do not CHROMIUM_LOG(FATAL) here because
+  // this code is called might be triggered by a CHROMIUM_LOG(FATAL) itself.  Instead,
   // we log an ERROR, and return ERROR_INVALID_DATA.
   DWORD init_error() {
     if (!initialized_) {
-      LOG(ERROR) << "Calling GetInitError() before Init() was called.  "
-                 << "Returning ERROR_INVALID_DATA.";
+      CHROMIUM_LOG(ERROR) << "Calling GetInitError() before Init() was called.  "
+                          << "Returning ERROR_INVALID_DATA.";
       return ERROR_INVALID_DATA;
     }
 
     return init_error_;
   }
 
   // Returns the process this was initialized for.  This should only be
-  // called if Init() has been called.  We LOG(ERROR) in this situation.
-  // LOG(FATAL) is not used because this code is might be triggered 
-  // by a LOG(FATAL) itself.
+  // called if Init() has been called.  We CHROMIUM_LOG(ERROR) in this situation.
+  // CHROMIUM_LOG(FATAL) is not used because this code is might be triggered 
+  // by a CHROMIUM_LOG(FATAL) itself.
   HANDLE process() {
     if (!initialized_) {
-      LOG(ERROR) << "Calling process() before Init() was called. "
-                 << "Returning NULL.";
+      CHROMIUM_LOG(ERROR) << "Calling process() before Init() was called. "
+                          << "Returning NULL.";
       return NULL;
     }
 
@@ -149,8 +149,8 @@ class SymbolContext {
   //    <tab>SymbolName[0xAddress+Offset] (FileName:LineNo)
   // 
   // This function should only be called if Init() has been called.  We do not
-  // LOG(FATAL) here because this code is called might be triggered by a
-  // LOG(FATAL) itself.
+  // CHROMIUM_LOG(FATAL) here because this code is called might be triggered by a
+  // CHROMIUM_LOG(FATAL) itself.
   void OutputTraceToStream(const std::vector<void*>& trace, std::ostream* os) {
     AutoLock lock(lock_);
 

ipc/chromium/src/base/file_util_posix.cc

@@ -147,7 +147,7 @@ bool CopyDirectory(const FilePath& from_path,
   char* dir_list[] = { top_dir, NULL };
   FTS* fts = fts_open(dir_list, FTS_PHYSICAL | FTS_NOSTAT, NULL);
   if (!fts) {
-    LOG(ERROR) << "fts_open failed: " << strerror(errno);
+    CHROMIUM_LOG(ERROR) << "fts_open failed: " << strerror(errno);
     return false;
   }
 
@@ -203,11 +203,11 @@ bool CopyDirectory(const FilePath& from_path,
         break;
       case FTS_SL:      // Symlink.
       case FTS_SLNONE:  // Symlink with broken target.
-        LOG(WARNING) << "CopyDirectory() skipping symbolic link: " <<
+        CHROMIUM_LOG(WARNING) << "CopyDirectory() skipping symbolic link: " <<
             ent->fts_path;
         continue;
       case FTS_DEFAULT:  // Some other sort of file.
-        LOG(WARNING) << "CopyDirectory() skipping file of unknown type: " <<
+        CHROMIUM_LOG(WARNING) << "CopyDirectory() skipping file of unknown type: " <<
             ent->fts_path;
         continue;
       default:
@@ -227,7 +227,7 @@ bool CopyDirectory(const FilePath& from_path,
   }
 
   if (error) {
-    LOG(ERROR) << "CopyDirectory(): " << strerror(error);
+    CHROMIUM_LOG(ERROR) << "CopyDirectory(): " << strerror(error);
     return false;
   }
   return true;

ipc/chromium/src/base/file_util_win.cc

@@ -313,7 +313,7 @@ int WriteFile(const FilePath& filename, const char* data, int size) {
                                0,
                                NULL));
   if (file == INVALID_HANDLE_VALUE) {
-    LOG(WARNING) << "CreateFile failed for path " << filename.value() <<
+    CHROMIUM_LOG(WARNING) << "CreateFile failed for path " << filename.value() <<
         " error code=" << GetLastError() <<
         " error text=" << win_util::FormatLastWin32Error();
     return -1;
@@ -326,12 +326,12 @@ int WriteFile(const FilePath& filename, const char* data, int size) {
 
   if (!result) {
     // WriteFile failed.
-    LOG(WARNING) << "writing file " << filename.value() <<
+    CHROMIUM_LOG(WARNING) << "writing file " << filename.value() <<
         " failed, error code=" << GetLastError() <<
         " description=" << win_util::FormatLastWin32Error();
   } else {
     // Didn't write all the bytes.
-    LOG(WARNING) << "wrote" << written << " bytes to " <<
+    CHROMIUM_LOG(WARNING) << "wrote" << written << " bytes to " <<
         filename.value() << " expected " << size;
   }
   return -1;

ipc/chromium/src/base/histogram.cc

@@ -21,7 +21,7 @@
 
 namespace base {
 
-#define DVLOG(x) LOG(ERROR)
+#define DVLOG(x) CHROMIUM_LOG(ERROR)
 #define CHECK_GT DCHECK_GT
 #define CHECK_LT DCHECK_LT
 typedef ::Lock Lock;
@@ -274,15 +274,15 @@ bool Histogram::DeserializeHistogramInfo(const std::string& histogram_info) {
       !pickle.ReadInt(&iter, &histogram_type) ||
       !pickle.ReadInt(&iter, &pickle_flags) ||
       !sample.Histogram::SampleSet::Deserialize(&iter, pickle)) {
-    LOG(ERROR) << "Pickle error decoding Histogram: " << histogram_name;
+    CHROMIUM_LOG(ERROR) << "Pickle error decoding Histogram: " << histogram_name;
     return false;
   }
   DCHECK(pickle_flags & kIPCSerializationSourceFlag);
   // Since these fields may have come from an untrusted renderer, do additional
   // checks above and beyond those in Histogram::Initialize()
   if (declared_max <= 0 || declared_min <= 0 || declared_max < declared_min ||
       INT_MAX / sizeof(Count) <= bucket_count || bucket_count < 2) {
-    LOG(ERROR) << "Values error decoding Histogram: " << histogram_name;
+    CHROMIUM_LOG(ERROR) << "Values error decoding Histogram: " << histogram_name;
     return false;
   }
 
@@ -301,8 +301,8 @@ bool Histogram::DeserializeHistogramInfo(const std::string& histogram_info) {
   } else if (histogram_type == BOOLEAN_HISTOGRAM) {
     render_histogram = BooleanHistogram::FactoryGet(histogram_name, flags);
   } else {
-    LOG(ERROR) << "Error Deserializing Histogram Unknown histogram_type: "
-               << histogram_type;
+    CHROMIUM_LOG(ERROR) << "Error Deserializing Histogram Unknown histogram_type: "
+                        << histogram_type;
     return false;
   }
 
@@ -457,7 +457,7 @@ Histogram::~Histogram() {
   if (StatisticsRecorder::dump_on_exit()) {
     std::string output;
     WriteAscii(true, "\n", &output);
-    LOG(INFO) << output;
+    CHROMIUM_LOG(INFO) << output;
   }
 
   // Just to make sure most derived class did this properly...
@@ -1139,7 +1139,7 @@ StatisticsRecorder::~StatisticsRecorder() {
   if (dump_on_exit_) {
     std::string output;
     WriteGraph("", &output);
-    LOG(INFO) << output;
+    CHROMIUM_LOG(INFO) << output;
   }
   // Clean up.
   HistogramMap* histograms = NULL;

ipc/chromium/src/base/logging.h

@@ -89,17 +89,17 @@ const mozilla::EmptyLog& operator <<(const mozilla::EmptyLog& log, const T&)
 }
 
 #ifdef NO_CHROMIUM_LOGGING
-#define LOG(info) std::stringstream()
+#define CHROMIUM_LOG(info) std::stringstream()
 #define LOG_IF(info, condition) if (!(condition)) std::stringstream()
 #else
-#define LOG(info) mozilla::LogWrapper(mozilla::LOG_ ## info, __FILE__, __LINE__)
+#define CHROMIUM_LOG(info) mozilla::LogWrapper(mozilla::LOG_ ## info, __FILE__, __LINE__)
 #define LOG_IF(info, condition) \
   if (!(condition)) mozilla::LogWrapper(mozilla::LOG_ ## info, __FILE__, __LINE__)
 #endif
 
 
 #ifdef DEBUG
-#define DLOG(info) LOG(info)
+#define DLOG(info) CHROMIUM_LOG(info)
 #define DLOG_IF(info) LOG_IF(info)
 #define DCHECK(condition) CHECK(condition)
 #else
@@ -111,8 +111,8 @@ const mozilla::EmptyLog& operator <<(const mozilla::EmptyLog& log, const T&)
 #define LOG_ASSERT(cond) CHECK(0)
 #define DLOG_ASSERT(cond) DCHECK(0)
 
-#define NOTREACHED() LOG(ERROR)
-#define NOTIMPLEMENTED() LOG(ERROR)
+#define NOTREACHED() CHROMIUM_LOG(ERROR)
+#define NOTIMPLEMENTED() CHROMIUM_LOG(ERROR)
 
 #define CHECK(condition) LOG_IF(FATAL, condition)
 

ipc/chromium/src/base/process_util_mac.mm

@@ -212,7 +212,7 @@ void SetCurrentProcessPrivileges(ChildPrivileges privs) {
     // Get the size of the buffer
     size_t len = 0;
     if (sysctl(mib, arraysize(mib), NULL, &len, NULL, 0) < 0) {
-      LOG(ERROR) << "failed to get the size needed for the process list";
+      CHROMIUM_LOG(ERROR) << "failed to get the size needed for the process list";
       kinfo_procs_.resize(0);
       done = true;
     } else {
@@ -227,7 +227,7 @@ void SetCurrentProcessPrivileges(ChildPrivileges privs) {
         // If we get a mem error, it just means we need a bigger buffer, so
         // loop around again.  Anything else is a real error and give up.
         if (errno != ENOMEM) {
-          LOG(ERROR) << "failed to get the process list";
+          CHROMIUM_LOG(ERROR) << "failed to get the process list";
           kinfo_procs_.resize(0);
           done = true;
         }
@@ -241,7 +241,7 @@ void SetCurrentProcessPrivileges(ChildPrivileges privs) {
   } while (!done && (try_num++ < max_tries));
 
   if (!done) {
-    LOG(ERROR) << "failed to collect the process list in a few tries";
+    CHROMIUM_LOG(ERROR) << "failed to collect the process list in a few tries";
     kinfo_procs_.resize(0);
   }
 }
@@ -280,13 +280,13 @@ void SetCurrentProcessPrivileges(ChildPrivileges privs) {
     // Found out what size buffer we need
     size_t data_len = 0;
     if (sysctl(mib, arraysize(mib), NULL, &data_len, NULL, 0) < 0) {
-      LOG(ERROR) << "failed to figure out the buffer size for a commandline";
+      CHROMIUM_LOG(ERROR) << "failed to figure out the buffer size for a commandline";
       continue;
     }
 
     data.resize(data_len);
     if (sysctl(mib, arraysize(mib), &data[0], &data_len, NULL, 0) < 0) {
-      LOG(ERROR) << "failed to fetch a commandline";
+      CHROMIUM_LOG(ERROR) << "failed to fetch a commandline";
       continue;
     }
 
@@ -295,7 +295,7 @@ void SetCurrentProcessPrivileges(ChildPrivileges privs) {
 
     size_t exec_name_end = data.find('\0');
     if (exec_name_end == std::string::npos) {
-      LOG(ERROR) << "command line data didn't match expected format";
+      CHROMIUM_LOG(ERROR) << "command line data didn't match expected format";
       continue;
     }
     size_t last_slash = data.rfind('/', exec_name_end);

ipc/chromium/src/base/process_util_posix.cc

@@ -251,7 +251,7 @@ bool DidProcessCrash(bool* child_exited, ProcessHandle handle) {
     // The dead process originally spawned from Nuwa might be taken as not
     // crashed because the above waitpid() call returns -1 and ECHILD. The
     // caller shouldn't behave incorrectly because of this false negative.
-    LOG(ERROR) << "waitpid failed pid:" << handle << " errno:" << errno;
+    CHROMIUM_LOG(ERROR) << "waitpid failed pid:" << handle << " errno:" << errno;
     if (child_exited)
       *child_exited = false;
     return false;

ipc/chromium/src/base/scoped_temp_dir.cc

@@ -13,7 +13,7 @@ ScopedTempDir::ScopedTempDir() {
 
 ScopedTempDir::~ScopedTempDir() {
   if (!path_.empty() && !file_util::Delete(path_, true))
-    LOG(ERROR) << "ScopedTempDir unable to delete " << path_.value();
+    CHROMIUM_LOG(ERROR) << "ScopedTempDir unable to delete " << path_.value();
 }
 
 bool ScopedTempDir::CreateUniqueTempDir() {

ipc/chromium/src/base/stats_table.cc

@@ -260,10 +260,10 @@ StatsTable::StatsTable(const std::string& name, int max_threads,
   // TODO(port): clean up this error reporting.
 #if defined(OS_WIN)
   if (!impl_)
-    LOG(ERROR) << "StatsTable did not initialize:" << GetLastError();
+    CHROMIUM_LOG(ERROR) << "StatsTable did not initialize:" << GetLastError();
 #elif defined(OS_POSIX)
   if (!impl_)
-    LOG(ERROR) << "StatsTable did not initialize:" << strerror(errno);
+    CHROMIUM_LOG(ERROR) << "StatsTable did not initialize:" << strerror(errno);
 #endif
 }
 

ipc/chromium/src/base/system_monitor.cc

@@ -57,18 +57,18 @@ void SystemMonitor::RemoveObserver(PowerObserver* obs) {
 }
 
 void SystemMonitor::NotifyPowerStateChange() {
-  LOG(INFO) << "PowerStateChange: "
-           << (BatteryPower() ? "On" : "Off") << " battery";
+  CHROMIUM_LOG(INFO) << "PowerStateChange: "
+                     << (BatteryPower() ? "On" : "Off") << " battery";
   observer_list_->Notify(&PowerObserver::OnPowerStateChange, this);
 }
 
 void SystemMonitor::NotifySuspend() {
-  LOG(INFO) << "Power Suspending";
+  CHROMIUM_LOG(INFO) << "Power Suspending";
   observer_list_->Notify(&PowerObserver::OnSuspend, this);
 }
 
 void SystemMonitor::NotifyResume() {
-  LOG(INFO) << "Power Resuming";
+  CHROMIUM_LOG(INFO) << "Power Resuming";
   observer_list_->Notify(&PowerObserver::OnResume, this);
 }
 

ipc/chromium/src/base/system_monitor_win.cc

@@ -38,7 +38,7 @@ void SystemMonitor::ProcessWmPowerBroadcastMessage(int event_id) {
 bool SystemMonitor::IsBatteryPower() {
   SYSTEM_POWER_STATUS status;
   if (!GetSystemPowerStatus(&status)) {
-    LOG(ERROR) << "GetSystemPowerStatus failed: " << GetLastError();
+    CHROMIUM_LOG(ERROR) << "GetSystemPowerStatus failed: " << GetLastError();
     return false;
   }
   return (status.ACLineStatus == 0);

ipc/chromium/src/chrome/common/chrome_switches.cc

@@ -175,7 +175,7 @@ const wchar_t kDisableLogging[]                = L"disable-logging";
 // INFO = 0, WARNING = 1, LOG_ERROR = 2, LOG_FATAL = 3.
 const wchar_t kLoggingLevel[]                  = L"log-level";
 
-// Make plugin processes log their sent and received messages to LOG(INFO).
+// Make plugin processes log their sent and received messages to CHROMIUM_LOG(INFO).
 const wchar_t kLogPluginMessages[]             = L"log-plugin-messages";
 
 // Dump any accumualted histograms to the log when browser terminates (requires

ipc/chromium/src/chrome/common/file_descriptor_set_posix.cc

@@ -17,7 +17,7 @@ FileDescriptorSet::~FileDescriptorSet() {
   if (consumed_descriptor_highwater_ == descriptors_.size())
     return;
 
-  LOG(WARNING) << "FileDescriptorSet destroyed with unconsumed descriptors";
+  CHROMIUM_LOG(WARNING) << "FileDescriptorSet destroyed with unconsumed descriptors";
   // We close all the descriptors where the close flag is set. If this
   // message should have been transmitted, then closing those with close
   // flags set mirrors the expected behaviour.