Index: chrome/test/testing_profile.cc |
diff --git a/chrome/test/testing_profile.cc b/chrome/test/testing_profile.cc |
index d1087c5bcae7519d491b5a86c1f580127229eedb..933ba36179d81e87b30375f85abb7099d4033adb 100644 |
--- a/chrome/test/testing_profile.cc |
+++ b/chrome/test/testing_profile.cc |
@@ -59,6 +59,7 @@ |
#include "webkit/database/database_tracker.h" |
#include "webkit/fileapi/file_system_context.h" |
#include "webkit/quota/quota_manager.h" |
+#include "webkit/quota/mock_quota_manager.h" |
using base::Time; |
using testing::NiceMock; |
@@ -544,7 +545,15 @@ fileapi::FileSystemContext* TestingProfile::GetFileSystemContext() { |
} |
quota::QuotaManager* TestingProfile::GetQuotaManager() { |
- return NULL; |
+ if (!quota_manager_) { |
+ quota_manager_ = new quota::MockQuotaManager( |
michaeln
2011/07/26 22:40:19
Returning a non-null object is going to have some
Mike West
2011/07/27 12:49:18
Fair enough. I wanted to move as much boilerplate
|
+ IsOffTheRecord(), |
+ GetPath(), |
+ BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO), |
+ BrowserThread::GetMessageLoopProxyForThread(BrowserThread::DB), |
+ GetExtensionSpecialStoragePolicy()); |
+ } |
+ return quota_manager_.get(); |
} |
BrowserSignin* TestingProfile::GetBrowserSignin() { |