summaryrefslogtreecommitdiffstats
path: root/chrome/browser/protector/base_setting_change.cc
diff options
context:
space:
mode:
authorivankr@chromium.org <ivankr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-01-18 09:36:22 +0000
committerivankr@chromium.org <ivankr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-01-18 09:36:22 +0000
commit63b59a811e7eb68625da7c94085e85c3b19f6fd0 (patch)
tree4a65027dc6f1d4e176b74ec534df46c061aa65e3 /chrome/browser/protector/base_setting_change.cc
parentd399866c2fe77410afed5be486f2b72581823bed (diff)
downloadchromium_src-63b59a811e7eb68625da7c94085e85c3b19f6fd0.zip
chromium_src-63b59a811e7eb68625da7c94085e85c3b19f6fd0.tar.gz
chromium_src-63b59a811e7eb68625da7c94085e85c3b19f6fd0.tar.bz2
Initial set of browser_tests for Protector and DefaultSearchProviderChange.
Some slight changes is Protector/BaseSettingChange: removed the OnBeforeRemoved callback (without calling any callback before the removal). BUG=None TEST=browser_tests:ProtectorTest.*,browser_tests:DefaultSearchProviderChange.* Review URL: https://chromiumcodereview.appspot.com/9236001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@118083 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/protector/base_setting_change.cc')
-rw-r--r--chrome/browser/protector/base_setting_change.cc11
1 files changed, 6 insertions, 5 deletions
diff --git a/chrome/browser/protector/base_setting_change.cc b/chrome/browser/protector/base_setting_change.cc
index acd04ac..a622db0 100644
--- a/chrome/browser/protector/base_setting_change.cc
+++ b/chrome/browser/protector/base_setting_change.cc
@@ -1,15 +1,17 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#include "chrome/browser/protector/base_setting_change.h"
#include "base/logging.h"
+#include "chrome/browser/protector/protector.h"
namespace protector {
BaseSettingChange::BaseSettingChange()
- : protector_(NULL) {
+ : profile_(NULL),
+ protector_(NULL) {
}
BaseSettingChange::~BaseSettingChange() {
@@ -18,6 +20,8 @@ BaseSettingChange::~BaseSettingChange() {
bool BaseSettingChange::Init(Protector* protector) {
DCHECK(protector);
protector_ = protector;
+ profile_ = protector->profile();
+ DCHECK(profile_);
return true;
}
@@ -30,7 +34,4 @@ void BaseSettingChange::Discard() {
void BaseSettingChange::Timeout() {
}
-void BaseSettingChange::OnBeforeRemoved() {
-}
-
} // namespace protector