net: FileStream cleanup

chrome/browser/extensions/api/messaging/native_message_process_host_unittest.cc

 // Copyright (c) 2012 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/bind.h"
 #include "base/file_util.h"
 #include "base/files/file.h"
 #include "base/files/file_path.h"
 #include "base/files/scoped_file.h"
 #include "base/files/scoped_temp_dir.h"
@@ skipping 166 matching lines @@
   base::FilePath temp_output_file = temp_dir_.path().AppendASCII("output");
   base::FilePath temp_input_file = CreateTempFileWithMessage(kTestMessage);
   ASSERT_FALSE(temp_input_file.empty());
 
   scoped_ptr<NativeProcessLauncher> launcher =
       FakeLauncher::Create(temp_input_file, temp_output_file).Pass();
   native_message_process_host_ = NativeMessageProcessHost::CreateWithLauncher(
       AsWeakPtr(), ScopedTestNativeMessagingHost::kExtensionId, "empty_app.py",
       0, launcher.Pass());
   ASSERT_TRUE(native_message_process_host_.get());
+  native_message_process_host_->DontWaitToReadForTesting();
   run_loop_.reset(new base::RunLoop());
-  run_loop_->RunUntilIdle();
+  run_loop_->Run();
 
-  if (last_message_.empty()) {
-    run_loop_.reset(new base::RunLoop());
-    native_message_process_host_->ReadNowForTesting();
-    run_loop_->Run();
-  }
   EXPECT_EQ(kTestMessage, last_message_);
 }
 
 // Tests sending a single message. The message should get written to
 // |temp_file| and should match the contents of single_message_request.msg.
 TEST_F(NativeMessagingTest, SingleSendMessageWrite) {
   base::FilePath temp_output_file = temp_dir_.path().AppendASCII("output");
 
   base::File read_file;
 #if defined(OS_WIN)
@@ skipping 107 matching lines @@
       ScopedTestNativeMessagingHost::kHostName, 0, false);
   ASSERT_TRUE(native_message_process_host_.get());
   run_loop_.reset(new base::RunLoop());
   run_loop_->Run();
 
   // The host should fail to start.
   ASSERT_TRUE(channel_closed_);
 }
 
 }  // namespace extensions