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

chrome/browser/protector/base_setting_change.h

 // 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.
 
 #ifndef CHROME_BROWSER_PROTECTOR_BASE_SETTING_CHANGE_H_
 #define CHROME_BROWSER_PROTECTOR_BASE_SETTING_CHANGE_H_
 #pragma once
 
 #include <utility>
 
@@ skipping 37 matching lines @@
   // Returns true if |this| is a result of merging some changes with |other|.
   virtual bool Contains(const BaseSettingChange* other) const;
 
   // 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.
   // Associates this change with |profile| instance so overrides must call the
   // base method.
   virtual bool Init(Profile* profile);
 
+  // Called instead of Init when ProtectorService is disabled. No other members
+  // are called in that case.
+  virtual void InitWhenDisabled(Profile* profile);

[sky, 2012/04/13 19:25:13]

It feels error prone to have the two distinct Init variants. How about passing
an enum to Init?

[Ivan Korotkov, 2012/04/13 20:16:38]

I specifically made them distinct functions because they do completely different
things and act in completely different scenarios (one is
Init-getters-Apply/Discard, the other just InitWhileDisabled).

+
   // Persists new setting if needed. |browser| is the Browser instance from
   // which the user action originates.
   virtual void Apply(Browser* browser);
 
   // Restores old setting if needed. |browser| is the Browser instance from
   // which the user action originates.
   virtual void Discard(Browser* browser);
 
   // Indicates that user has ignored this change and timeout has passed.
   virtual void Timeout();
@@ skipping 70 matching lines @@
     const SessionStartupPref& backup_startup_pref,
     const PinnedTabCodec::Tabs& backup_pinned_tabs);
 
 // Allocates and initializes BaseSettingChange implementation for an unknown
 // preferences change with invalid backup.
 BaseSettingChange* CreatePrefsBackupInvalidChange();
 
 }  // namespace protector
 
 #endif  // CHROME_BROWSER_PROTECTOR_BASE_SETTING_CHANGE_H_