Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(139)

Unified Diff: content/browser/fileapi/file_system_operation_impl_unittest.cc

Issue 214233005: Move mock_quota_manager and friends from webkit/ to content/ (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: nits Created 6 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/browser/fileapi/file_system_operation_impl_unittest.cc
diff --git a/content/browser/fileapi/file_system_operation_impl_unittest.cc b/content/browser/fileapi/file_system_operation_impl_unittest.cc
index 89a069782e8d1985597a59fe3a132165e556e67f..2f8e82ec0949814122c259d5e9e1251758a86b1a 100644
--- a/content/browser/fileapi/file_system_operation_impl_unittest.cc
+++ b/content/browser/fileapi/file_system_operation_impl_unittest.cc
@@ -13,6 +13,8 @@
#include "base/run_loop.h"
#include "base/strings/stringprintf.h"
#include "content/browser/fileapi/mock_file_change_observer.h"
+#include "content/browser/quota/mock_quota_manager.h"
+#include "content/browser/quota/mock_quota_manager_proxy.h"
#include "content/public/test/async_file_test_helper.h"
#include "content/public/test/sandbox_file_system_test_helper.h"
#include "testing/gtest/include/gtest/gtest.h"
@@ -22,8 +24,6 @@
#include "webkit/browser/fileapi/file_system_operation_context.h"
#include "webkit/browser/fileapi/file_system_operation_runner.h"
#include "webkit/browser/fileapi/sandbox_file_system_backend.h"
-#include "webkit/browser/quota/mock_quota_manager.h"
-#include "webkit/browser/quota/mock_quota_manager_proxy.h"
#include "webkit/browser/quota/quota_manager.h"
#include "webkit/browser/quota/quota_manager_proxy.h"
#include "webkit/common/blob/shareable_file_reference.h"
@@ -68,12 +68,12 @@ class FileSystemOperationImplTest
base::FilePath base_dir = base_.path().AppendASCII("filesystem");
quota_manager_ =
- new quota::MockQuotaManager(false /* is_incognito */,
+ new MockQuotaManager(false /* is_incognito */,
base_dir,
base::MessageLoopProxy::current().get(),
base::MessageLoopProxy::current().get(),
NULL /* special storage policy */);
- quota_manager_proxy_ = new quota::MockQuotaManagerProxy(
+ quota_manager_proxy_ = new MockQuotaManagerProxy(
quota_manager(), base::MessageLoopProxy::current().get());
sandbox_file_system_.SetUp(base_dir, quota_manager_proxy_.get());
sandbox_file_system_.AddFileChangeObserver(&change_observer_);
@@ -102,12 +102,12 @@ class FileSystemOperationImplTest
return shareable_file_ref_.get();
}
- quota::MockQuotaManager* quota_manager() {
- return static_cast<quota::MockQuotaManager*>(quota_manager_.get());
+ MockQuotaManager* quota_manager() {
+ return static_cast<MockQuotaManager*>(quota_manager_.get());
}
- quota::MockQuotaManagerProxy* quota_manager_proxy() {
- return static_cast<quota::MockQuotaManagerProxy*>(
+ MockQuotaManagerProxy* quota_manager_proxy() {
+ return static_cast<MockQuotaManagerProxy*>(
quota_manager_proxy_.get());
}

Powered by Google App Engine
This is Rietveld 408576698