Fixed memory leak of FileManagerPrivateApiTest.OnFileChanged.

chrome/browser/chromeos/extensions/file_manager/file_manager_private_apitest.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/run_loop.h"
 #include "base/stl_util.h"
 #include "chrome/browser/chromeos/drive/file_change.h"
 #include "chrome/browser/chromeos/extensions/file_manager/event_router.h"
 #include "chrome/browser/chromeos/file_manager/drive_test_util.h"
 #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"
 #include "extensions/common/install_warning.h"
 
 using ::testing::_;
 using ::testing::ReturnRef;
 
 using chromeos::disks::DiskMountManager;
 
@@ skipping 308 matching lines @@
       base::FilePath(FILE_PATH_LITERAL("/no-existing-fs/root/a/d/e")),
       base::FilePath(FILE_PATH_LITERAL("/no-existing-fs-hash/root/a/d/e")),
       "extension_2", base::Bind(&AddFileWatchCallback));
 
   event_router_->AddFileWatch(
       base::FilePath(FILE_PATH_LITERAL("/no-existing-fs/root/aaa")),
       base::FilePath(FILE_PATH_LITERAL("/no-existing-fs-hash/root/aaa")),
       "extension_3", base::Bind(&AddFileWatchCallback));
 
   // event_router->addFileWatch create some tasks which are performed on message
-  // loop. Wait until they are done.
+  // loop of BrowserThread::FILE. Wait until they are done.
+  content::RunAllPendingInMessageLoop(content::BrowserThread::FILE);
+  // We also wait the UI thread here, since some tasks which are performed above
+  // message loop back results to the UI thread.
   base::RunLoop().RunUntilIdle();
 
   // When /a is deleted (1 and 2 is notified).
   FileChange first_change;
   first_change.Update(
       base::FilePath(FILE_PATH_LITERAL("/no-existing-fs/root/a")),
       FileType::FILE_TYPE_DIRECTORY, ChangeType::DELETE);
   event_router_->OnFileChanged(first_change);
   EXPECT_EQ(2, counter);
 
@@ skipping 18 matching lines @@
       base::FilePath(FILE_PATH_LITERAL("/no-existing-fs/root/a/b/c")),
       "extension_1");
   event_router_->RemoveFileWatch(
       base::FilePath(FILE_PATH_LITERAL("/no-existing-fs/root/a/d/e")),
       "extension_2");
   event_router_->RemoveFileWatch(
       base::FilePath(FILE_PATH_LITERAL("/no-existing-fs/root/aaa")),
       "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);
 }