Move remaining non-test, non-Chrome-specific Prefs code to base/prefs/.

base/prefs/mock_pref_change_callback.h

 // Copyright (c) 2011 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_MOCK_PREF_CHANGE_CALLBACK_H_
-#define CHROME_BROWSER_PREFS_MOCK_PREF_CHANGE_CALLBACK_H_
+#ifndef BASE_PREFS_MOCK_PREF_CHANGE_CALLBACK_H_
+#define BASE_PREFS_MOCK_PREF_CHANGE_CALLBACK_H_
 
 #include <string>
 
+#include "base/prefs/pref_service.h"
 #include "base/prefs/public/pref_change_registrar.h"
-#include "chrome/browser/prefs/pref_service.h"
 #include "testing/gmock/include/gmock/gmock.h"
 
 using testing::Pointee;
 using testing::Property;
 using testing::Truly;
 
 // Matcher that checks whether the current value of the preference named
 // |pref_name| in |prefs| matches |value|. If |value| is NULL, the matcher
 // checks that the value is not set.
 MATCHER_P3(PrefValueMatches, prefs, pref_name, value, "") {
@@ skipping 20 matching lines @@
 
   MOCK_METHOD1(OnPreferenceChanged, void(const std::string&));
 
   void Expect(const std::string& pref_name,
               const Value* value);
 
  private:
   PrefServiceBase* prefs_;
 };
 
-#endif  // CHROME_BROWSER_PREFS_MOCK_PREF_CHANGE_CALLBACK_H_
+#endif  // BASE_PREFS_MOCK_PREF_CHANGE_CALLBACK_H_