From 531f61f6cda3855ac5108cdbf27e9f9422ed87b6 Mon Sep 17 00:00:00 2001 From: "markusheintz@chromium.org" Date: Mon, 16 Apr 2012 07:53:49 +0000 Subject: Remove duplicated |profile_| attribute in |CannedBrowsingDataCookieHelper|. BUG=none TEST=BrowsingDataCookieHelperTest.Canned* Review URL: https://chromiumcodereview.appspot.com/10084009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@132380 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/browser/browsing_data_cookie_helper.cc | 5 ++--- chrome/browser/browsing_data_cookie_helper.h | 3 +-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/chrome/browser/browsing_data_cookie_helper.cc b/chrome/browser/browsing_data_cookie_helper.cc index 18054a3..97bf2ac 100644 --- a/chrome/browser/browsing_data_cookie_helper.cc +++ b/chrome/browser/browsing_data_cookie_helper.cc @@ -90,8 +90,7 @@ void BrowsingDataCookieHelper::DeleteCookieOnIOThread( CannedBrowsingDataCookieHelper::CannedBrowsingDataCookieHelper( Profile* profile) - : BrowsingDataCookieHelper(profile), - profile_(profile) { + : BrowsingDataCookieHelper(profile) { } CannedBrowsingDataCookieHelper::~CannedBrowsingDataCookieHelper() {} @@ -99,7 +98,7 @@ CannedBrowsingDataCookieHelper::~CannedBrowsingDataCookieHelper() {} CannedBrowsingDataCookieHelper* CannedBrowsingDataCookieHelper::Clone() { DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); CannedBrowsingDataCookieHelper* clone = - new CannedBrowsingDataCookieHelper(profile_); + new CannedBrowsingDataCookieHelper(profile()); clone->cookie_list_ = cookie_list_; return clone; diff --git a/chrome/browser/browsing_data_cookie_helper.h b/chrome/browser/browsing_data_cookie_helper.h index 2ef0512..4130748 100644 --- a/chrome/browser/browsing_data_cookie_helper.h +++ b/chrome/browser/browsing_data_cookie_helper.h @@ -43,6 +43,7 @@ class BrowsingDataCookieHelper protected: friend class base::RefCountedThreadSafe; virtual ~BrowsingDataCookieHelper(); + Profile* profile() { return profile_; } private: // Fetch the cookies. This must be called in the IO thread. @@ -118,8 +119,6 @@ class CannedBrowsingDataCookieHelper : public BrowsingDataCookieHelper { net::CookieList cookie_list_; - Profile* profile_; - DISALLOW_COPY_AND_ASSIGN(CannedBrowsingDataCookieHelper); }; -- cgit v1.1