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

base/prefs/overlay_user_pref_store.cc

 // 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.
 
-#include "chrome/browser/prefs/overlay_user_pref_store.h"
+#include "base/prefs/overlay_user_pref_store.h"
 
 #include "base/memory/scoped_ptr.h"
 #include "base/values.h"
 
 OverlayUserPrefStore::OverlayUserPrefStore(
     PersistentPrefStore* underlay)
     : underlay_(underlay) {
   underlay_->AddObserver(this);
 }
 
@@ skipping 161 matching lines @@
   NamesMap::const_iterator i =
       overlay_to_underlay_names_map_.find(overlay_key);
   return i != overlay_to_underlay_names_map_.end() ? i->second : overlay_key;
 }
 
 bool OverlayUserPrefStore::ShallBeStoredInOverlay(
     const std::string& key) const {
   return overlay_to_underlay_names_map_.find(key) !=
       overlay_to_underlay_names_map_.end();
 }