X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fchrome%2Fbrowser%2Fchromeos%2Fdrive%2Fdrive_integration_service_unittest.cc;h=b886726beb03991a65f2e651c2d2a2393f7596a2;hb=4a1a0bdd01eef90b0826a0e761d3379d3715c10f;hp=07b6d0bda2d23e0d21073bd1bafbb4a061c32a72;hpb=b1be5ca53587d23e7aeb77b26861fdc0a181ffd8;p=platform%2Fframework%2Fweb%2Fcrosswalk.git diff --git a/src/chrome/browser/chromeos/drive/drive_integration_service_unittest.cc b/src/chrome/browser/chromeos/drive/drive_integration_service_unittest.cc index 07b6d0b..b886726 100644 --- a/src/chrome/browser/chromeos/drive/drive_integration_service_unittest.cc +++ b/src/chrome/browser/chromeos/drive/drive_integration_service_unittest.cc @@ -5,12 +5,12 @@ #include "chrome/browser/chromeos/drive/drive_integration_service.h" #include "chrome/browser/chromeos/drive/dummy_file_system.h" -#include "chrome/browser/chromeos/drive/test_util.h" #include "chrome/browser/drive/dummy_drive_service.h" #include "chrome/test/base/testing_browser_process.h" #include "chrome/test/base/testing_profile.h" #include "chrome/test/base/testing_profile_manager.h" #include "content/public/test/test_browser_thread_bundle.h" +#include "content/public/test/test_utils.h" #include "testing/gtest/include/gtest/gtest.h" namespace drive { @@ -47,7 +47,7 @@ TEST_F(DriveIntegrationServiceTest, InitializeAndShutdown) { base::FilePath(), new DummyFileSystem)); integration_service->SetEnabled(true); - test_util::RunBlockingPoolTask(); + content::RunAllBlockingPoolTasksUntilIdle(); integration_service->Shutdown(); }