Bug 581341 - Part 6: Nits. r=bent

dom/ipc/ContentParent.cpp

@@ -330,8 +330,9 @@ ContentParent::DestroyTestShell(TestShellParent* aTestShell)
 TestShellParent*
 ContentParent::GetTestShellSingleton()
 {
-    if (!ManagedPTestShellParent().Length())
+    if (ManagedPTestShellParent().IsEmpty()) {
         return nsnull;
+    }
     return static_cast<TestShellParent*>(ManagedPTestShellParent()[0]);
 }
 

toolkit/xre/nsEmbedFunctions.cpp

@@ -712,11 +712,11 @@ TestShellParent* GetOrCreateTestShellParent()
     if (!parent) {
       return nsnull;
     }
+
     TestShellParent* testShell = parent->GetTestShellSingleton();
-    if (testShell) {
-      return testShell;
+    if (!testShell) {
+      testShell = parent->CreateTestShell();
     }
-    testShell = parent->CreateTestShell();
     return testShell;
 }
 }
@@ -758,9 +758,7 @@ XRE_ShutdownTestShell()
 {
   ContentParent* cp = ContentParent::GetSingleton(PR_FALSE);
   TestShellParent* tsp = cp ? cp->GetTestShellSingleton() : nsnull;
-  if (!tsp)
-    return true;
-  return cp->DestroyTestShell(tsp);
+  return tsp ? cp->DestroyTestShell(tsp) : true;
 }
 
 #ifdef MOZ_X11