[protector] Refactoring of --no-protector code.

chrome/browser/protector/protector_service.cc

 // 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/protector_service.h"
 
 #include "base/logging.h"
 #include "chrome/browser/google/google_util.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/protector/composite_settings_change.h"
 #include "chrome/browser/protector/keys.h"
 #include "chrome/browser/protector/protected_prefs_watcher.h"
+#include "chrome/browser/protector/protector_utils.h"
 #include "chrome/browser/protector/settings_change_global_error.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/pref_names.h"
 #include "content/public/browser/notification_source.h"
 #include "net/base/registry_controlled_domain.h"
 
 namespace protector {
 
 namespace {
@@ skipping 16 matching lines @@
   // Start observing pref changes.
   prefs_watcher_.reset(new ProtectedPrefsWatcher(profile));
 }
 
 ProtectorService::~ProtectorService() {
   DCHECK(!IsShowingChange());  // Should have been dismissed by Shutdown.
 }
 
 void ProtectorService::ShowChange(BaseSettingChange* change) {
   DCHECK(change);
+  // Change instance will either be owned by |this| or deleted after this call.
+  scoped_ptr<BaseSettingChange> change_ptr(change);
 
   DVLOG(1) << "Init change";
-  if (!change->Init(profile_)) {
+  if (!protector::IsEnabled()) {
+    change_ptr->InitWhenDisabled(profile_);
+    return;
+  } else if (!change_ptr->Init(profile_)) {
     LOG(WARNING) << "Error while initializing, dismissing change";
-    delete change;
     return;
   }
 
-  Item* item_to_merge_with = FindItemToMergeWith(change);
+  Item* item_to_merge_with = FindItemToMergeWith(change_ptr.get());
   if (item_to_merge_with) {
     // CompositeSettingsChange takes ownership of merged changes.
     BaseSettingChange* existing_change = item_to_merge_with->change.release();
-    CompositeSettingsChange* merged_change = existing_change->MergeWith(change);
+    CompositeSettingsChange* merged_change =
+        existing_change->MergeWith(change_ptr.release());
     item_to_merge_with->change.reset(merged_change);
     item_to_merge_with->was_merged = true;
     if (item_to_merge_with->error->GetBubbleView())
       item_to_merge_with->show_when_merged = true;
     // Remove old GlobalError instance. Later in OnRemovedFromProfile() a new
     // GlobalError instance will be created for the composite change.
     item_to_merge_with->error->RemoveFromProfile();
   } else {
     Item new_item;
     SettingsChangeGlobalError* error =
-        new SettingsChangeGlobalError(change, this);
+        new SettingsChangeGlobalError(change_ptr.get(), this);
     new_item.error.reset(error);
-    new_item.change.reset(change);
+    new_item.change.reset(change_ptr.release());
     items_.push_back(new_item);
     // Do not show the bubble immediately if another one is active.
     error->AddToProfile(profile_, !has_active_change_);
     has_active_change_ = true;
   }
 }
 
 bool ProtectorService::IsShowingChange() const {
   return !items_.empty();
 }
@@ skipping 119 matching lines @@
 ProtectorService::MatchItemByError::MatchItemByError(
     const SettingsChangeGlobalError* other) : other_(other) {
 }
 
 bool ProtectorService::MatchItemByError::operator()(
     const ProtectorService::Item& item) {
   return other_ == item.error.get();
 }
 
 }  // namespace protector