Protector bubble cancels itself if user changes default search engine manually.

chrome/browser/protector/base_setting_change.h

Index: chrome/browser/protector/base_setting_change.h
diff --git a/chrome/browser/protector/base_setting_change.h b/chrome/browser/protector/base_setting_change.h
index e53f7ebc0254c20031b78cef4af1792baf95d186..53f2518fab9ada6cc588bb6117555884cc96f49d 100644
--- a/chrome/browser/protector/base_setting_change.h
+++ b/chrome/browser/protector/base_setting_change.h
@@ -25,15 +25,21 @@ class BaseSettingChange {
   virtual ~BaseSettingChange();
 
   // Applies initial actions to the setting if needed. Must be called before
-  // any other calls are made, including text getters. Returns true if
-  // initialization was successful.
+  // any other calls are made, including text getters.
+  // Returns true if initialization was successful. Otherwise, no other
+  // calls should be made.
+  // Associates this change with |protector_| instance so overrides must
+  // call the base method.

[whywhat, 2011/11/21 14:51:21]

This method cries to be a ctor...

[Ivan Korotkov, 2011/11/21 15:27:38]

Kind of, but it's called asynchronously (to reset default SE).
We can call pass Protector to the real ctor so there will be no need to call it
from base.

   virtual bool Init(Protector* protector);
 
   // Persists new setting if needed.
-  virtual void Apply(Protector* protector);
+  virtual void Apply();
 
   // Restores old setting if needed.
-  virtual void Discard(Protector* protector);
+  virtual void Discard();
+
+  // Called before the change is removed from the protector instance.
+  virtual void OnBeforeRemoved() = 0;
 
   // Returns the wrench menu item and bubble title.
   virtual string16 GetBubbleTitle() const = 0;
@@ -48,7 +54,12 @@ class BaseSettingChange {
   // Returns text for the button to discard the change with |Discard|.
   virtual string16 GetDiscardButtonText() const = 0;
 
+  // Protector instance we've been associated with by an |Init| call.
+  Protector* protector() { return protector_; }
+
  private:
+  Protector* protector_;
+
   DISALLOW_COPY_AND_ASSIGN(BaseSettingChange);
 };