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

Unified Diff: content/browser/fileapi/copy_or_move_operation_delegate_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/copy_or_move_operation_delegate_unittest.cc
diff --git a/content/browser/fileapi/copy_or_move_operation_delegate_unittest.cc b/content/browser/fileapi/copy_or_move_operation_delegate_unittest.cc
index d5192a815101aed4fe3af345599448e9e26b620a..1ddb05b84184e126b86f9999090a15cc4f733248 100644
--- a/content/browser/fileapi/copy_or_move_operation_delegate_unittest.cc
+++ b/content/browser/fileapi/copy_or_move_operation_delegate_unittest.cc
@@ -12,6 +12,8 @@
#include "base/message_loop/message_loop.h"
#include "base/run_loop.h"
#include "base/stl_util.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/test_file_system_backend.h"
#include "content/public/test/test_file_system_context.h"
@@ -25,8 +27,6 @@
#include "webkit/browser/fileapi/file_system_context.h"
#include "webkit/browser/fileapi/file_system_operation.h"
#include "webkit/browser/fileapi/file_system_url.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/common/fileapi/file_system_util.h"
@@ -194,12 +194,12 @@ class CopyOrMoveOperationTestHelper {
ASSERT_TRUE(base_.CreateUniqueTempDir());
base::FilePath base_dir = base_.path();
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_.get(), base::MessageLoopProxy::current().get());
file_system_context_ =
CreateFileSystemContextForTesting(quota_manager_proxy_.get(), base_dir);
@@ -392,8 +392,8 @@ class CopyOrMoveOperationTestHelper {
base::MessageLoopForIO message_loop_;
scoped_refptr<fileapi::FileSystemContext> file_system_context_;
- scoped_refptr<quota::MockQuotaManagerProxy> quota_manager_proxy_;
- scoped_refptr<quota::MockQuotaManager> quota_manager_;
+ scoped_refptr<MockQuotaManagerProxy> quota_manager_proxy_;
+ scoped_refptr<MockQuotaManager> quota_manager_;
DISALLOW_COPY_AND_ASSIGN(CopyOrMoveOperationTestHelper);
};
« no previous file with comments | « content/browser/appcache/appcache_storage_unittest.cc ('k') | content/browser/fileapi/file_system_context_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698