Backed out changeset 84aee740b55a (bug 1077590) for rc-4 failures

build/mobile/robocop/FennecNativeDriver.java

@@ -287,13 +287,11 @@ public class FennecNativeDriver implements Driver {
             log(LogLevel.ERROR, e);
         } finally {
             try {
-                if (br != null) {
-                    br.close();
-                }
+                br.close();
             } catch (IOException e) {
             }
         }
-        return text.toString();
+        return text.toString();    
     }
 
     /**
@@ -351,7 +349,7 @@ public class FennecNativeDriver implements Driver {
 
     public static void log(LogLevel level, String message, Throwable t) {
         if (mLogFile == null) {
-            throw new RuntimeException("No log file specified!");
+            assert(false);
         }
 
         if (level.isEnabled(mLogLevel)) {
@@ -367,14 +365,11 @@ public class FennecNativeDriver implements Driver {
             } catch (IOException ioe) {
                 Log.e("Robocop", "exception with file writer on: " + mLogFile);
             } finally {
-                if (pw != null) {
-                    pw.close();
-                }
+                pw.close();
             }
-
             // PrintWriter doesn't throw IOE but sets an error flag instead,
             // so check for that
-            if (pw != null && pw.checkError()) {
+            if (pw.checkError()) {
                 Log.e("Robocop", "exception with file writer on: " + mLogFile);
             }
         }