Issue #1053 - Clean up docs and some code comments.

Polish only, no code changes.

4 files changed, 3 insertions, 24 deletions

diff --git a/xpcom/base/nsCycleCollector.cpp b/xpcom/base/nsCycleCollector.cpp
index 9acc2d7b7e..8df3c3a6bc 100644
--- a/xpcom/base/nsCycleCollector.cpp
+++ b/xpcom/base/nsCycleCollector.cpp
@@ -1609,10 +1609,7 @@ private:
                             &logFile);
     }
 
-    // On Android or B2G, this function will open a file named
-    // aFilename under a memory-reporting-specific folder
-    // (/data/local/tmp/memory-reports). Otherwise, it will open a
-    // file named aFilename under "NS_OS_TEMP_DIR".
+    // This function will open a file named aFilename under "NS_OS_TEMP_DIR".
     nsresult rv = nsDumpUtils::OpenTempFile(filename, &logFile,
                                             NS_LITERAL_CSTRING("memory-reports"));
     if (NS_FAILED(rv)) {
diff --git a/xpcom/glue/nsDebug.h b/xpcom/glue/nsDebug.h
index 2feaba94e1..8921d60214 100644
--- a/xpcom/glue/nsDebug.h
+++ b/xpcom/glue/nsDebug.h
@@ -390,10 +390,6 @@ extern "C" {
 /**
  * printf_stderr(...) is much like fprintf(stderr, ...), except that:
  *  - it calls the callback set through set_stderr_callback
- *  - on Android and Firefox OS, *instead* of printing to stderr, it
- *    prints to logcat.  (Newlines in the string lead to multiple lines
- *    of logcat, but each function call implicitly completes a line even
- *    if the string does not end with a newline.)
  *  - on Windows, if a debugger is present, it calls OutputDebugString
  *    in *addition* to writing to stderr
  */
@@ -407,17 +403,6 @@ void vprintf_stderr(const char* aFmt, va_list aArgs);
 /**
  * fprintf_stderr is like fprintf, except that if its file argument
  * is stderr, it invokes printf_stderr instead.
- *
- * This is useful for general debugging code that logs information to a
- * file, but that you would like to be useful on Android and Firefox OS.
- * If you use fprintf_stderr instead of fprintf in such debugging code,
- * then callers can pass stderr to get logging that works on Android and
- * Firefox OS (and also the other side-effects of using printf_stderr).
- *
- * Code that is structured this way needs to be careful not to split a
- * line of output across multiple calls to fprintf_stderr, since doing
- * so will cause it to appear in multiple lines in logcat output.
- * (Producing multiple lines at once is fine.)
  */
 void fprintf_stderr(FILE* aFile, const char* aFmt, ...) MOZ_FORMAT_PRINTF(2, 3);
 
diff --git a/xpcom/system/nsIDeviceSensors.idl b/xpcom/system/nsIDeviceSensors.idl
index dcb67cb925..8ee559f07f 100644
--- a/xpcom/system/nsIDeviceSensors.idl
+++ b/xpcom/system/nsIDeviceSensors.idl
@@ -11,12 +11,9 @@ interface nsIDeviceSensorData : nsISupports
 {
   // Keep in sync with hal/HalSensor.h
 
-  // 1. TYPE_ORIENTATION: absolute device orientation, not spec-conform and
-  // deprecated on Android.
+  // 1. TYPE_ORIENTATION: absolute device orientation, not spec-conform.
   // 2. TYPE_ROTATION_VECTOR: absolute device orientation affected by drift.
   // 3. TYPE_GAME_ROTATION_VECTOR: relative device orientation less affected by drift.
-  // Preferred fallback priorities on Android are [3, 2, 1] for the general case
-  // and [2, 1] if absolute orientation (compass heading) is required.
   const unsigned long TYPE_ORIENTATION = 0;
   const unsigned long TYPE_ACCELERATION = 1;
   const unsigned long TYPE_PROXIMITY = 2;
diff --git a/xpcom/threads/BackgroundHangMonitor.h b/xpcom/threads/BackgroundHangMonitor.h
index c323cd7cf3..93db01a4d7 100644
--- a/xpcom/threads/BackgroundHangMonitor.h
+++ b/xpcom/threads/BackgroundHangMonitor.h
@@ -40,7 +40,7 @@ class BackgroundHangManager;
  * running time. This is a good starting point for determining the timeout
  * and maximum timeout values. For example, the Compositor thread has a
  * responsiveness goal of 60Hz or 17ms, so a starting timeout could be
- * 100ms. Considering some platforms (e.g. Android) can terminate the app
+ * 100ms. Considering some platforms can terminate the application
  * when a critical thread hangs for longer than a few seconds, a good
  * starting maximum timeout is 4 or 5 seconds.
  *