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

chrome/browser/extensions/extension_pref_value_map.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.
 
 #ifndef CHROME_BROWSER_EXTENSIONS_EXTENSION_PREF_VALUE_MAP_H_
 #define CHROME_BROWSER_EXTENSIONS_EXTENSION_PREF_VALUE_MAP_H_
 
 #include <map>
 #include <set>
 #include <string>
 
 #include "base/observer_list.h"
+#include "base/prefs/pref_value_map.h"
 #include "base/time.h"
 #include "base/values.h"
-#include "chrome/browser/prefs/pref_value_map.h"
+#include "chrome/browser/extensions/extension_prefs_scope.h"
 #include "chrome/browser/profiles/profile_keyed_service.h"
-#include "chrome/browser/extensions/extension_prefs_scope.h"
 
 // Non-persistent data container that is shared by ExtensionPrefStores. All
 // extension pref values (incognito and regular) are stored herein and
 // provided to ExtensionPrefStores.
 //
 // The semantics of the ExtensionPrefValueMap are:
 // - A regular setting applies to regular browsing sessions as well as incognito
 //   browsing sessions.
 // - An incognito setting applies only to incognito browsing sessions, not to
 //   regular ones. It takes precedence over a regular setting set by the same
@@ skipping 156 matching lines @@
   // being destroyed. In tests, it isn't called, so the notification must
   // be done in the destructor. This bit tracks whether it has been done yet.
   bool destroyed_;
 
   ObserverList<Observer, true> observers_;
 
   DISALLOW_COPY_AND_ASSIGN(ExtensionPrefValueMap);
 };
 
 #endif  // CHROME_BROWSER_EXTENSIONS_EXTENSION_PREF_VALUE_MAP_H_