Fixed memory leak of FileManagerPrivateApiTest.OnFileChanged.

chrome/browser/chromeos/extensions/file_manager/file_manager_private_apitest.cc

Index: chrome/browser/chromeos/extensions/file_manager/file_manager_private_apitest.cc
diff --git a/chrome/browser/chromeos/extensions/file_manager/file_manager_private_apitest.cc b/chrome/browser/chromeos/extensions/file_manager/file_manager_private_apitest.cc
index cf59a54f79235470168a3935eceb28a091e1ce1f..3ada68c6f4da5953da4af63fbe2ccf97c0e94417 100644
--- a/chrome/browser/chromeos/extensions/file_manager/file_manager_private_apitest.cc
+++ b/chrome/browser/chromeos/extensions/file_manager/file_manager_private_apitest.cc
@@ -10,6 +10,7 @@
 #include "chrome/browser/chromeos/file_manager/file_watcher.h"
 #include "chrome/browser/extensions/extension_apitest.h"
 #include "chrome/test/base/testing_profile.h"
+#include "chrome/test/base/ui_test_utils.h"
 #include "chromeos/dbus/cros_disks_client.h"
 #include "chromeos/disks/mock_disk_mount_manager.h"
 #include "extensions/common/extension.h"
@@ -338,8 +339,8 @@ IN_PROC_BROWSER_TEST_F(FileManagerPrivateApiTest, OnFileChanged) {
       "extension_3", base::Bind(&AddFileWatchCallback));
 
   // event_router->addFileWatch create some tasks which are performed on message
-  // loop. Wait until they are done.
-  base::RunLoop().RunUntilIdle();
+  // loop of BrowserThread::FILE. Wait until they are done.
+  content::RunAllPendingInMessageLoop(content::BrowserThread::FILE);

[mtomasz, 2014/10/31 05:29:29]

Hm. Shall we also wait on the UI message loop? We jump from UI to FILE and then
back to UI thread.

I think we should call:
content::RunAllPendingInMessageLoop(FILE);
base::RunLoop().RunUntilIdle().

What do you think?

[yawano, 2014/10/31 05:39:51]

Yes, it can make the test more stable.
I added a code to wait a message loop of UI thread.

 
   // When /a is deleted (1 and 2 is notified).
   FileChange first_change;
@@ -377,6 +378,6 @@ IN_PROC_BROWSER_TEST_F(FileManagerPrivateApiTest, OnFileChanged) {
       "extension_3");
 
   // event_router->removeFileWatch create some tasks which are performed on
-  // message loop. wait until they are done.
-  base::RunLoop().RunUntilIdle();
+  // message loop of BrowserThread::FILE. Wait until they are done.
+  content::RunAllPendingInMessageLoop(content::BrowserThread::FILE);
 }