Move the bits of Prefs where production code has only trivially easy

base/prefs/public/pref_service_base.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.
 
 // This is the base interface for a preference services that provides
 // a way to access the application's current preferences.
 //
 // This base interface assumes all preferences are local.  See
 // SyncablePrefServiceBase for the interface to a preference service
 // that stores preferences that can be synced.
 //
 // Chromium settings and storage represent user-selected preferences and
 // information and MUST not be extracted, overwritten or modified except
 // through Chromium defined APIs.
 
-#ifndef CHROME_BROWSER_API_PREFS_PREF_SERVICE_BASE_H_
-#define CHROME_BROWSER_API_PREFS_PREF_SERVICE_BASE_H_
+#ifndef BASE_PREFS_PUBLIC_PREF_SERVICE_BASE_H_
+#define BASE_PREFS_PUBLIC_PREF_SERVICE_BASE_H_
 
 #include "base/values.h"
 
 namespace content {
 class BrowserContext;
 class NotificationObserver;
 }
 
 namespace subtle {
 class PrefMemberBase;
 }
 
 class FilePath;
 class Profile;
 class TabContents;
 
 class PrefServiceBase {

[Mattias Nissler (ping if slow), 2012/10/22 15:03:12]

Just to verify: I guess the plan is to reconcile PrefService and PrefServiceBase
after the PrefService refactor?

[Jói, 2012/10/22 15:31:58]

Yes, once dependencies back to chrome/ have been broken.

  public:
   // Retrieves a PrefServiceBase for the given context.
   static PrefServiceBase* FromBrowserContext(content::BrowserContext* context);
 
   virtual ~PrefServiceBase() {}
 
   // Enum used when registering preferences to determine if it should be synced
   // or not. This is only used for profile prefs, not local state prefs.
   // See the Register*Pref methods for profile prefs below.
   enum PrefSyncStatus {
@@ skipping 217 matching lines @@
   // If the pref at the given path changes, we call the observer's Observe
   // method with PREF_CHANGED. Note that observers should not call these methods
   // directly but rather use a PrefChangeRegistrar to make sure the observer
   // gets cleaned up properly.
   virtual void AddPrefObserver(const char* path,
                                content::NotificationObserver* obs) = 0;
   virtual void RemovePrefObserver(const char* path,
                                   content::NotificationObserver* obs) = 0;
 };
 
-#endif  // CHROME_BROWSER_API_PREFS_PREF_SERVICE_BASE_H_
+#endif  // BASE_PREFS_PUBLIC_PREF_SERVICE_BASE_H_