Index: webkit/fileapi/file_system_operation_unittest.cc |
diff --git a/webkit/fileapi/file_system_operation_unittest.cc b/webkit/fileapi/file_system_operation_unittest.cc |
index 20bf57744437579d93683b0c30d9af29a983168a..9eabd5e24f5e269c6caa5056639d642aa053859e 100644 |
--- a/webkit/fileapi/file_system_operation_unittest.cc |
+++ b/webkit/fileapi/file_system_operation_unittest.cc |
@@ -62,8 +62,12 @@ class MockQuotaManager : public QuotaManager { |
callback.Run(quota::kQuotaStatusOk, usage_, quota_); |
} |
+ protected: |
+ virtual ~MockQuotaManager() {} |
+ |
private: |
friend class MockQuotaManagerProxy; |
+ |
void SetQuota(const GURL& origin, StorageType type, int64 quota) { |
EXPECT_EQ(origin_, origin); |
EXPECT_EQ(type_, type); |
@@ -97,10 +101,6 @@ class MockQuotaManagerProxy : public QuotaManagerProxy { |
registered_client_(NULL) { |
} |
- virtual ~MockQuotaManagerProxy() { |
- EXPECT_FALSE(registered_client_); |
- } |
- |
virtual void RegisterClient(QuotaClient* client) OVERRIDE { |
EXPECT_FALSE(registered_client_); |
registered_client_ = client; |
@@ -140,10 +140,16 @@ class MockQuotaManagerProxy : public QuotaManagerProxy { |
mock_manager()->SetQuota(origin, type, quota); |
} |
+ protected: |
+ virtual ~MockQuotaManagerProxy() { |
+ EXPECT_FALSE(registered_client_); |
+ } |
+ |
private: |
MockQuotaManager* mock_manager() const { |
return static_cast<MockQuotaManager*>(quota_manager()); |
} |
+ |
QuotaClient* registered_client_; |
}; |