Clean up pref change notification handling.

chrome/browser/prefs/testing_pref_store.h

Index: chrome/browser/prefs/testing_pref_store.h
diff --git a/chrome/browser/prefs/testing_pref_store.h b/chrome/browser/prefs/testing_pref_store.h
new file mode 100644
index 0000000000000000000000000000000000000000..17985557353d3163aaa37ca286df16a4109f3a62
--- /dev/null
+++ b/chrome/browser/prefs/testing_pref_store.h
@@ -0,0 +1,63 @@
+// Copyright (c) 2010 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_TESTING_PREF_STORE_H_
+#define CHROME_BROWSER_PREFS_TESTING_PREF_STORE_H_
+#pragma once
+
+#include "base/basictypes.h"
+#include "base/scoped_ptr.h"
+#include "chrome/common/pref_store_base.h"
+
+class DictionaryValue;
+
+// |TestingPrefStore| is a stub implementation of the |PrefStore| interface.
+// It allows to get and set the state of the |PrefStore| as well as triggering
+// notifications.
+class TestingPrefStore : public PrefStoreBase {
+ public:
+  TestingPrefStore();
+  virtual ~TestingPrefStore() {}
+
+  virtual DictionaryValue* prefs() const { return prefs_.get(); }
+
+  virtual PrefStore::PrefReadError ReadPrefs();
+
+  virtual bool ReadOnly() const { return read_only_; }
+
+  virtual bool WritePrefs();
+
+  // Getter and Setter methods for setting and getting the state of the
+  // |DummyPrefStore|.
+  virtual void set_read_only(bool read_only) { read_only_ = read_only; }
+  virtual void set_prefs(DictionaryValue* prefs) { prefs_.reset(prefs); }
+  virtual void set_prefs_written(bool status) { prefs_written_ = status; }
+  virtual bool get_prefs_written() { return prefs_written_; }
+
+  // Publish these functions so tests can call them from the outside.
+  void NotifyPrefValueChanged(const std::string& key);
+  void NotifyInitializationCompleted();

[danno, 2010/12/06 09:20:14]

Doesn't the compiler complain about name hiding here? In any case, is this
preferable to keeping them protected and making them accessible from the test
base?

[Mattias Nissler (ping if slow), 2010/12/06 10:58:12]

No name hiding problems, these are just regular overrides that happen to be
public. Added virtual modifiers to make this more obvious.

I don't like the friend declaration approach here. This code is meant to be
accessible to all tests that need it and since this class is exclusively here
for testing, I think we should design it so it's most useful for tests, i.e.
making these public.

+
+  // Whether the store has completed all asynchronous initialization.
+  virtual bool IsInitializationComplete() { return init_complete_; }
+
+  // Mark the store as having completed initialization.
+  void SetInitializationCompleted();
+
+ private:
+  scoped_ptr<DictionaryValue> prefs_;
+
+  // Flag that indicates if the PrefStore is read-only
+  bool read_only_;
+
+  // Flag that indicates if the method WritePrefs was called.
+  bool prefs_written_;
+
+  // Whether initialization has been completed.
+  bool init_complete_;
+
+  DISALLOW_COPY_AND_ASSIGN(TestingPrefStore);
+};
+
+#endif  // CHROME_BROWSER_PREFS_TESTING_PREF_STORE_H_