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

chrome/browser/protector/settings_change_global_error.cc

 // Copyright (c) 2011 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/settings_change_global_error.h"
 
 #include "base/bind.h"
 #include "base/compiler_specific.h"
 #include "base/logging.h"
 #include "base/stl_util.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/profiles/profile.h"
+#include "chrome/browser/protector/base_setting_change.h"
 #include "chrome/browser/protector/settings_change_global_error_delegate.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/global_error_service.h"
 #include "chrome/browser/ui/global_error_service_factory.h"
 #include "content/public/browser/browser_thread.h"
 
 using content::BrowserThread;
 
 namespace protector {
 
@@ skipping 73 matching lines @@
 }
 
 void SettingsChangeGlobalError::BubbleViewCancelButtonPressed() {
   closed_by_button_ = true;
   delegate_->OnApplyChange();
 }
 
 void SettingsChangeGlobalError::RemoveFromProfile() {
   if (profile_)
     GlobalErrorServiceFactory::GetForProfile(profile_)->RemoveGlobalError(this);
-  if (!closed_by_button_)
-    delegate_->OnDecisionTimeout();
   delegate_->OnRemovedFromProfile();
 }
 
 void SettingsChangeGlobalError::BubbleViewDidClose() {
   browser_ = NULL;
   if (!closed_by_button_) {
     BrowserThread::PostDelayedTask(
         BrowserThread::UI, FROM_HERE,
-        base::Bind(&SettingsChangeGlobalError::RemoveFromProfile,
+        base::Bind(&SettingsChangeGlobalError::OnInactiveTimeout,
                    weak_factory_.GetWeakPtr()),
         kMenuItemDisplayPeriodMs);
   } else {
     RemoveFromProfile();
   }
 }
 
 void SettingsChangeGlobalError::ShowForProfile(Profile* profile) {
   if (BrowserThread::CurrentlyOn(BrowserThread::UI)) {
     AddToProfile(profile);
@@ skipping 14 matching lines @@
 }
 
 void SettingsChangeGlobalError::Show() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK(profile_);
   browser_ = BrowserList::GetLastActiveWithProfile(profile_);
   if (browser_)
     ShowBubbleView(browser_);
 }
 
+void SettingsChangeGlobalError::OnInactiveTimeout() {
+  delegate_->OnDecisionTimeout();
+  RemoveFromProfile();
+}
+
 }  // namespace protector