| Index: net/cookies/cookie_monster.h
|
| diff --git a/net/cookies/cookie_monster.h b/net/cookies/cookie_monster.h
|
| index 94120a8fb0d648d3c9930903e858725a95c8d793..ea448c5a7d8d599317f39b526c9ce0ea7af25a8d 100644
|
| --- a/net/cookies/cookie_monster.h
|
| +++ b/net/cookies/cookie_monster.h
|
| @@ -146,8 +146,9 @@ class NET_EXPORT CookieMonster : public CookieStore {
|
| CookieMonsterDelegate* delegate,
|
| int last_access_threshold_milliseconds);
|
|
|
| - // Helper function that adds all cookies from |list| into this instance.
|
| - bool InitializeFrom(const CookieList& list);
|
| + // Helper function that adds all cookies from |list| into this instance,
|
| + // overwriting any equivalent cookies.
|
| + bool ImportCookies(const CookieList& list);
|
|
|
| typedef base::Callback<void(const CookieList& cookies)> GetCookieListCallback;
|
| typedef base::Callback<void(bool success)> DeleteCookieCallback;
|
|
|