| Index: content/browser/quota/mock_quota_manager_unittest.cc
|
| diff --git a/webkit/browser/quota/mock_quota_manager_unittest.cc b/content/browser/quota/mock_quota_manager_unittest.cc
|
| similarity index 96%
|
| rename from webkit/browser/quota/mock_quota_manager_unittest.cc
|
| rename to content/browser/quota/mock_quota_manager_unittest.cc
|
| index bb4db22ea05bbbc853a9ab64d557a94e7267a11f..19d1e9f33fbf279867f594e88f61703c89d60c97 100644
|
| --- a/webkit/browser/quota/mock_quota_manager_unittest.cc
|
| +++ b/content/browser/quota/mock_quota_manager_unittest.cc
|
| @@ -10,12 +10,17 @@
|
| #include "base/memory/scoped_ptr.h"
|
| #include "base/message_loop/message_loop_proxy.h"
|
| #include "base/run_loop.h"
|
| +#include "content/browser/quota/mock_quota_manager.h"
|
| #include "testing/gtest/include/gtest/gtest.h"
|
| -#include "webkit/browser/quota/mock_quota_manager.h"
|
| #include "webkit/browser/quota/mock_special_storage_policy.h"
|
| #include "webkit/browser/quota/mock_storage_client.h"
|
|
|
| -namespace quota {
|
| +using quota::kQuotaStatusOk;
|
| +using quota::kStorageTypePersistent;
|
| +using quota::kStorageTypeTemporary;
|
| +using quota::MockSpecialStoragePolicy;
|
| +
|
| +namespace content {
|
|
|
| const char kTestOrigin1[] = "http://host1:1/";
|
| const char kTestOrigin2[] = "http://host2:1/";
|
| @@ -76,7 +81,7 @@ class MockQuotaManagerTest : public testing::Test {
|
|
|
| void DeletedOriginData(QuotaStatusCode status) {
|
| ++deletion_callback_count_;
|
| - EXPECT_EQ(quota::kQuotaStatusOk, status);
|
| + EXPECT_EQ(kQuotaStatusOk, status);
|
| }
|
|
|
| int deletion_callback_count() const {
|
| @@ -219,4 +224,4 @@ TEST_F(MockQuotaManagerTest, ModifiedOrigins) {
|
| EXPECT_EQ(0UL, origins().count(kOrigin1));
|
| EXPECT_EQ(1UL, origins().count(kOrigin2));
|
| }
|
| -} // Namespace quota
|
| +} // Namespace content
|
|
|