summaryrefslogtreecommitdiffstats
path: root/webkit/browser
diff options
context:
space:
mode:
Diffstat (limited to 'webkit/browser')
-rw-r--r--webkit/browser/blob/blob_storage_context_unittest.cc12
-rw-r--r--webkit/browser/fileapi/transient_file_util_unittest.cc6
2 files changed, 9 insertions, 9 deletions
diff --git a/webkit/browser/blob/blob_storage_context_unittest.cc b/webkit/browser/blob/blob_storage_context_unittest.cc
index e462b95..ef24bdc 100644
--- a/webkit/browser/blob/blob_storage_context_unittest.cc
+++ b/webkit/browser/blob/blob_storage_context_unittest.cc
@@ -28,7 +28,7 @@ void SetupBasicBlob(BlobStorageHost* host, const std::string& id) {
TEST(BlobStorageContextTest, IncrementDecrementRef) {
BlobStorageContext context;
BlobStorageHost host(&context);
- MessageLoop fake_io_message_loop;
+ base::MessageLoop fake_io_message_loop;
// Build up a basic blob.
const std::string kId("id");
@@ -58,7 +58,7 @@ TEST(BlobStorageContextTest, IncrementDecrementRef) {
TEST(BlobStorageContextTest, BlobDataHandle) {
BlobStorageContext context;
BlobStorageHost host(&context);
- MessageLoop fake_io_message_loop;
+ base::MessageLoop fake_io_message_loop;
// Build up a basic blob.
const std::string kId("id");
@@ -89,7 +89,7 @@ TEST(BlobStorageContextTest, CompoundBlobs) {
const std::string kId2("id2");
const std::string kId2Prime("id2.prime");
- MessageLoop fake_io_message_loop;
+ base::MessageLoop fake_io_message_loop;
// Setup a set of blob data for testing.
base::Time time1, time2;
@@ -134,7 +134,7 @@ TEST(BlobStorageContextTest, CompoundBlobs) {
TEST(BlobStorageContextTest, PublicBlobUrls) {
BlobStorageContext context;
BlobStorageHost host(&context);
- MessageLoop fake_io_message_loop;
+ base::MessageLoop fake_io_message_loop;
// Build up a basic blob.
const std::string kId("id");
@@ -166,7 +166,7 @@ TEST(BlobStorageContextTest, PublicBlobUrls) {
TEST(BlobStorageContextTest, HostCleanup) {
BlobStorageContext context;
scoped_ptr<BlobStorageHost> host(new BlobStorageHost(&context));
- MessageLoop fake_io_message_loop;
+ base::MessageLoop fake_io_message_loop;
// Build up a basic blob and register a url
const std::string kId("id");
@@ -185,7 +185,7 @@ TEST(BlobStorageContextTest, HostCleanup) {
TEST(BlobStorageContextTest, EarlyContextDeletion) {
scoped_ptr<BlobStorageContext> context(new BlobStorageContext);
BlobStorageHost host(context.get());
- MessageLoop fake_io_message_loop;
+ base::MessageLoop fake_io_message_loop;
// Deleting the context should not induce crashes.
context.reset();
diff --git a/webkit/browser/fileapi/transient_file_util_unittest.cc b/webkit/browser/fileapi/transient_file_util_unittest.cc
index 69d2c0a..58a8046 100644
--- a/webkit/browser/fileapi/transient_file_util_unittest.cc
+++ b/webkit/browser/fileapi/transient_file_util_unittest.cc
@@ -34,7 +34,7 @@ class TransientFileUtilTest : public testing::Test {
virtual void TearDown() OVERRIDE {
file_system_context_ = NULL;
- MessageLoop::current()->RunUntilIdle();
+ base::MessageLoop::current()->RunUntilIdle();
}
void CreateAndRegisterTemporaryFile(
@@ -65,7 +65,7 @@ class TransientFileUtilTest : public testing::Test {
FileSystemFileUtil* file_util() { return transient_file_util_.get(); }
private:
- MessageLoop message_loop_;
+ base::MessageLoop message_loop_;
base::ScopedTempDir data_dir_;
scoped_refptr<FileSystemContext> file_system_context_;
scoped_ptr<TransientFileUtil> transient_file_util_;
@@ -110,7 +110,7 @@ TEST_F(TransientFileUtilTest, TransientFile) {
}
// The file's now scoped out.
- MessageLoop::current()->RunUntilIdle();
+ base::MessageLoop::current()->RunUntilIdle();
// Now the temporary file and the transient filesystem must be gone too.
ASSERT_FALSE(file_util::PathExists(temp_path));