Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / content / browser / indexed_db / indexed_db_quota_client_unittest.cc

diff --git a/src/content/browser/indexed_db/indexed_db_quota_client_unittest.cc b/src/content/browser/indexed_db/indexed_db_quota_client_unittest.cc
index cd2f146..54ce775 100644 (file)
--- a/src/content/browser/indexed_db/indexed_db_quota_client_unittest.cc
+++ b/src/content/browser/indexed_db/indexed_db_quota_client_unittest.cc
@@ -14,11 +14,11 @@
 #include "content/browser/browser_thread_impl.h"
 #include "content/browser/indexed_db/indexed_db_context_impl.h"
 #include "content/browser/indexed_db/indexed_db_quota_client.h"
+#include "content/browser/quota/mock_quota_manager.h"
 #include "content/public/browser/storage_partition.h"
 #include "content/public/test/test_browser_context.h"
 #include "content/public/test/test_browser_thread_bundle.h"
 #include "testing/gtest/include/gtest/gtest.h"
-#include "webkit/browser/quota/mock_quota_manager.h"
 #include "webkit/common/database/database_identifier.h"
 
 // Declared to shorten the line lengths.
@@ -44,7 +44,7 @@ class IndexedDBQuotaClientTest : public testing::Test {
     browser_context_.reset(new TestBrowserContext());
 
     scoped_refptr<quota::QuotaManager> quota_manager =
-        new quota::MockQuotaManager(
+        new MockQuotaManager(
             false /*in_memory*/,
             browser_context_->GetPath(),
             base::MessageLoop::current()->message_loop_proxy(),
@@ -135,7 +135,7 @@ class IndexedDBQuotaClientTest : public testing::Test {
 
   void SetFileSizeTo(const base::FilePath& path, int size) {
     std::string junk(size, 'a');
-    ASSERT_EQ(size, file_util::WriteFile(path, junk.c_str(), size));
+    ASSERT_EQ(size, base::WriteFile(path, junk.c_str(), size));
   }
 
   void AddFakeIndexedDB(const GURL& origin, int size) {