Sanitize PrefStore interface.

chrome/browser/prefs/pref_change_registrar_unittest.cc

 // 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.
 
 #include "chrome/browser/prefs/pref_change_registrar.h"
 #include "chrome/common/notification_details.h"
 #include "chrome/common/notification_observer_mock.h"
 #include "chrome/common/notification_source.h"
 #include "chrome/common/notification_type.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/test/testing_pref_service.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using testing::Mock;
 using testing::Eq;
 
+namespace {
+
 // A mock provider that allows us to capture pref observer changes.
 class MockPrefService : public TestingPrefService {

[danno, 2010/12/08 13:08:45]

Choice of mock name if you clean up the other Mock/PrefService/Mock.

[Mattias Nissler (ping if slow), 2010/12/09 10:20:20]

Doesn't apply any longer.

  public:
   MockPrefService() {}
   virtual ~MockPrefService() {};
 
   MOCK_METHOD2(AddPrefObserver, void(const char*, NotificationObserver*));
   MOCK_METHOD2(RemovePrefObserver, void(const char*, NotificationObserver*));
 };
 
+}  // namespace
+
 class PrefChangeRegistrarTest : public testing::Test {
  public:
   PrefChangeRegistrarTest() {}
   virtual ~PrefChangeRegistrarTest() {}
 
  protected:
   virtual void SetUp();
 
   NotificationObserver* observer() const { return observer_.get(); }
   MockPrefService* service() const { return service_.get(); }
@@ skipping 68 matching lines @@
               RemovePrefObserver(Eq(std::string("test.pref.1")), observer()));
   EXPECT_CALL(*service(),
               RemovePrefObserver(Eq(std::string("test.pref.2")), observer()));
   registrar.RemoveAll();
   EXPECT_TRUE(registrar.IsEmpty());
 
   // Explicitly check the expectations now to make sure that the RemoveAll
   // worked (rather than the registrar destructor doing the work).
   Mock::VerifyAndClearExpectations(service());
 }