Index: net/cookies/cookie_monster_store_test.cc |
diff --git a/net/cookies/cookie_monster_store_test.cc b/net/cookies/cookie_monster_store_test.cc |
index 822aacc96bbd4f9f1b8855d7167813269d641bd7..f347e8d53b9b75d5fea7c43e470553fea909d93e 100644 |
--- a/net/cookies/cookie_monster_store_test.cc |
+++ b/net/cookies/cookie_monster_store_test.cc |
@@ -25,8 +25,6 @@ MockPersistentCookieStore::MockPersistentCookieStore() |
loaded_(false) { |
} |
-MockPersistentCookieStore::~MockPersistentCookieStore() {} |
- |
void MockPersistentCookieStore::SetLoadExpectation( |
bool return_value, |
const std::vector<CookieMonster::CanonicalCookie*>& result) { |
@@ -85,6 +83,8 @@ void |
MockPersistentCookieStore::SetClearLocalStateOnExit(bool clear_local_state) { |
} |
+MockPersistentCookieStore::~MockPersistentCookieStore() {} |
+ |
MockCookieMonsterDelegate::MockCookieMonsterDelegate() {} |
void MockCookieMonsterDelegate::OnCookieChanged( |
@@ -97,18 +97,6 @@ void MockCookieMonsterDelegate::OnCookieChanged( |
MockCookieMonsterDelegate::~MockCookieMonsterDelegate() {} |
-void AddCookieToList( |
- const std::string& key, |
- const std::string& cookie_line, |
- const base::Time& creation_time, |
- std::vector<CookieMonster::CanonicalCookie*>* out_list) { |
- scoped_ptr<CookieMonster::CanonicalCookie> cookie( |
- new CookieMonster::CanonicalCookie( |
- BuildCanonicalCookie(key, cookie_line, creation_time))); |
- |
- out_list->push_back(cookie.release()); |
-} |
- |
CookieMonster::CanonicalCookie BuildCanonicalCookie( |
const std::string& key, |
const std::string& cookie_line, |
@@ -135,10 +123,21 @@ CookieMonster::CanonicalCookie BuildCanonicalCookie( |
!cookie_expires.is_null(), !cookie_expires.is_null()); |
} |
-MockSimplePersistentCookieStore::MockSimplePersistentCookieStore() |
- : loaded_(false) {} |
+void AddCookieToList( |
+ const std::string& key, |
+ const std::string& cookie_line, |
+ const base::Time& creation_time, |
+ std::vector<CookieMonster::CanonicalCookie*>* out_list) { |
+ scoped_ptr<CookieMonster::CanonicalCookie> cookie( |
+ new CookieMonster::CanonicalCookie( |
+ BuildCanonicalCookie(key, cookie_line, creation_time))); |
-MockSimplePersistentCookieStore::~MockSimplePersistentCookieStore() {} |
+ out_list->push_back(cookie.release()); |
+} |
+ |
+MockSimplePersistentCookieStore::MockSimplePersistentCookieStore() |
+ : loaded_(false) { |
+} |
void MockSimplePersistentCookieStore::Load( |
const LoadedCallback& loaded_callback) { |
@@ -228,4 +227,6 @@ CookieMonster* CreateMonsterFromStoreForGC( |
return new CookieMonster(store, NULL); |
} |
+MockSimplePersistentCookieStore::~MockSimplePersistentCookieStore() {} |
+ |
} // namespace net |