summaryrefslogtreecommitdiffstats
path: root/chrome/browser
diff options
context:
space:
mode:
authormarkusheintz@chromium.org <markusheintz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-04-16 07:53:49 +0000
committermarkusheintz@chromium.org <markusheintz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-04-16 07:53:49 +0000
commit531f61f6cda3855ac5108cdbf27e9f9422ed87b6 (patch)
treeb4a6929867c39ebb655df4eb9ec1a43d39aa01d3 /chrome/browser
parent7af1b2287d01986be6f2e74d177bed991ec58b98 (diff)
downloadchromium_src-531f61f6cda3855ac5108cdbf27e9f9422ed87b6.zip
chromium_src-531f61f6cda3855ac5108cdbf27e9f9422ed87b6.tar.gz
chromium_src-531f61f6cda3855ac5108cdbf27e9f9422ed87b6.tar.bz2
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
Diffstat (limited to 'chrome/browser')
-rw-r--r--chrome/browser/browsing_data_cookie_helper.cc5
-rw-r--r--chrome/browser/browsing_data_cookie_helper.h3
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<BrowsingDataCookieHelper>;
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);
};