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

chrome/browser/chromeos/settings/device_settings_provider.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_CHROMEOS_SETTINGS_DEVICE_SETTINGS_PROVIDER_H_
 #define CHROME_BROWSER_CHROMEOS_SETTINGS_DEVICE_SETTINGS_PROVIDER_H_
 
 #include <deque>
 #include <string>
 #include <utility>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/callback_forward.h"
 #include "base/gtest_prod_util.h"
 #include "base/memory/weak_ptr.h"
+#include "base/prefs/pref_value_map.h"
+#include "base/prefs/pref_value_map.h"

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

I guess I should have realized that one include is enough when I put this in...
Care to fix? ;)

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

Done.

 #include "chrome/browser/chromeos/settings/cros_settings_provider.h"
 #include "chrome/browser/chromeos/settings/device_settings_service.h"
 #include "chrome/browser/policy/proto/chrome_device_policy.pb.h"
-#include "chrome/browser/prefs/pref_value_map.h"
-#include "chrome/browser/prefs/pref_value_map.h"
 
 namespace base {
 class Value;
 }
 
 namespace enterprise_management {
 class ChromeDeviceSettingsProto;
 }  // namespace enterprise_management
 
 namespace chromeos {
@@ skipping 125 matching lines @@
                            InitializationTestUnowned);
   FRIEND_TEST_ALL_PREFIXES(DeviceSettingsProviderTest,
                            PolicyFailedPermanentlyNotification);
   FRIEND_TEST_ALL_PREFIXES(DeviceSettingsProviderTest, PolicyLoadNotification);
   DISALLOW_COPY_AND_ASSIGN(DeviceSettingsProvider);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_SETTINGS_DEVICE_SETTINGS_PROVIDER_H_