Changes requested by gab for previously committed CLs.

chrome/browser/prefs/tracked/segregated_pref_store.h

 // Copyright 2014 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_PREFS_TRACKED_SEGREGATED_PREF_STORE_H_
 #define CHROME_BROWSER_PREFS_TRACKED_SEGREGATED_PREF_STORE_H_
 
 #include <set>
 
 #include "base/callback.h"
@@ skipping 19 matching lines @@
 //     read-only state are the boolean OR of the underlying stores' properties.
 class SegregatedPrefStore : public PersistentPrefStore {
  public:
   // Creates an instance that delegates to |selected_pref_store| for the
   // preferences named in |selected_pref_names| and to |default_pref_store|
   // for all others. If an unselected preference is present in
   // |selected_pref_store| (i.e. because it was previously selected) it will
   // be migrated back to |default_pref_store| upon access via a non-const
   // method.
   // |on_initialization| will be invoked when both stores have been initialized,
-  // before observers of the combined store are notified.
+  // before observers of the SegregatedPrefStore store are notified.
   SegregatedPrefStore(
       const scoped_refptr<PersistentPrefStore>& default_pref_store,
       const scoped_refptr<PersistentPrefStore>& selected_pref_store,
       const std::set<std::string>& selected_pref_names,
       const base::Closure& on_initialization);
 
   // PrefStore implementation
   virtual void AddObserver(Observer* observer) OVERRIDE;
   virtual void RemoveObserver(Observer* observer) OVERRIDE;
   virtual bool HasObservers() const OVERRIDE;
@@ skipping 54 matching lines @@
   base::Closure on_initialization_;
 
   scoped_ptr<PersistentPrefStore::ReadErrorDelegate> read_error_delegate_;
   ObserverList<PrefStore::Observer, true> observers_;
   AggregatingObserver aggregating_observer_;
 
   DISALLOW_COPY_AND_ASSIGN(SegregatedPrefStore);
 };
 
 #endif  // CHROME_BROWSER_PREFS_TRACKED_SEGREGATED_PREF_STORE_H_