diff options
156 files changed, 278 insertions, 231 deletions
@@ -569,6 +569,10 @@ include_rules = [ # this should probably change. "+unicode", "+testing", + + # Until we finish breaking dependencies of base/prefs back to chrome/, + # don't try to use it (unless you're in chrome/). + "-base/prefs", ] diff --git a/base/prefs/DEPS b/base/prefs/DEPS new file mode 100644 index 0000000..ab1b336 --- /dev/null +++ b/base/prefs/DEPS @@ -0,0 +1,18 @@ +include_rules = [ + # Will move to base/ + "+chrome/common/important_file_writer.h", +] + +specific_include_rules = { + '.*_[a-z]+test\.cc': [ + "!chrome/common/chrome_notification_types.h", + "!chrome/common/chrome_paths.h", + "!chrome/common/important_file_writer.h", + "!chrome/common/pref_names.h", + "!chrome/test/base/testing_pref_service.h", + "!content/public/browser/notification_details.h", + "!content/public/browser/notification_source.h", + "!content/public/browser/notification_types.h", + "!content/public/test/mock_notification_observer.h", + ], +} diff --git a/base/prefs/README b/base/prefs/README new file mode 100644 index 0000000..a49604e --- /dev/null +++ b/base/prefs/README @@ -0,0 +1,10 @@ +Prefs is a general-purpose key-value store for application preferences. + +At the moment, src/base/prefs has a bunch of dependencies back to +src/chrome, and thus should only be used by code under src/chrome. + +We are working to remove these dependencies; once we do so, +src/base/prefs will be available as a separate module, 'base_prefs', +from src/base/base.gyp. + +Until that happens, please do not try to reuse outside of chrome/. diff --git a/chrome/browser/prefs/default_pref_store.cc b/base/prefs/default_pref_store.cc index 3e084d7..c031221 100644 --- a/chrome/browser/prefs/default_pref_store.cc +++ b/base/prefs/default_pref_store.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/prefs/default_pref_store.h" +#include "base/prefs/default_pref_store.h" using base::Value; diff --git a/chrome/browser/prefs/default_pref_store.h b/base/prefs/default_pref_store.h index acea51e..90d83f0 100644 --- a/chrome/browser/prefs/default_pref_store.h +++ b/base/prefs/default_pref_store.h @@ -2,13 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROME_BROWSER_PREFS_DEFAULT_PREF_STORE_H_ -#define CHROME_BROWSER_PREFS_DEFAULT_PREF_STORE_H_ +#ifndef BASE_PREFS_DEFAULT_PREF_STORE_H_ +#define BASE_PREFS_DEFAULT_PREF_STORE_H_ #include <string> +#include "base/prefs/value_map_pref_store.h" #include "base/values.h" -#include "chrome/browser/prefs/value_map_pref_store.h" // This PrefStore keeps track of default preference values set when a // preference is registered with the PrefService. @@ -33,4 +33,4 @@ class DefaultPrefStore : public ValueMapPrefStore { DISALLOW_COPY_AND_ASSIGN(DefaultPrefStore); }; -#endif // CHROME_BROWSER_PREFS_DEFAULT_PREF_STORE_H_ +#endif // BASE_PREFS_DEFAULT_PREF_STORE_H_ diff --git a/chrome/common/json_pref_store.cc b/base/prefs/json_pref_store.cc index ed30346..18dc0b7 100644 --- a/chrome/common/json_pref_store.cc +++ b/base/prefs/json_pref_store.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/common/json_pref_store.h" +#include "base/prefs/json_pref_store.h" #include <algorithm> diff --git a/chrome/common/json_pref_store.h b/base/prefs/json_pref_store.h index 7ceb7da..3ed1ffb1 100644 --- a/chrome/common/json_pref_store.h +++ b/base/prefs/json_pref_store.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROME_COMMON_JSON_PREF_STORE_H_ -#define CHROME_COMMON_JSON_PREF_STORE_H_ +#ifndef BASE_PREFS_JSON_PREF_STORE_H_ +#define BASE_PREFS_JSON_PREF_STORE_H_ #include <set> #include <string> @@ -13,8 +13,8 @@ #include "base/file_path.h" #include "base/memory/scoped_ptr.h" #include "base/observer_list.h" +#include "base/prefs/persistent_pref_store.h" #include "chrome/common/important_file_writer.h" -#include "chrome/common/persistent_pref_store.h" namespace base { class DictionaryValue; @@ -90,4 +90,4 @@ class JsonPrefStore : public PersistentPrefStore, DISALLOW_COPY_AND_ASSIGN(JsonPrefStore); }; -#endif // CHROME_COMMON_JSON_PREF_STORE_H_ +#endif // BASE_PREFS_JSON_PREF_STORE_H_ diff --git a/chrome/common/json_pref_store_unittest.cc b/base/prefs/json_pref_store_unittest.cc index 5b5a5f3..14723ab 100644 --- a/chrome/common/json_pref_store_unittest.cc +++ b/base/prefs/json_pref_store_unittest.cc @@ -8,6 +8,7 @@ #include "base/message_loop.h" #include "base/message_loop_proxy.h" #include "base/path_service.h" +#include "base/prefs/json_pref_store.h" #include "base/scoped_temp_dir.h" #include "base/string_number_conversions.h" #include "base/string_util.h" @@ -15,7 +16,6 @@ #include "base/utf_string_conversions.h" #include "base/values.h" #include "chrome/common/chrome_paths.h" -#include "chrome/common/json_pref_store.h" #include "chrome/common/pref_names.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/prefs/overlay_user_pref_store.cc b/base/prefs/overlay_user_pref_store.cc index b91af63..26ee45e 100644 --- a/chrome/browser/prefs/overlay_user_pref_store.cc +++ b/base/prefs/overlay_user_pref_store.cc @@ -2,7 +2,7 @@ // 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" diff --git a/chrome/browser/prefs/overlay_user_pref_store.h b/base/prefs/overlay_user_pref_store.h index d2acd68a..5c33c79 100644 --- a/chrome/browser/prefs/overlay_user_pref_store.h +++ b/base/prefs/overlay_user_pref_store.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROME_BROWSER_PREFS_OVERLAY_USER_PREF_STORE_H_ -#define CHROME_BROWSER_PREFS_OVERLAY_USER_PREF_STORE_H_ +#ifndef BASE_PREFS_OVERLAY_USER_PREF_STORE_H_ +#define BASE_PREFS_OVERLAY_USER_PREF_STORE_H_ #include <map> #include <string> @@ -11,8 +11,8 @@ #include "base/basictypes.h" #include "base/memory/ref_counted.h" #include "base/observer_list.h" -#include "chrome/browser/prefs/pref_value_map.h" -#include "chrome/common/persistent_pref_store.h" +#include "base/prefs/persistent_pref_store.h" +#include "base/prefs/pref_value_map.h" // PersistentPrefStore that directs all write operations into an in-memory // PrefValueMap. Read operations are first answered by the PrefValueMap. @@ -81,4 +81,4 @@ class OverlayUserPrefStore : public PersistentPrefStore, DISALLOW_COPY_AND_ASSIGN(OverlayUserPrefStore); }; -#endif // CHROME_BROWSER_PREFS_OVERLAY_USER_PREF_STORE_H_ +#endif // BASE_PREFS_OVERLAY_USER_PREF_STORE_H_ diff --git a/chrome/browser/prefs/overlay_user_pref_store_unittest.cc b/base/prefs/overlay_user_pref_store_unittest.cc index 18d10a0..85b937f 100644 --- a/chrome/browser/prefs/overlay_user_pref_store_unittest.cc +++ b/base/prefs/overlay_user_pref_store_unittest.cc @@ -2,11 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "base/prefs/overlay_user_pref_store.h" +#include "base/prefs/pref_store_observer_mock.h" +#include "base/prefs/testing_pref_store.h" #include "base/values.h" -#include "chrome/browser/prefs/overlay_user_pref_store.h" -#include "chrome/browser/prefs/testing_pref_store.h" #include "chrome/common/pref_names.h" -#include "chrome/common/pref_store_observer_mock.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/common/persistent_pref_store.h b/base/prefs/persistent_pref_store.h index dfd81e0..9dd0ff9 100644 --- a/chrome/common/persistent_pref_store.h +++ b/base/prefs/persistent_pref_store.h @@ -2,12 +2,12 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROME_COMMON_PERSISTENT_PREF_STORE_H_ -#define CHROME_COMMON_PERSISTENT_PREF_STORE_H_ +#ifndef BASE_PREFS_PERSISTENT_PREF_STORE_H_ +#define BASE_PREFS_PERSISTENT_PREF_STORE_H_ #include <string> -#include "chrome/common/pref_store.h" +#include "base/prefs/pref_store.h" // This interface is complementary to the PrefStore interface, declaring // additional functionality that adds support for setting values and persisting @@ -91,4 +91,4 @@ class PersistentPrefStore : public PrefStore { virtual ~PersistentPrefStore() {} }; -#endif // CHROME_COMMON_PERSISTENT_PREF_STORE_H_ +#endif // BASE_PREFS_PERSISTENT_PREF_STORE_H_ diff --git a/chrome/browser/prefs/pref_notifier.h b/base/prefs/pref_notifier.h index b9e1598..e0df260 100644 --- a/chrome/browser/prefs/pref_notifier.h +++ b/base/prefs/pref_notifier.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROME_BROWSER_PREFS_PREF_NOTIFIER_H_ -#define CHROME_BROWSER_PREFS_PREF_NOTIFIER_H_ +#ifndef BASE_PREFS_PREF_NOTIFIER_H_ +#define BASE_PREFS_PREF_NOTIFIER_H_ #include <string> @@ -23,4 +23,4 @@ class PrefNotifier { virtual void OnInitializationCompleted(bool succeeded) = 0; }; -#endif // CHROME_BROWSER_PREFS_PREF_NOTIFIER_H_ +#endif // BASE_PREFS_PREF_NOTIFIER_H_ diff --git a/chrome/common/pref_store.cc b/base/prefs/pref_store.cc index 7556f0f..0521654 100644 --- a/chrome/common/pref_store.cc +++ b/base/prefs/pref_store.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/common/pref_store.h" +#include "base/prefs/pref_store.h" size_t PrefStore::NumberOfObservers() const { return 0; diff --git a/chrome/common/pref_store.h b/base/prefs/pref_store.h index c0a23cf..c54fb4e 100644 --- a/chrome/common/pref_store.h +++ b/base/prefs/pref_store.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROME_COMMON_PREF_STORE_H_ -#define CHROME_COMMON_PREF_STORE_H_ +#ifndef BASE_PREFS_PREF_STORE_H_ +#define BASE_PREFS_PREF_STORE_H_ #include <string> @@ -69,4 +69,4 @@ class PrefStore : public base::RefCounted<PrefStore> { DISALLOW_COPY_AND_ASSIGN(PrefStore); }; -#endif // CHROME_COMMON_PREF_STORE_H_ +#endif // BASE_PREFS_PREF_STORE_H_ diff --git a/chrome/common/pref_store_observer_mock.cc b/base/prefs/pref_store_observer_mock.cc index 8d11872..0970e63 100644 --- a/chrome/common/pref_store_observer_mock.cc +++ b/base/prefs/pref_store_observer_mock.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/common/pref_store_observer_mock.h" +#include "base/prefs/pref_store_observer_mock.h" PrefStoreObserverMock::PrefStoreObserverMock() {} diff --git a/chrome/common/pref_store_observer_mock.h b/base/prefs/pref_store_observer_mock.h index d3733c8..8252c3b 100644 --- a/chrome/common/pref_store_observer_mock.h +++ b/base/prefs/pref_store_observer_mock.h @@ -2,11 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROME_COMMON_PREF_STORE_OBSERVER_MOCK_H_ -#define CHROME_COMMON_PREF_STORE_OBSERVER_MOCK_H_ +#ifndef BASE_PREFS_PREF_STORE_OBSERVER_MOCK_H_ +#define BASE_PREFS_PREF_STORE_OBSERVER_MOCK_H_ #include "base/basictypes.h" -#include "chrome/common/pref_store.h" +#include "base/prefs/pref_store.h" #include "testing/gmock/include/gmock/gmock.h" // A gmock-ified implementation of PrefStore::Observer. @@ -22,4 +22,4 @@ class PrefStoreObserverMock : public PrefStore::Observer { DISALLOW_COPY_AND_ASSIGN(PrefStoreObserverMock); }; -#endif // CHROME_COMMON_PREF_STORE_OBSERVER_MOCK_H_ +#endif // BASE_PREFS_PREF_STORE_OBSERVER_MOCK_H_ diff --git a/chrome/browser/prefs/pref_value_map.cc b/base/prefs/pref_value_map.cc index 1968a14..48e8fa3 100644 --- a/chrome/browser/prefs/pref_value_map.cc +++ b/base/prefs/pref_value_map.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/prefs/pref_value_map.h" +#include "base/prefs/pref_value_map.h" #include "base/logging.h" #include "base/memory/scoped_ptr.h" diff --git a/chrome/browser/prefs/pref_value_map.h b/base/prefs/pref_value_map.h index 7efa0ff..9c846dc 100644 --- a/chrome/browser/prefs/pref_value_map.h +++ b/base/prefs/pref_value_map.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROME_BROWSER_PREFS_PREF_VALUE_MAP_H_ -#define CHROME_BROWSER_PREFS_PREF_VALUE_MAP_H_ +#ifndef BASE_PREFS_PREF_VALUE_MAP_H_ +#define BASE_PREFS_PREF_VALUE_MAP_H_ #include <map> #include <string> @@ -84,4 +84,4 @@ class PrefValueMap { DISALLOW_COPY_AND_ASSIGN(PrefValueMap); }; -#endif // CHROME_BROWSER_PREFS_PREF_VALUE_MAP_H_ +#endif // BASE_PREFS_PREF_VALUE_MAP_H_ diff --git a/chrome/browser/prefs/pref_value_map_unittest.cc b/base/prefs/pref_value_map_unittest.cc index 6fbddea..b406db8 100644 --- a/chrome/browser/prefs/pref_value_map_unittest.cc +++ b/base/prefs/pref_value_map_unittest.cc @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "base/prefs/pref_value_map.h" #include "base/values.h" -#include "chrome/browser/prefs/pref_value_map.h" #include "testing/gtest/include/gtest/gtest.h" class PrefValueMapTest : public testing::Test { diff --git a/chrome/browser/api/prefs/pref_change_registrar.cc b/base/prefs/public/pref_change_registrar.cc index 43d2b4a..e7a9791 100644 --- a/chrome/browser/api/prefs/pref_change_registrar.cc +++ b/base/prefs/public/pref_change_registrar.cc @@ -2,10 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/api/prefs/pref_change_registrar.h" +#include "base/prefs/public/pref_change_registrar.h" #include "base/logging.h" -#include "chrome/browser/api/prefs/pref_service_base.h" +#include "base/prefs/public/pref_service_base.h" PrefChangeRegistrar::PrefChangeRegistrar() : service_(NULL) {} diff --git a/chrome/browser/api/prefs/pref_change_registrar.h b/base/prefs/public/pref_change_registrar.h index e6e2114d..97743e2 100644 --- a/chrome/browser/api/prefs/pref_change_registrar.h +++ b/base/prefs/public/pref_change_registrar.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROME_BROWSER_API_PREFS_PREF_CHANGE_REGISTRAR_H_ -#define CHROME_BROWSER_API_PREFS_PREF_CHANGE_REGISTRAR_H_ +#ifndef BASE_PREFS_PUBLIC_PREF_CHANGE_REGISTRAR_H_ +#define BASE_PREFS_PUBLIC_PREF_CHANGE_REGISTRAR_H_ #include <set> #include <string> @@ -63,4 +63,4 @@ class PrefChangeRegistrar { DISALLOW_COPY_AND_ASSIGN(PrefChangeRegistrar); }; -#endif // CHROME_BROWSER_API_PREFS_PREF_CHANGE_REGISTRAR_H_ +#endif // BASE_PREFS_PUBLIC_PREF_CHANGE_REGISTRAR_H_ diff --git a/chrome/browser/api/prefs/pref_change_registrar_unittest.cc b/base/prefs/public/pref_change_registrar_unittest.cc index 2152cce2..491d7db 100644 --- a/chrome/browser/api/prefs/pref_change_registrar_unittest.cc +++ b/base/prefs/public/pref_change_registrar_unittest.cc @@ -2,9 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "base/prefs/public/pref_change_registrar.h" #include "chrome/common/chrome_notification_types.h" #include "chrome/common/pref_names.h" -#include "chrome/browser/api/prefs/pref_change_registrar.h" #include "chrome/test/base/testing_pref_service.h" #include "content/public/browser/notification_details.h" #include "content/public/browser/notification_source.h" diff --git a/chrome/browser/api/prefs/pref_service_base.h b/base/prefs/public/pref_service_base.h index 58737df..aa5b3fd 100644 --- a/chrome/browser/api/prefs/pref_service_base.h +++ b/base/prefs/public/pref_service_base.h @@ -13,8 +13,8 @@ // 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" @@ -269,4 +269,4 @@ class PrefServiceBase { content::NotificationObserver* obs) = 0; }; -#endif // CHROME_BROWSER_API_PREFS_PREF_SERVICE_BASE_H_ +#endif // BASE_PREFS_PUBLIC_PREF_SERVICE_BASE_H_ diff --git a/chrome/browser/prefs/testing_pref_store.cc b/base/prefs/testing_pref_store.cc index 59952e6..f7c7830 100644 --- a/chrome/browser/prefs/testing_pref_store.cc +++ b/base/prefs/testing_pref_store.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/prefs/testing_pref_store.h" +#include "base/prefs/testing_pref_store.h" #include "base/memory/scoped_ptr.h" #include "base/values.h" diff --git a/chrome/browser/prefs/testing_pref_store.h b/base/prefs/testing_pref_store.h index feff776..07e1401 100644 --- a/chrome/browser/prefs/testing_pref_store.h +++ b/base/prefs/testing_pref_store.h @@ -2,16 +2,16 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROME_BROWSER_PREFS_TESTING_PREF_STORE_H_ -#define CHROME_BROWSER_PREFS_TESTING_PREF_STORE_H_ +#ifndef BASE_PREFS_TESTING_PREF_STORE_H_ +#define BASE_PREFS_TESTING_PREF_STORE_H_ #include <string> #include "base/basictypes.h" #include "base/compiler_specific.h" #include "base/observer_list.h" -#include "chrome/browser/prefs/pref_value_map.h" -#include "chrome/common/persistent_pref_store.h" +#include "base/prefs/persistent_pref_store.h" +#include "base/prefs/pref_value_map.h" // |TestingPrefStore| is a preference store implementation that allows tests to // explicitly manipulate the contents of the store, triggering notifications @@ -81,4 +81,4 @@ class TestingPrefStore : public PersistentPrefStore { DISALLOW_COPY_AND_ASSIGN(TestingPrefStore); }; -#endif // CHROME_BROWSER_PREFS_TESTING_PREF_STORE_H_ +#endif // BASE_PREFS_TESTING_PREF_STORE_H_ diff --git a/chrome/browser/prefs/value_map_pref_store.cc b/base/prefs/value_map_pref_store.cc index 98f9cdd..dc33384 100644 --- a/chrome/browser/prefs/value_map_pref_store.cc +++ b/base/prefs/value_map_pref_store.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/prefs/value_map_pref_store.h" +#include "base/prefs/value_map_pref_store.h" #include <algorithm> diff --git a/chrome/browser/prefs/value_map_pref_store.h b/base/prefs/value_map_pref_store.h index af231b9..64ff265 100644 --- a/chrome/browser/prefs/value_map_pref_store.h +++ b/base/prefs/value_map_pref_store.h @@ -2,16 +2,16 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROME_BROWSER_PREFS_VALUE_MAP_PREF_STORE_H_ -#define CHROME_BROWSER_PREFS_VALUE_MAP_PREF_STORE_H_ +#ifndef BASE_PREFS_VALUE_MAP_PREF_STORE_H_ +#define BASE_PREFS_VALUE_MAP_PREF_STORE_H_ #include <map> #include <string> #include "base/basictypes.h" #include "base/observer_list.h" -#include "chrome/browser/prefs/pref_value_map.h" -#include "chrome/common/pref_store.h" +#include "base/prefs/pref_store.h" +#include "base/prefs/pref_value_map.h" // A basic PrefStore implementation that uses a simple name-value map for // storing the preference values. @@ -56,4 +56,4 @@ class ValueMapPrefStore : public PrefStore { DISALLOW_COPY_AND_ASSIGN(ValueMapPrefStore); }; -#endif // CHROME_BROWSER_PREFS_VALUE_MAP_PREF_STORE_H_ +#endif // BASE_PREFS_VALUE_MAP_PREF_STORE_H_ diff --git a/chrome/DEPS b/chrome/DEPS index f055620..125aec3 100644 --- a/chrome/DEPS +++ b/chrome/DEPS @@ -1,5 +1,6 @@ include_rules = [ "+ash", + "+base/prefs", "+cc", "+crypto", "+gpu", diff --git a/chrome/browser/api/prefs/pref_member.cc b/chrome/browser/api/prefs/pref_member.cc index 98ff3ec..3c1b3a8 100644 --- a/chrome/browser/api/prefs/pref_member.cc +++ b/chrome/browser/api/prefs/pref_member.cc @@ -5,8 +5,8 @@ #include "chrome/browser/api/prefs/pref_member.h" #include "base/bind.h" +#include "base/prefs/public/pref_service_base.h" #include "base/value_conversions.h" -#include "chrome/browser/api/prefs/pref_service_base.h" #include "chrome/common/chrome_notification_types.h" using content::BrowserThread; diff --git a/chrome/browser/autofill/autocomplete_history_manager.cc b/chrome/browser/autofill/autocomplete_history_manager.cc index 8cbbc5f..412fd8c 100644 --- a/chrome/browser/autofill/autocomplete_history_manager.cc +++ b/chrome/browser/autofill/autocomplete_history_manager.cc @@ -6,10 +6,10 @@ #include <vector> +#include "base/prefs/public/pref_service_base.h" #include "base/string16.h" #include "base/string_number_conversions.h" #include "base/utf_string_conversions.h" -#include "chrome/browser/api/prefs/pref_service_base.h" #include "chrome/browser/autofill/autofill_external_delegate.h" #include "chrome/browser/autofill/credit_card.h" #include "chrome/common/autofill_messages.h" diff --git a/chrome/browser/autofill/autofill_common_test.cc b/chrome/browser/autofill/autofill_common_test.cc index 5c12a58..28557a6 100644 --- a/chrome/browser/autofill/autofill_common_test.cc +++ b/chrome/browser/autofill/autofill_common_test.cc @@ -4,8 +4,8 @@ #include "chrome/browser/autofill/autofill_common_test.h" +#include "base/prefs/public/pref_service_base.h" #include "base/utf_string_conversions.h" -#include "chrome/browser/api/prefs/pref_service_base.h" #include "chrome/browser/autofill/autofill_profile.h" #include "chrome/browser/autofill/credit_card.h" #include "chrome/browser/password_manager/encryptor.h" diff --git a/chrome/browser/autofill/autofill_download.cc b/chrome/browser/autofill/autofill_download.cc index e200753..12173cd 100644 --- a/chrome/browser/autofill/autofill_download.cc +++ b/chrome/browser/autofill/autofill_download.cc @@ -9,13 +9,13 @@ #include <vector> #include "base/logging.h" +#include "base/prefs/public/pref_service_base.h" #include "base/rand_util.h" #include "base/stl_util.h" #include "base/string_util.h" #include "chrome/browser/autofill/autofill_metrics.h" #include "chrome/browser/autofill/autofill_xml_parser.h" #include "chrome/browser/autofill/form_structure.h" -#include "chrome/browser/api/prefs/pref_service_base.h" #include "chrome/common/pref_names.h" #include "content/public/browser/browser_context.h" #include "googleurl/src/gurl.h" diff --git a/chrome/browser/autofill/autofill_manager.cc b/chrome/browser/autofill/autofill_manager.cc index 2a30ea9..dbf2037 100644 --- a/chrome/browser/autofill/autofill_manager.cc +++ b/chrome/browser/autofill/autofill_manager.cc @@ -15,13 +15,13 @@ #include "base/command_line.h" #include "base/guid.h" #include "base/logging.h" +#include "base/prefs/public/pref_service_base.h" #include "base/string16.h" #include "base/string_util.h" #include "base/supports_user_data.h" #include "base/threading/sequenced_worker_pool.h" #include "base/utf_string_conversions.h" #include "chrome/browser/api/infobars/infobar_service.h" -#include "chrome/browser/api/prefs/pref_service_base.h" #include "chrome/browser/api/sync/profile_sync_service_base.h" #include "chrome/browser/autofill/autocomplete_history_manager.h" #include "chrome/browser/autofill/autofill_cc_infobar_delegate.h" diff --git a/chrome/browser/autofill/autofill_manager.h b/chrome/browser/autofill/autofill_manager.h index 415e9ec..345b68b 100644 --- a/chrome/browser/autofill/autofill_manager.h +++ b/chrome/browser/autofill/autofill_manager.h @@ -17,9 +17,9 @@ #include "base/memory/scoped_ptr.h" #include "base/memory/scoped_vector.h" #include "base/memory/weak_ptr.h" +#include "base/prefs/public/pref_change_registrar.h" #include "base/string16.h" #include "base/time.h" -#include "chrome/browser/api/prefs/pref_change_registrar.h" #include "chrome/browser/api/sync/profile_sync_service_observer.h" #include "chrome/browser/autofill/autocomplete_history_manager.h" #include "chrome/browser/autofill/autofill_download.h" diff --git a/chrome/browser/autofill/autofill_manager_unittest.cc b/chrome/browser/autofill/autofill_manager_unittest.cc index 9179af0..93e00b6 100644 --- a/chrome/browser/autofill/autofill_manager_unittest.cc +++ b/chrome/browser/autofill/autofill_manager_unittest.cc @@ -8,13 +8,13 @@ #include "base/command_line.h" #include "base/memory/scoped_ptr.h" #include "base/memory/scoped_vector.h" +#include "base/prefs/public/pref_service_base.h" #include "base/string16.h" #include "base/string_number_conversions.h" #include "base/stringprintf.h" #include "base/time.h" #include "base/tuple.h" #include "base/utf_string_conversions.h" -#include "chrome/browser/api/prefs/pref_service_base.h" #include "chrome/browser/autofill/autocomplete_history_manager.h" #include "chrome/browser/autofill/autofill_common_test.h" #include "chrome/browser/autofill/autofill_manager.h" diff --git a/chrome/browser/autofill/personal_data_manager.cc b/chrome/browser/autofill/personal_data_manager.cc index 469b6a53..f1f4610 100644 --- a/chrome/browser/autofill/personal_data_manager.cc +++ b/chrome/browser/autofill/personal_data_manager.cc @@ -9,9 +9,9 @@ #include <iterator> #include "base/logging.h" +#include "base/prefs/public/pref_service_base.h" #include "base/string_number_conversions.h" #include "base/utf_string_conversions.h" -#include "chrome/browser/api/prefs/pref_service_base.h" #include "chrome/browser/api/sync/profile_sync_service_base.h" #include "chrome/browser/api/webdata/autofill_web_data_service.h" #include "chrome/browser/autofill/autofill-inl.h" diff --git a/chrome/browser/background/background_mode_manager.h b/chrome/browser/background/background_mode_manager.h index 4e1fc98..5a3db331 100644 --- a/chrome/browser/background/background_mode_manager.h +++ b/chrome/browser/background/background_mode_manager.h @@ -8,7 +8,7 @@ #include <map> #include "base/gtest_prod_util.h" -#include "chrome/browser/api/prefs/pref_change_registrar.h" +#include "base/prefs/public/pref_change_registrar.h" #include "chrome/browser/background/background_application_list_model.h" #include "chrome/browser/profiles/profile_info_cache_observer.h" #include "chrome/browser/profiles/profile_keyed_service.h" diff --git a/chrome/browser/bookmarks/bookmark_expanded_state_tracker.cc b/chrome/browser/bookmarks/bookmark_expanded_state_tracker.cc index c73b049..194e6951 100644 --- a/chrome/browser/bookmarks/bookmark_expanded_state_tracker.cc +++ b/chrome/browser/bookmarks/bookmark_expanded_state_tracker.cc @@ -4,9 +4,9 @@ #include "chrome/browser/bookmarks/bookmark_expanded_state_tracker.h" +#include "base/prefs/public/pref_service_base.h" #include "base/string_number_conversions.h" #include "base/values.h" -#include "chrome/browser/api/prefs/pref_service_base.h" #include "chrome/browser/bookmarks/bookmark_model.h" #include "chrome/browser/bookmarks/bookmark_model_factory.h" #include "chrome/common/pref_names.h" diff --git a/chrome/browser/bookmarks/bookmark_extension_api.cc b/chrome/browser/bookmarks/bookmark_extension_api.cc index def82dc..f8681cc 100644 --- a/chrome/browser/bookmarks/bookmark_extension_api.cc +++ b/chrome/browser/bookmarks/bookmark_extension_api.cc @@ -11,6 +11,7 @@ #include "base/json/json_writer.h" #include "base/memory/scoped_ptr.h" #include "base/path_service.h" +#include "base/prefs/public/pref_service_base.h" #include "base/sha1.h" #include "base/stl_util.h" #include "base/string16.h" @@ -18,7 +19,6 @@ #include "base/string_util.h" #include "base/time.h" #include "base/utf_string_conversions.h" -#include "chrome/browser/api/prefs/pref_service_base.h" #include "chrome/browser/bookmarks/bookmark_codec.h" #include "chrome/browser/bookmarks/bookmark_extension_api_constants.h" #include "chrome/browser/bookmarks/bookmark_extension_helpers.h" diff --git a/chrome/browser/bookmarks/bookmark_manager_extension_api.cc b/chrome/browser/bookmarks/bookmark_manager_extension_api.cc index a663d01..13ead8f 100644 --- a/chrome/browser/bookmarks/bookmark_manager_extension_api.cc +++ b/chrome/browser/bookmarks/bookmark_manager_extension_api.cc @@ -7,9 +7,9 @@ #include <vector> #include "base/json/json_writer.h" +#include "base/prefs/public/pref_service_base.h" #include "base/string_number_conversions.h" #include "base/values.h" -#include "chrome/browser/api/prefs/pref_service_base.h" #include "chrome/browser/bookmarks/bookmark_extension_api_constants.h" #include "chrome/browser/bookmarks/bookmark_extension_helpers.h" #include "chrome/browser/bookmarks/bookmark_model.h" diff --git a/chrome/browser/bookmarks/bookmark_manager_extension_apitest.cc b/chrome/browser/bookmarks/bookmark_manager_extension_apitest.cc index 050c77b..63b5400 100644 --- a/chrome/browser/bookmarks/bookmark_manager_extension_apitest.cc +++ b/chrome/browser/bookmarks/bookmark_manager_extension_apitest.cc @@ -3,8 +3,8 @@ // found in the LICENSE file. #include "base/command_line.h" +#include "base/prefs/public/pref_service_base.h" #include "base/utf_string_conversions.h" -#include "chrome/browser/api/prefs/pref_service_base.h" #include "chrome/browser/bookmarks/bookmark_manager_extension_api.h" #include "chrome/browser/bookmarks/bookmark_model.h" #include "chrome/browser/bookmarks/bookmark_model_factory.h" diff --git a/chrome/browser/bookmarks/bookmark_utils.cc b/chrome/browser/bookmarks/bookmark_utils.cc index 1b4c207..90760a7a 100644 --- a/chrome/browser/bookmarks/bookmark_utils.cc +++ b/chrome/browser/bookmarks/bookmark_utils.cc @@ -11,10 +11,10 @@ #include "base/i18n/case_conversion.h" #include "base/i18n/string_search.h" #include "base/metrics/histogram.h" +#include "base/prefs/public/pref_service_base.h" #include "base/string16.h" #include "base/time.h" #include "base/utf_string_conversions.h" -#include "chrome/browser/api/prefs/pref_service_base.h" #include "chrome/browser/bookmarks/bookmark_model.h" #include "chrome/browser/bookmarks/bookmark_model_factory.h" #include "chrome/browser/bookmarks/bookmark_node_data.h" diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_process_impl.cc index 2b33a94..c42592d 100644 --- a/chrome/browser/browser_process_impl.cc +++ b/chrome/browser/browser_process_impl.cc @@ -15,6 +15,7 @@ #include "base/debug/alias.h" #include "base/file_util.h" #include "base/path_service.h" +#include "base/prefs/json_pref_store.h" #include "base/synchronization/waitable_event.h" #include "base/threading/thread.h" #include "base/threading/thread_restrictions.h" @@ -64,7 +65,6 @@ #include "chrome/common/chrome_switches.h" #include "chrome/common/extensions/extension_l10n_util.h" #include "chrome/common/extensions/extension_resource.h" -#include "chrome/common/json_pref_store.h" #include "chrome/common/pref_names.h" #include "chrome/common/switch_utils.h" #include "chrome/common/url_constants.h" diff --git a/chrome/browser/browser_process_impl.h b/chrome/browser/browser_process_impl.h index 6aa05e3..b354983 100644 --- a/chrome/browser/browser_process_impl.h +++ b/chrome/browser/browser_process_impl.h @@ -16,9 +16,9 @@ #include "base/debug/stack_trace.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" +#include "base/prefs/public/pref_change_registrar.h" #include "base/threading/non_thread_safe.h" #include "base/timer.h" -#include "chrome/browser/api/prefs/pref_change_registrar.h" #include "chrome/browser/api/prefs/pref_member.h" #include "chrome/browser/browser_process.h" #include "content/public/browser/notification_observer.h" diff --git a/chrome/browser/chrome_browser_main.cc b/chrome/browser/chrome_browser_main.cc index d7d9bbc..777fb89 100644 --- a/chrome/browser/chrome_browser_main.cc +++ b/chrome/browser/chrome_browser_main.cc @@ -17,6 +17,7 @@ #include "base/metrics/field_trial.h" #include "base/metrics/histogram.h" #include "base/path_service.h" +#include "base/prefs/json_pref_store.h" #include "base/process_info.h" #include "base/process_util.h" #include "base/run_loop.h" @@ -89,7 +90,6 @@ #include "chrome/common/chrome_result_codes.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/env_vars.h" -#include "chrome/common/json_pref_store.h" #include "chrome/common/jstemplate_builder.h" #include "chrome/common/logging_chrome.h" #include "chrome/common/metrics/variations/variations_util.h" diff --git a/chrome/browser/chromeos/audio/audio_handler.h b/chrome/browser/chromeos/audio/audio_handler.h index 1b348eb..ecb9f57a 100644 --- a/chrome/browser/chromeos/audio/audio_handler.h +++ b/chrome/browser/chromeos/audio/audio_handler.h @@ -6,10 +6,10 @@ #define CHROME_BROWSER_CHROMEOS_AUDIO_AUDIO_HANDLER_H_ #include "base/basictypes.h" -#include "base/observer_list.h" #include "base/memory/scoped_ptr.h" +#include "base/observer_list.h" +#include "base/prefs/public/pref_change_registrar.h" #include "base/threading/thread.h" -#include "chrome/browser/api/prefs/pref_change_registrar.h" #include "content/public/browser/notification_details.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" diff --git a/chrome/browser/chromeos/drive/drive_file_system.cc b/chrome/browser/chromeos/drive/drive_file_system.cc index e6257a3..9a764d4 100644 --- a/chrome/browser/chromeos/drive/drive_file_system.cc +++ b/chrome/browser/chromeos/drive/drive_file_system.cc @@ -10,10 +10,10 @@ #include "base/message_loop_proxy.h" #include "base/metrics/histogram.h" #include "base/platform_file.h" +#include "base/prefs/public/pref_change_registrar.h" #include "base/stringprintf.h" #include "base/threading/sequenced_worker_pool.h" #include "base/values.h" -#include "chrome/browser/api/prefs/pref_change_registrar.h" #include "chrome/browser/chromeos/drive/drive.pb.h" #include "chrome/browser/chromeos/drive/drive_feed_loader.h" #include "chrome/browser/chromeos/drive/drive_feed_processor.h" diff --git a/chrome/browser/chromeos/drive/drive_sync_client.cc b/chrome/browser/chromeos/drive/drive_sync_client.cc index cf06ed6..d3b2617 100644 --- a/chrome/browser/chromeos/drive/drive_sync_client.cc +++ b/chrome/browser/chromeos/drive/drive_sync_client.cc @@ -9,7 +9,7 @@ #include "base/bind.h" #include "base/message_loop_proxy.h" -#include "chrome/browser/api/prefs/pref_change_registrar.h" +#include "base/prefs/public/pref_change_registrar.h" #include "chrome/browser/chromeos/drive/drive.pb.h" #include "chrome/browser/chromeos/drive/drive_file_system_interface.h" #include "chrome/browser/chromeos/drive/drive_file_system_util.h" diff --git a/chrome/browser/chromeos/extensions/file_browser_event_router.cc b/chrome/browser/chromeos/extensions/file_browser_event_router.cc index 5b54564..715ad8a 100644 --- a/chrome/browser/chromeos/extensions/file_browser_event_router.cc +++ b/chrome/browser/chromeos/extensions/file_browser_event_router.cc @@ -7,9 +7,9 @@ #include "base/bind.h" #include "base/json/json_writer.h" #include "base/message_loop.h" +#include "base/prefs/public/pref_change_registrar.h" #include "base/stl_util.h" #include "base/values.h" -#include "chrome/browser/api/prefs/pref_change_registrar.h" #include "chrome/browser/chromeos/cros/cros_library.h" #include "chrome/browser/chromeos/drive/drive_file_system_interface.h" #include "chrome/browser/chromeos/drive/drive_file_system_util.h" diff --git a/chrome/browser/chromeos/settings/device_settings_provider.h b/chrome/browser/chromeos/settings/device_settings_provider.h index cf625df..f834d4e 100644 --- a/chrome/browser/chromeos/settings/device_settings_provider.h +++ b/chrome/browser/chromeos/settings/device_settings_provider.h @@ -14,11 +14,10 @@ #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 "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; diff --git a/chrome/browser/chromeos/settings/stub_cros_settings_provider.h b/chrome/browser/chromeos/settings/stub_cros_settings_provider.h index 9d88bf7..92a9a8d 100644 --- a/chrome/browser/chromeos/settings/stub_cros_settings_provider.h +++ b/chrome/browser/chromeos/settings/stub_cros_settings_provider.h @@ -7,8 +7,8 @@ #include <string> +#include "base/prefs/pref_value_map.h" #include "chrome/browser/chromeos/settings/cros_settings_provider.h" -#include "chrome/browser/prefs/pref_value_map.h" namespace chromeos { diff --git a/chrome/browser/content_settings/content_settings_default_provider.h b/chrome/browser/content_settings/content_settings_default_provider.h index bb16930..2e5d96a 100644 --- a/chrome/browser/content_settings/content_settings_default_provider.h +++ b/chrome/browser/content_settings/content_settings_default_provider.h @@ -11,8 +11,8 @@ #include "base/basictypes.h" #include "base/memory/linked_ptr.h" +#include "base/prefs/public/pref_change_registrar.h" #include "base/synchronization/lock.h" -#include "chrome/browser/api/prefs/pref_change_registrar.h" #include "chrome/browser/content_settings/content_settings_observable_provider.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" diff --git a/chrome/browser/content_settings/content_settings_policy_provider.h b/chrome/browser/content_settings/content_settings_policy_provider.h index c438dee..586a4d40 100644 --- a/chrome/browser/content_settings/content_settings_policy_provider.h +++ b/chrome/browser/content_settings/content_settings_policy_provider.h @@ -10,8 +10,8 @@ #include <vector> #include "base/basictypes.h" +#include "base/prefs/public/pref_change_registrar.h" #include "base/synchronization/lock.h" -#include "chrome/browser/api/prefs/pref_change_registrar.h" #include "chrome/browser/content_settings/content_settings_observable_provider.h" #include "chrome/browser/content_settings/content_settings_origin_identifier_value_map.h" #include "content/public/browser/notification_observer.h" diff --git a/chrome/browser/content_settings/content_settings_pref_provider.h b/chrome/browser/content_settings/content_settings_pref_provider.h index 03fdae7..9595de7 100644 --- a/chrome/browser/content_settings/content_settings_pref_provider.h +++ b/chrome/browser/content_settings/content_settings_pref_provider.h @@ -10,8 +10,8 @@ #include <vector> #include "base/basictypes.h" +#include "base/prefs/public/pref_change_registrar.h" #include "base/synchronization/lock.h" -#include "chrome/browser/api/prefs/pref_change_registrar.h" #include "chrome/browser/content_settings/content_settings_observable_provider.h" #include "chrome/browser/content_settings/content_settings_origin_identifier_value_map.h" #include "chrome/browser/content_settings/content_settings_utils.h" diff --git a/chrome/browser/content_settings/content_settings_pref_provider_unittest.cc b/chrome/browser/content_settings/content_settings_pref_provider_unittest.cc index 726262e..3d9de68 100644 --- a/chrome/browser/content_settings/content_settings_pref_provider_unittest.cc +++ b/chrome/browser/content_settings/content_settings_pref_provider_unittest.cc @@ -8,18 +8,18 @@ #include "base/command_line.h" #include "base/memory/scoped_ptr.h" #include "base/message_loop.h" +#include "base/prefs/default_pref_store.h" +#include "base/prefs/overlay_user_pref_store.h" +#include "base/prefs/public/pref_change_registrar.h" +#include "base/prefs/testing_pref_store.h" #include "base/threading/platform_thread.h" #include "base/values.h" -#include "chrome/browser/api/prefs/pref_change_registrar.h" #include "chrome/browser/content_settings/content_settings_mock_observer.h" #include "chrome/browser/content_settings/content_settings_utils.h" #include "chrome/browser/prefs/browser_prefs.h" -#include "chrome/browser/prefs/default_pref_store.h" -#include "chrome/browser/prefs/overlay_user_pref_store.h" #include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/prefs/pref_service_mock_builder.h" #include "chrome/browser/prefs/scoped_user_pref_update.h" -#include "chrome/browser/prefs/testing_pref_store.h" #include "chrome/common/chrome_notification_types.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/pref_names.h" diff --git a/chrome/browser/content_settings/cookie_settings.h b/chrome/browser/content_settings/cookie_settings.h index 97a2454..f1aba03 100644 --- a/chrome/browser/content_settings/cookie_settings.h +++ b/chrome/browser/content_settings/cookie_settings.h @@ -10,8 +10,8 @@ #include "base/compiler_specific.h" #include "base/memory/ref_counted.h" #include "base/memory/singleton.h" +#include "base/prefs/public/pref_change_registrar.h" #include "base/synchronization/lock.h" -#include "chrome/browser/api/prefs/pref_change_registrar.h" #include "chrome/browser/content_settings/host_content_settings_map.h" #include "chrome/browser/profiles/refcounted_profile_keyed_service.h" #include "chrome/browser/profiles/refcounted_profile_keyed_service_factory.h" diff --git a/chrome/browser/content_settings/host_content_settings_map.h b/chrome/browser/content_settings/host_content_settings_map.h index 6a10743..602ff15 100644 --- a/chrome/browser/content_settings/host_content_settings_map.h +++ b/chrome/browser/content_settings/host_content_settings_map.h @@ -14,9 +14,9 @@ #include "base/basictypes.h" #include "base/memory/ref_counted.h" +#include "base/prefs/public/pref_change_registrar.h" #include "base/synchronization/lock.h" #include "base/tuple.h" -#include "chrome/browser/api/prefs/pref_change_registrar.h" #include "chrome/browser/content_settings/content_settings_observer.h" #include "chrome/common/content_settings.h" #include "chrome/common/content_settings_pattern.h" diff --git a/chrome/browser/extensions/api/font_settings/font_settings_api.h b/chrome/browser/extensions/api/font_settings/font_settings_api.h index 152cf51..9c73cf0 100644 --- a/chrome/browser/extensions/api/font_settings/font_settings_api.h +++ b/chrome/browser/extensions/api/font_settings/font_settings_api.h @@ -12,7 +12,7 @@ #include <string> #include <utility> -#include "chrome/browser/api/prefs/pref_change_registrar.h" +#include "base/prefs/public/pref_change_registrar.h" #include "chrome/browser/extensions/extension_function.h" #include "chrome/browser/prefs/pref_service.h" diff --git a/chrome/browser/extensions/api/managed_mode/managed_mode_api.h b/chrome/browser/extensions/api/managed_mode/managed_mode_api.h index 433f4be..8c3245a 100644 --- a/chrome/browser/extensions/api/managed_mode/managed_mode_api.h +++ b/chrome/browser/extensions/api/managed_mode/managed_mode_api.h @@ -8,7 +8,7 @@ #ifndef CHROME_BROWSER_EXTENSIONS_API_MANAGED_MODE_MANAGED_MODE_API_H_ #define CHROME_BROWSER_EXTENSIONS_API_MANAGED_MODE_MANAGED_MODE_API_H_ -#include "chrome/browser/api/prefs/pref_change_registrar.h" +#include "base/prefs/public/pref_change_registrar.h" #include "chrome/browser/extensions/extension_function.h" #include "content/public/browser/notification_observer.h" diff --git a/chrome/browser/extensions/api/preference/preference_api.h b/chrome/browser/extensions/api/preference/preference_api.h index 24eb208..7bf67cd 100644 --- a/chrome/browser/extensions/api/preference/preference_api.h +++ b/chrome/browser/extensions/api/preference/preference_api.h @@ -7,7 +7,7 @@ #include <string> -#include "chrome/browser/api/prefs/pref_change_registrar.h" +#include "base/prefs/public/pref_change_registrar.h" #include "chrome/browser/extensions/extension_function.h" #include "content/public/browser/notification_observer.h" diff --git a/chrome/browser/extensions/component_loader.cc b/chrome/browser/extensions/component_loader.cc index 67a1ff5..59b2bb7 100644 --- a/chrome/browser/extensions/component_loader.cc +++ b/chrome/browser/extensions/component_loader.cc @@ -8,10 +8,10 @@ #include "base/file_util.h" #include "base/json/json_string_value_serializer.h" #include "base/path_service.h" -#include "chrome/browser/api/prefs/pref_change_registrar.h" +#include "base/prefs/pref_notifier.h" +#include "base/prefs/public/pref_change_registrar.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/prefs/pref_notifier.h" #include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/chrome_notification_types.h" diff --git a/chrome/browser/extensions/component_loader.h b/chrome/browser/extensions/component_loader.h index f6dc3c3..8c68775 100644 --- a/chrome/browser/extensions/component_loader.h +++ b/chrome/browser/extensions/component_loader.h @@ -10,8 +10,8 @@ #include "base/file_path.h" #include "base/gtest_prod_util.h" +#include "base/prefs/public/pref_change_registrar.h" #include "base/values.h" -#include "chrome/browser/api/prefs/pref_change_registrar.h" #include "content/public/browser/notification_observer.h" class ExtensionServiceInterface; diff --git a/chrome/browser/extensions/extension_pref_store.h b/chrome/browser/extensions/extension_pref_store.h index 5c3820e..068219e 100644 --- a/chrome/browser/extensions/extension_pref_store.h +++ b/chrome/browser/extensions/extension_pref_store.h @@ -7,8 +7,8 @@ #include <string> +#include "base/prefs/value_map_pref_store.h" #include "chrome/browser/extensions/extension_pref_value_map.h" -#include "chrome/browser/prefs/value_map_pref_store.h" // A (non-persistent) PrefStore implementation that holds effective preferences // set by extensions. These preferences are managed by and fetched from an diff --git a/chrome/browser/extensions/extension_pref_value_map.cc b/chrome/browser/extensions/extension_pref_value_map.cc index 8e750b9..c497e5a 100644 --- a/chrome/browser/extensions/extension_pref_value_map.cc +++ b/chrome/browser/extensions/extension_pref_value_map.cc @@ -4,9 +4,9 @@ #include "chrome/browser/extensions/extension_pref_value_map.h" +#include "base/prefs/pref_value_map.h" #include "base/stl_util.h" #include "base/values.h" -#include "chrome/browser/prefs/pref_value_map.h" using extensions::ExtensionPrefsScope; diff --git a/chrome/browser/extensions/extension_pref_value_map.h b/chrome/browser/extensions/extension_pref_value_map.h index 8c061567..e14738d 100644 --- a/chrome/browser/extensions/extension_pref_value_map.h +++ b/chrome/browser/extensions/extension_pref_value_map.h @@ -10,11 +10,11 @@ #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/profiles/profile_keyed_service.h" #include "chrome/browser/extensions/extension_prefs_scope.h" +#include "chrome/browser/profiles/profile_keyed_service.h" // Non-persistent data container that is shared by ExtensionPrefStores. All // extension pref values (incognito and regular) are stored herein and diff --git a/chrome/browser/extensions/extension_pref_value_map_unittest.cc b/chrome/browser/extensions/extension_pref_value_map_unittest.cc index daf6fbdf..bfa573f 100644 --- a/chrome/browser/extensions/extension_pref_value_map_unittest.cc +++ b/chrome/browser/extensions/extension_pref_value_map_unittest.cc @@ -5,9 +5,9 @@ #include "base/basictypes.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" +#include "base/prefs/pref_store_observer_mock.h" #include "base/values.h" #include "chrome/browser/extensions/extension_pref_value_map.h" -#include "chrome/common/pref_store_observer_mock.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/extensions/extension_prefs.cc b/chrome/browser/extensions/extension_prefs.cc index e23b164..0b95adb 100644 --- a/chrome/browser/extensions/extension_prefs.cc +++ b/chrome/browser/extensions/extension_prefs.cc @@ -5,6 +5,7 @@ #include "chrome/browser/extensions/extension_prefs.h" #include "base/command_line.h" +#include "base/prefs/pref_notifier.h" #include "base/string_number_conversions.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" @@ -13,7 +14,6 @@ #include "chrome/browser/extensions/api/omnibox/omnibox_api.h" #include "chrome/browser/extensions/extension_pref_store.h" #include "chrome/browser/extensions/extension_sorting.h" -#include "chrome/browser/prefs/pref_notifier.h" #include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/prefs/scoped_user_pref_update.h" #include "chrome/common/chrome_notification_types.h" diff --git a/chrome/browser/extensions/extension_prefs_unittest.cc b/chrome/browser/extensions/extension_prefs_unittest.cc index 5a51d73..fb8060e 100644 --- a/chrome/browser/extensions/extension_prefs_unittest.cc +++ b/chrome/browser/extensions/extension_prefs_unittest.cc @@ -6,12 +6,12 @@ #include "base/basictypes.h" #include "base/path_service.h" +#include "base/prefs/public/pref_change_registrar.h" #include "base/scoped_temp_dir.h" #include "base/stl_util.h" #include "base/string_number_conversions.h" #include "base/stringprintf.h" #include "base/values.h" -#include "chrome/browser/api/prefs/pref_change_registrar.h" #include "chrome/browser/extensions/extension_pref_value_map.h" #include "chrome/browser/extensions/extension_prefs.h" #include "chrome/browser/prefs/scoped_user_pref_update.h" diff --git a/chrome/browser/extensions/extension_service.h b/chrome/browser/extensions/extension_service.h index e5c8c91..fa08503 100644 --- a/chrome/browser/extensions/extension_service.h +++ b/chrome/browser/extensions/extension_service.h @@ -16,8 +16,8 @@ #include "base/gtest_prod_util.h" #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" +#include "base/prefs/public/pref_change_registrar.h" #include "base/string16.h" -#include "chrome/browser/api/prefs/pref_change_registrar.h" #include "chrome/browser/extensions/app_shortcut_manager.h" #include "chrome/browser/extensions/app_sync_bundle.h" #include "chrome/browser/extensions/extension_icon_manager.h" diff --git a/chrome/browser/extensions/external_policy_loader.h b/chrome/browser/extensions/external_policy_loader.h index 0890281..bd0f5f5 100644 --- a/chrome/browser/extensions/external_policy_loader.h +++ b/chrome/browser/extensions/external_policy_loader.h @@ -8,7 +8,7 @@ #include "chrome/browser/extensions/external_loader.h" #include "base/compiler_specific.h" -#include "chrome/browser/api/prefs/pref_change_registrar.h" +#include "base/prefs/public/pref_change_registrar.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" diff --git a/chrome/browser/extensions/test_extension_prefs.cc b/chrome/browser/extensions/test_extension_prefs.cc index 6df506a..7c3cf8e 100644 --- a/chrome/browser/extensions/test_extension_prefs.cc +++ b/chrome/browser/extensions/test_extension_prefs.cc @@ -10,6 +10,7 @@ #include "base/memory/scoped_ptr.h" #include "base/message_loop.h" #include "base/message_loop_proxy.h" +#include "base/prefs/json_pref_store.h" #include "base/synchronization/waitable_event.h" #include "base/values.h" #include "chrome/browser/extensions/extension_pref_store.h" @@ -20,7 +21,6 @@ #include "chrome/browser/prefs/pref_value_store.h" #include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_manifest_constants.h" -#include "chrome/common/json_pref_store.h" #include "content/public/browser/browser_thread.h" #include "sync/api/string_ordinal.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/net/chrome_url_request_context.h b/chrome/browser/net/chrome_url_request_context.h index 3856dfa..16fdbb9 100644 --- a/chrome/browser/net/chrome_url_request_context.h +++ b/chrome/browser/net/chrome_url_request_context.h @@ -8,7 +8,7 @@ #include <string> #include "base/memory/scoped_ptr.h" -#include "chrome/browser/api/prefs/pref_change_registrar.h" +#include "base/prefs/public/pref_change_registrar.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" #include "net/url_request/url_request_context.h" diff --git a/chrome/browser/net/http_server_properties_manager.h b/chrome/browser/net/http_server_properties_manager.h index 2d21ec7..43ee740 100644 --- a/chrome/browser/net/http_server_properties_manager.h +++ b/chrome/browser/net/http_server_properties_manager.h @@ -11,9 +11,9 @@ #include "base/compiler_specific.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" +#include "base/prefs/public/pref_change_registrar.h" #include "base/timer.h" #include "base/values.h" -#include "chrome/browser/api/prefs/pref_change_registrar.h" #include "content/public/browser/notification_observer.h" #include "net/base/host_port_pair.h" #include "net/http/http_pipelined_host_capability.h" diff --git a/chrome/browser/net/pref_proxy_config_tracker_impl.h b/chrome/browser/net/pref_proxy_config_tracker_impl.h index c393486..6df5c75 100644 --- a/chrome/browser/net/pref_proxy_config_tracker_impl.h +++ b/chrome/browser/net/pref_proxy_config_tracker_impl.h @@ -9,7 +9,7 @@ #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/observer_list.h" -#include "chrome/browser/api/prefs/pref_change_registrar.h" +#include "base/prefs/public/pref_change_registrar.h" #include "chrome/browser/prefs/proxy_config_dictionary.h" #include "content/public/browser/notification_observer.h" #include "net/proxy/proxy_config.h" diff --git a/chrome/browser/net/ssl_config_service_manager_pref.cc b/chrome/browser/net/ssl_config_service_manager_pref.cc index 402eb53..86cc792 100644 --- a/chrome/browser/net/ssl_config_service_manager_pref.cc +++ b/chrome/browser/net/ssl_config_service_manager_pref.cc @@ -9,7 +9,7 @@ #include "base/basictypes.h" #include "base/bind.h" -#include "chrome/browser/api/prefs/pref_change_registrar.h" +#include "base/prefs/public/pref_change_registrar.h" #include "chrome/browser/api/prefs/pref_member.h" #include "chrome/browser/content_settings/content_settings_utils.h" #include "chrome/browser/prefs/pref_service.h" diff --git a/chrome/browser/net/ssl_config_service_manager_pref_unittest.cc b/chrome/browser/net/ssl_config_service_manager_pref_unittest.cc index 9f65805..b4d7080 100644 --- a/chrome/browser/net/ssl_config_service_manager_pref_unittest.cc +++ b/chrome/browser/net/ssl_config_service_manager_pref_unittest.cc @@ -7,10 +7,10 @@ #include "base/command_line.h" #include "base/memory/ref_counted.h" #include "base/message_loop.h" +#include "base/prefs/testing_pref_store.h" #include "base/values.h" #include "chrome/browser/content_settings/host_content_settings_map.h" #include "chrome/browser/prefs/pref_service_mock_builder.h" -#include "chrome/browser/prefs/testing_pref_store.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/content_settings.h" #include "chrome/common/pref_names.h" diff --git a/chrome/browser/plugins/plugin_prefs.h b/chrome/browser/plugins/plugin_prefs.h index 8f7deb4..95fe301 100644 --- a/chrome/browser/plugins/plugin_prefs.h +++ b/chrome/browser/plugins/plugin_prefs.h @@ -11,8 +11,8 @@ #include "base/basictypes.h" #include "base/file_path.h" +#include "base/prefs/public/pref_change_registrar.h" #include "base/synchronization/lock.h" -#include "chrome/browser/api/prefs/pref_change_registrar.h" #include "chrome/browser/plugins/plugin_finder.h" #include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/refcounted_profile_keyed_service.h" diff --git a/chrome/browser/policy/cloud_policy_subsystem.h b/chrome/browser/policy/cloud_policy_subsystem.h index 0df9846..fd81072 100644 --- a/chrome/browser/policy/cloud_policy_subsystem.h +++ b/chrome/browser/policy/cloud_policy_subsystem.h @@ -6,7 +6,7 @@ #define CHROME_BROWSER_POLICY_CLOUD_POLICY_SUBSYSTEM_H_ #include "base/memory/scoped_ptr.h" -#include "chrome/browser/api/prefs/pref_change_registrar.h" +#include "base/prefs/public/pref_change_registrar.h" #include "content/public/browser/notification_observer.h" #include "net/base/network_change_notifier.h" diff --git a/chrome/browser/policy/configuration_policy_handler.cc b/chrome/browser/policy/configuration_policy_handler.cc index 513b43e..938cc2f 100644 --- a/chrome/browser/policy/configuration_policy_handler.cc +++ b/chrome/browser/policy/configuration_policy_handler.cc @@ -9,6 +9,7 @@ #include "base/file_path.h" #include "base/json/json_writer.h" #include "base/logging.h" +#include "base/prefs/pref_value_map.h" #include "base/stl_util.h" #include "base/string16.h" #include "base/string_number_conversions.h" @@ -18,7 +19,6 @@ #include "chrome/browser/policy/policy_error_map.h" #include "chrome/browser/policy/policy_map.h" #include "chrome/browser/policy/policy_path_parser.h" -#include "chrome/browser/prefs/pref_value_map.h" #include "chrome/browser/prefs/proxy_config_dictionary.h" #include "chrome/browser/prefs/proxy_prefs.h" #include "chrome/browser/prefs/session_startup_pref.h" diff --git a/chrome/browser/policy/configuration_policy_handler_chromeos.cc b/chrome/browser/policy/configuration_policy_handler_chromeos.cc index 4a45ca8..fd5496f 100644 --- a/chrome/browser/policy/configuration_policy_handler_chromeos.cc +++ b/chrome/browser/policy/configuration_policy_handler_chromeos.cc @@ -9,13 +9,13 @@ #include "base/json/json_reader.h" #include "base/json/json_writer.h" #include "base/memory/scoped_ptr.h" +#include "base/prefs/pref_value_map.h" #include "base/string_util.h" #include "base/values.h" #include "chrome/browser/chromeos/cros/onc_constants.h" #include "chrome/browser/chromeos/cros/onc_network_parser.h" #include "chrome/browser/policy/policy_error_map.h" #include "chrome/browser/policy/policy_map.h" -#include "chrome/browser/prefs/pref_value_map.h" #include "chrome/browser/ui/ash/chrome_launcher_prefs.h" #include "chrome/common/pref_names.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/policy/configuration_policy_handler_chromeos_unittest.cc b/chrome/browser/policy/configuration_policy_handler_chromeos_unittest.cc index b72b7d9..0230069 100644 --- a/chrome/browser/policy/configuration_policy_handler_chromeos_unittest.cc +++ b/chrome/browser/policy/configuration_policy_handler_chromeos_unittest.cc @@ -4,9 +4,9 @@ #include "chrome/browser/policy/configuration_policy_handler_chromeos.h" +#include "base/prefs/pref_value_map.h" #include "chrome/browser/policy/policy_error_map.h" #include "chrome/browser/policy/policy_map.h" -#include "chrome/browser/prefs/pref_value_map.h" #include "chrome/browser/ui/ash/chrome_launcher_prefs.h" #include "chrome/common/pref_names.h" #include "policy/policy_constants.h" diff --git a/chrome/browser/policy/configuration_policy_handler_list.cc b/chrome/browser/policy/configuration_policy_handler_list.cc index 712a541..5e1ae09 100644 --- a/chrome/browser/policy/configuration_policy_handler_list.cc +++ b/chrome/browser/policy/configuration_policy_handler_list.cc @@ -4,12 +4,12 @@ #include "chrome/browser/policy/configuration_policy_handler_list.h" +#include "base/prefs/pref_value_map.h" #include "base/stl_util.h" #include "base/values.h" #include "chrome/browser/policy/configuration_policy_handler.h" #include "chrome/browser/policy/policy_error_map.h" #include "chrome/browser/policy/policy_map.h" -#include "chrome/browser/prefs/pref_value_map.h" #include "chrome/common/pref_names.h" #include "grit/generated_resources.h" #include "policy/policy_constants.h" diff --git a/chrome/browser/policy/configuration_policy_handler_unittest.cc b/chrome/browser/policy/configuration_policy_handler_unittest.cc index 92fc28c..16ec96e 100644 --- a/chrome/browser/policy/configuration_policy_handler_unittest.cc +++ b/chrome/browser/policy/configuration_policy_handler_unittest.cc @@ -2,10 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "base/prefs/pref_value_map.h" #include "chrome/browser/policy/configuration_policy_handler.h" #include "chrome/browser/policy/policy_error_map.h" #include "chrome/browser/policy/policy_map.h" -#include "chrome/browser/prefs/pref_value_map.h" #include "chrome/common/pref_names.h" #include "policy/policy_constants.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/policy/configuration_policy_pref_store.cc b/chrome/browser/policy/configuration_policy_pref_store.cc index 9dc4151..968b95f 100644 --- a/chrome/browser/policy/configuration_policy_pref_store.cc +++ b/chrome/browser/policy/configuration_policy_pref_store.cc @@ -9,13 +9,13 @@ #include "base/bind.h" #include "base/logging.h" +#include "base/prefs/pref_value_map.h" #include "base/string16.h" #include "base/utf_string_conversions.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/policy/browser_policy_connector.h" #include "chrome/browser/policy/configuration_policy_handler_list.h" #include "chrome/browser/policy/policy_error_map.h" -#include "chrome/browser/prefs/pref_value_map.h" #include "content/public/browser/browser_thread.h" #include "policy/policy_constants.h" diff --git a/chrome/browser/policy/configuration_policy_pref_store.h b/chrome/browser/policy/configuration_policy_pref_store.h index 62cdead..a3ee36b 100644 --- a/chrome/browser/policy/configuration_policy_pref_store.h +++ b/chrome/browser/policy/configuration_policy_pref_store.h @@ -10,10 +10,10 @@ #include "base/basictypes.h" #include "base/memory/scoped_ptr.h" #include "base/observer_list.h" +#include "base/prefs/pref_store.h" #include "base/values.h" #include "chrome/browser/policy/policy_map.h" #include "chrome/browser/policy/policy_service.h" -#include "chrome/common/pref_store.h" class PrefValueMap; diff --git a/chrome/browser/policy/configuration_policy_pref_store_unittest.cc b/chrome/browser/policy/configuration_policy_pref_store_unittest.cc index af90428..d0926f4 100644 --- a/chrome/browser/policy/configuration_policy_pref_store_unittest.cc +++ b/chrome/browser/policy/configuration_policy_pref_store_unittest.cc @@ -6,6 +6,7 @@ #include "base/file_path.h" #include "base/memory/ref_counted.h" +#include "base/prefs/pref_store_observer_mock.h" #include "chrome/browser/policy/configuration_policy_handler.h" #include "chrome/browser/policy/configuration_policy_pref_store.h" #include "chrome/browser/policy/mock_configuration_policy_provider.h" @@ -15,7 +16,6 @@ #include "chrome/browser/prefs/proxy_config_dictionary.h" #include "chrome/common/content_settings.h" #include "chrome/common/pref_names.h" -#include "chrome/common/pref_store_observer_mock.h" #include "policy/policy_constants.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/policy/managed_mode_policy_provider.cc b/chrome/browser/policy/managed_mode_policy_provider.cc index eba924a..7fecdb1 100644 --- a/chrome/browser/policy/managed_mode_policy_provider.cc +++ b/chrome/browser/policy/managed_mode_policy_provider.cc @@ -4,9 +4,9 @@ #include "chrome/browser/policy/managed_mode_policy_provider.h" +#include "base/prefs/json_pref_store.h" #include "chrome/browser/policy/policy_bundle.h" #include "chrome/browser/profiles/profile.h" -#include "chrome/common/json_pref_store.h" #include "chrome/common/chrome_constants.h" #include "content/public/browser/browser_thread.h" diff --git a/chrome/browser/policy/managed_mode_policy_provider.h b/chrome/browser/policy/managed_mode_policy_provider.h index 313b054..ddaaeb7 100644 --- a/chrome/browser/policy/managed_mode_policy_provider.h +++ b/chrome/browser/policy/managed_mode_policy_provider.h @@ -6,8 +6,8 @@ #define CHROME_BROWSER_POLICY_MANAGED_MODE_POLICY_PROVIDER_H_ #include "base/memory/ref_counted.h" +#include "base/prefs/persistent_pref_store.h" #include "chrome/browser/policy/configuration_policy_provider.h" -#include "chrome/common/persistent_pref_store.h" class Profile; diff --git a/chrome/browser/policy/managed_mode_policy_provider_unittest.cc b/chrome/browser/policy/managed_mode_policy_provider_unittest.cc index a406c2a..7aa89cd 100644 --- a/chrome/browser/policy/managed_mode_policy_provider_unittest.cc +++ b/chrome/browser/policy/managed_mode_policy_provider_unittest.cc @@ -2,11 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "base/prefs/testing_pref_store.h" #include "chrome/browser/policy/configuration_policy_provider_test.h" #include "chrome/browser/policy/managed_mode_policy_provider.h" #include "chrome/browser/policy/policy_bundle.h" #include "chrome/browser/policy/policy_map.h" -#include "chrome/browser/prefs/testing_pref_store.h" #include "testing/gtest/include/gtest/gtest.h" namespace policy { diff --git a/chrome/browser/policy/url_blacklist_manager.h b/chrome/browser/policy/url_blacklist_manager.h index b6e143a..8582b9f 100644 --- a/chrome/browser/policy/url_blacklist_manager.h +++ b/chrome/browser/policy/url_blacklist_manager.h @@ -14,7 +14,7 @@ #include "base/hash_tables.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" -#include "chrome/browser/api/prefs/pref_change_registrar.h" +#include "base/prefs/public/pref_change_registrar.h" #include "chrome/common/extensions/matcher/url_matcher.h" #include "content/public/browser/notification_observer.h" diff --git a/chrome/browser/prefs/command_line_pref_store.h b/chrome/browser/prefs/command_line_pref_store.h index 6b3c944..066d005 100644 --- a/chrome/browser/prefs/command_line_pref_store.h +++ b/chrome/browser/prefs/command_line_pref_store.h @@ -7,8 +7,8 @@ #include "base/basictypes.h" #include "base/command_line.h" +#include "base/prefs/value_map_pref_store.h" #include "base/values.h" -#include "chrome/browser/prefs/value_map_pref_store.h" // This PrefStore keeps track of preferences set by command-line switches, // such as proxy settings. diff --git a/chrome/browser/prefs/pref_notifier_impl.h b/chrome/browser/prefs/pref_notifier_impl.h index 1d877473b..38255ba 100644 --- a/chrome/browser/prefs/pref_notifier_impl.h +++ b/chrome/browser/prefs/pref_notifier_impl.h @@ -9,8 +9,8 @@ #include "base/hash_tables.h" #include "base/observer_list.h" +#include "base/prefs/pref_notifier.h" #include "base/threading/non_thread_safe.h" -#include "chrome/browser/prefs/pref_notifier.h" class PrefService; diff --git a/chrome/browser/prefs/pref_service.cc b/chrome/browser/prefs/pref_service.cc index 10d7078..a201e20 100644 --- a/chrome/browser/prefs/pref_service.cc +++ b/chrome/browser/prefs/pref_service.cc @@ -13,6 +13,9 @@ #include "base/logging.h" #include "base/message_loop.h" #include "base/metrics/histogram.h" +#include "base/prefs/default_pref_store.h" +#include "base/prefs/json_pref_store.h" +#include "base/prefs/overlay_user_pref_store.h" #include "base/stl_util.h" #include "base/string_number_conversions.h" #include "base/string_util.h" @@ -22,15 +25,12 @@ #include "chrome/browser/extensions/extension_pref_store.h" #include "chrome/browser/policy/configuration_policy_pref_store.h" #include "chrome/browser/prefs/command_line_pref_store.h" -#include "chrome/browser/prefs/default_pref_store.h" -#include "chrome/browser/prefs/overlay_user_pref_store.h" #include "chrome/browser/prefs/pref_model_associator.h" #include "chrome/browser/prefs/pref_notifier_impl.h" #include "chrome/browser/prefs/pref_value_store.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/prefs/prefs_tab_helper.h" #include "chrome/browser/ui/profile_error_dialog.h" -#include "chrome/common/json_pref_store.h" #include "chrome/common/pref_names.h" #include "content/public/browser/browser_thread.h" #include "grit/chromium_strings.h" diff --git a/chrome/browser/prefs/pref_service.h b/chrome/browser/prefs/pref_service.h index a083cc9..1b65aa9 100644 --- a/chrome/browser/prefs/pref_service.h +++ b/chrome/browser/prefs/pref_service.h @@ -16,8 +16,8 @@ #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" +#include "base/prefs/public/pref_service_base.h" #include "base/threading/non_thread_safe.h" -#include "chrome/browser/api/prefs/pref_service_base.h" class CommandLine; class DefaultPrefStore; diff --git a/chrome/browser/prefs/pref_service_mock_builder.cc b/chrome/browser/prefs/pref_service_mock_builder.cc index edfe696..2782882 100644 --- a/chrome/browser/prefs/pref_service_mock_builder.cc +++ b/chrome/browser/prefs/pref_service_mock_builder.cc @@ -5,14 +5,14 @@ #include "chrome/browser/prefs/pref_service_mock_builder.h" #include "base/message_loop_proxy.h" +#include "base/prefs/default_pref_store.h" +#include "base/prefs/json_pref_store.h" +#include "base/prefs/testing_pref_store.h" #include "chrome/browser/policy/configuration_policy_pref_store.h" #include "chrome/browser/prefs/command_line_pref_store.h" -#include "chrome/browser/prefs/default_pref_store.h" #include "chrome/browser/prefs/pref_notifier_impl.h" -#include "chrome/browser/prefs/pref_value_store.h" #include "chrome/browser/prefs/pref_service.h" -#include "chrome/browser/prefs/testing_pref_store.h" -#include "chrome/common/json_pref_store.h" +#include "chrome/browser/prefs/pref_value_store.h" #include "content/public/browser/browser_thread.h" using content::BrowserThread; diff --git a/chrome/browser/prefs/pref_service_mock_builder.h b/chrome/browser/prefs/pref_service_mock_builder.h index 9e0db47..b939ca6 100644 --- a/chrome/browser/prefs/pref_service_mock_builder.h +++ b/chrome/browser/prefs/pref_service_mock_builder.h @@ -7,8 +7,8 @@ #include "base/basictypes.h" #include "base/memory/ref_counted.h" -#include "chrome/common/persistent_pref_store.h" -#include "chrome/common/pref_store.h" +#include "base/prefs/persistent_pref_store.h" +#include "base/prefs/pref_store.h" class CommandLine; class FilePath; diff --git a/chrome/browser/prefs/pref_service_unittest.cc b/chrome/browser/prefs/pref_service_unittest.cc index 4b4dfd7..2dc90a8 100644 --- a/chrome/browser/prefs/pref_service_unittest.cc +++ b/chrome/browser/prefs/pref_service_unittest.cc @@ -8,10 +8,12 @@ #include "base/file_util.h" #include "base/memory/scoped_ptr.h" #include "base/path_service.h" +#include "base/prefs/json_pref_store.h" +#include "base/prefs/public/pref_change_registrar.h" +#include "base/prefs/testing_pref_store.h" #include "base/scoped_temp_dir.h" #include "base/utf_string_conversions.h" #include "base/values.h" -#include "chrome/browser/api/prefs/pref_change_registrar.h" #include "chrome/browser/policy/configuration_policy_pref_store.h" #include "chrome/browser/policy/mock_configuration_policy_provider.h" #include "chrome/browser/prefs/browser_prefs.h" @@ -20,10 +22,8 @@ #include "chrome/browser/prefs/pref_service_mock_builder.h" #include "chrome/browser/prefs/pref_value_store.h" #include "chrome/browser/prefs/scoped_user_pref_update.h" -#include "chrome/browser/prefs/testing_pref_store.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/chrome_switches.h" -#include "chrome/common/json_pref_store.h" #include "chrome/common/pref_names.h" #include "chrome/test/base/chrome_render_view_host_test_harness.h" #include "chrome/test/base/testing_pref_service.h" diff --git a/chrome/browser/prefs/pref_value_store.cc b/chrome/browser/prefs/pref_value_store.cc index 3829748..b023d8b 100644 --- a/chrome/browser/prefs/pref_value_store.cc +++ b/chrome/browser/prefs/pref_value_store.cc @@ -5,8 +5,8 @@ #include "chrome/browser/prefs/pref_value_store.h" #include "base/logging.h" +#include "base/prefs/pref_notifier.h" #include "chrome/browser/prefs/pref_model_associator.h" -#include "chrome/browser/prefs/pref_notifier.h" PrefValueStore::PrefStoreKeeper::PrefStoreKeeper() : pref_value_store_(NULL), diff --git a/chrome/browser/prefs/pref_value_store.h b/chrome/browser/prefs/pref_value_store.h index 08ff23f..7c34fe1 100644 --- a/chrome/browser/prefs/pref_value_store.h +++ b/chrome/browser/prefs/pref_value_store.h @@ -12,8 +12,8 @@ #include "base/basictypes.h" #include "base/gtest_prod_util.h" #include "base/memory/ref_counted.h" +#include "base/prefs/pref_store.h" #include "base/values.h" -#include "chrome/common/pref_store.h" #include "content/public/browser/browser_thread.h" class PrefModelAssociator; diff --git a/chrome/browser/prefs/pref_value_store_unittest.cc b/chrome/browser/prefs/pref_value_store_unittest.cc index 2a1b826..30f4aa3 100644 --- a/chrome/browser/prefs/pref_value_store_unittest.cc +++ b/chrome/browser/prefs/pref_value_store_unittest.cc @@ -6,11 +6,11 @@ #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" +#include "base/prefs/pref_notifier.h" +#include "base/prefs/testing_pref_store.h" #include "base/values.h" #include "chrome/browser/prefs/pref_model_associator.h" -#include "chrome/browser/prefs/pref_notifier.h" #include "chrome/browser/prefs/pref_value_store.h" -#include "chrome/browser/prefs/testing_pref_store.h" #include "chrome/common/pref_names.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/prefs/scoped_user_pref_update.cc b/chrome/browser/prefs/scoped_user_pref_update.cc index 5e1396c..a58c9e8 100644 --- a/chrome/browser/prefs/scoped_user_pref_update.cc +++ b/chrome/browser/prefs/scoped_user_pref_update.cc @@ -5,7 +5,7 @@ #include "chrome/browser/prefs/scoped_user_pref_update.h" #include "base/logging.h" -#include "chrome/browser/prefs/pref_notifier.h" +#include "base/prefs/pref_notifier.h" #include "chrome/browser/prefs/pref_service.h" namespace subtle { diff --git a/chrome/browser/prefs/scoped_user_pref_update_unittest.cc b/chrome/browser/prefs/scoped_user_pref_update_unittest.cc index c282208..98ffc89 100644 --- a/chrome/browser/prefs/scoped_user_pref_update_unittest.cc +++ b/chrome/browser/prefs/scoped_user_pref_update_unittest.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/api/prefs/pref_change_registrar.h" +#include "base/prefs/public/pref_change_registrar.h" #include "chrome/browser/prefs/pref_observer_mock.h" #include "chrome/browser/prefs/scoped_user_pref_update.h" #include "chrome/test/base/testing_pref_service.h" diff --git a/chrome/browser/printing/cloud_print/cloud_print_proxy_service.h b/chrome/browser/printing/cloud_print/cloud_print_proxy_service.h index e880768..99bee15 100644 --- a/chrome/browser/printing/cloud_print/cloud_print_proxy_service.h +++ b/chrome/browser/printing/cloud_print/cloud_print_proxy_service.h @@ -12,7 +12,7 @@ #include "base/callback_forward.h" #include "base/memory/weak_ptr.h" #include "base/observer_list.h" -#include "chrome/browser/api/prefs/pref_change_registrar.h" +#include "base/prefs/public/pref_change_registrar.h" #include "chrome/browser/printing/cloud_print/cloud_print_setup_handler.h" #include "chrome/browser/profiles/profile_keyed_service.h" #include "content/public/browser/notification_observer.h" diff --git a/chrome/browser/profiles/off_the_record_profile_impl.cc b/chrome/browser/profiles/off_the_record_profile_impl.cc index 75d42a6..e9f4f3f 100644 --- a/chrome/browser/profiles/off_the_record_profile_impl.cc +++ b/chrome/browser/profiles/off_the_record_profile_impl.cc @@ -11,6 +11,7 @@ #include "base/file_util.h" #include "base/memory/scoped_ptr.h" #include "base/path_service.h" +#include "base/prefs/json_pref_store.h" #include "base/string_number_conversions.h" #include "base/string_util.h" #include "build/build_config.h" @@ -41,7 +42,6 @@ #include "chrome/common/chrome_paths.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/extensions/extension.h" -#include "chrome/common/json_pref_store.h" #include "chrome/common/pref_names.h" #include "chrome/common/render_messages.h" #include "content/public/browser/browser_thread.h" diff --git a/chrome/browser/profiles/profile_impl.h b/chrome/browser/profiles/profile_impl.h index 39b5a41..e448494 100644 --- a/chrome/browser/profiles/profile_impl.h +++ b/chrome/browser/profiles/profile_impl.h @@ -13,8 +13,8 @@ #include "base/gtest_prod_util.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" +#include "base/prefs/public/pref_change_registrar.h" #include "base/timer.h" -#include "chrome/browser/api/prefs/pref_change_registrar.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile_impl_io_data.h" #include "content/public/browser/notification_observer.h" diff --git a/chrome/browser/protector/base_prefs_change.h b/chrome/browser/protector/base_prefs_change.h index a3f6b86..79f5b88 100644 --- a/chrome/browser/protector/base_prefs_change.h +++ b/chrome/browser/protector/base_prefs_change.h @@ -8,7 +8,7 @@ #include <string> #include "base/memory/scoped_ptr.h" -#include "chrome/browser/api/prefs/pref_change_registrar.h" +#include "base/prefs/public/pref_change_registrar.h" #include "chrome/browser/protector/base_setting_change.h" #include "content/public/browser/notification_observer.h" diff --git a/chrome/browser/protector/protected_prefs_watcher.h b/chrome/browser/protector/protected_prefs_watcher.h index 8dc264d..1aaf030 100644 --- a/chrome/browser/protector/protected_prefs_watcher.h +++ b/chrome/browser/protector/protected_prefs_watcher.h @@ -9,7 +9,7 @@ #include "base/basictypes.h" #include "base/memory/scoped_ptr.h" -#include "chrome/browser/api/prefs/pref_change_registrar.h" +#include "base/prefs/public/pref_change_registrar.h" #include "chrome/browser/extensions/extension_prefs.h" #include "content/public/browser/notification_observer.h" diff --git a/chrome/browser/safe_browsing/safe_browsing_service.cc b/chrome/browser/safe_browsing/safe_browsing_service.cc index 1cf3f0b..a92d736 100644 --- a/chrome/browser/safe_browsing/safe_browsing_service.cc +++ b/chrome/browser/safe_browsing/safe_browsing_service.cc @@ -11,11 +11,11 @@ #include "base/debug/leak_tracker.h" #include "base/lazy_instance.h" #include "base/path_service.h" +#include "base/prefs/public/pref_change_registrar.h" #include "base/stl_util.h" #include "base/string_util.h" #include "base/threading/thread.h" #include "base/threading/thread_restrictions.h" -#include "chrome/browser/api/prefs/pref_change_registrar.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/metrics/metrics_service.h" #include "chrome/browser/net/sqlite_persistent_cookie_store.h" diff --git a/chrome/browser/safe_browsing/safe_browsing_tab_observer.h b/chrome/browser/safe_browsing/safe_browsing_tab_observer.h index b9a883f..ec97fee 100644 --- a/chrome/browser/safe_browsing/safe_browsing_tab_observer.h +++ b/chrome/browser/safe_browsing/safe_browsing_tab_observer.h @@ -6,7 +6,7 @@ #define CHROME_BROWSER_SAFE_BROWSING_SAFE_BROWSING_TAB_OBSERVER_H_ #include "base/memory/scoped_ptr.h" -#include "chrome/browser/api/prefs/pref_change_registrar.h" +#include "base/prefs/public/pref_change_registrar.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/web_contents_user_data.h" diff --git a/chrome/browser/search_engines/template_url_service.h b/chrome/browser/search_engines/template_url_service.h index 3c56c17..bc62ff5 100644 --- a/chrome/browser/search_engines/template_url_service.h +++ b/chrome/browser/search_engines/template_url_service.h @@ -14,7 +14,7 @@ #include "base/gtest_prod_util.h" #include "base/memory/scoped_ptr.h" #include "base/observer_list.h" -#include "chrome/browser/api/prefs/pref_change_registrar.h" +#include "base/prefs/public/pref_change_registrar.h" #include "chrome/browser/profiles/profile_keyed_service.h" #include "chrome/browser/search_engines/template_url_id.h" #include "chrome/browser/webdata/web_data_service.h" diff --git a/chrome/browser/signin/signin_manager.h b/chrome/browser/signin/signin_manager.h index 56d31ab..49b87b9 100644 --- a/chrome/browser/signin/signin_manager.h +++ b/chrome/browser/signin/signin_manager.h @@ -23,7 +23,7 @@ #include "base/gtest_prod_util.h" #include "base/logging.h" #include "base/memory/scoped_ptr.h" -#include "chrome/browser/api/prefs/pref_change_registrar.h" +#include "base/prefs/public/pref_change_registrar.h" #include "chrome/browser/profiles/profile_keyed_service.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" diff --git a/chrome/browser/speech/chrome_speech_recognition_preferences.h b/chrome/browser/speech/chrome_speech_recognition_preferences.h index d926542..5090ea3 100644 --- a/chrome/browser/speech/chrome_speech_recognition_preferences.h +++ b/chrome/browser/speech/chrome_speech_recognition_preferences.h @@ -9,9 +9,9 @@ #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/memory/singleton.h" +#include "base/prefs/public/pref_change_registrar.h" #include "base/synchronization/lock.h" #include "base/threading/non_thread_safe.h" -#include "chrome/browser/api/prefs/pref_change_registrar.h" #include "chrome/browser/profiles/profile_keyed_service.h" #include "chrome/browser/profiles/profile_keyed_service_factory.h" #include "content/public/browser/notification_observer.h" diff --git a/chrome/browser/spellchecker/spellcheck_profile.h b/chrome/browser/spellchecker/spellcheck_profile.h index 3916d65..859082d 100644 --- a/chrome/browser/spellchecker/spellcheck_profile.h +++ b/chrome/browser/spellchecker/spellcheck_profile.h @@ -13,7 +13,7 @@ #include "base/gtest_prod_util.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" -#include "chrome/browser/api/prefs/pref_change_registrar.h" +#include "base/prefs/public/pref_change_registrar.h" #include "chrome/browser/profiles/profile_keyed_service.h" #include "chrome/browser/spellchecker/spellcheck_profile_provider.h" #include "content/public/browser/notification_observer.h" diff --git a/chrome/browser/sync/credential_cache_service_win.h b/chrome/browser/sync/credential_cache_service_win.h index 2c0abfb..625f608 100644 --- a/chrome/browser/sync/credential_cache_service_win.h +++ b/chrome/browser/sync/credential_cache_service_win.h @@ -12,10 +12,10 @@ #include "base/file_path.h" #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" -#include "chrome/browser/api/prefs/pref_change_registrar.h" +#include "base/prefs/json_pref_store.h" +#include "base/prefs/public/pref_change_registrar.h" #include "chrome/browser/profiles/profile_keyed_service.h" #include "chrome/browser/sync/sync_prefs.h" -#include "chrome/common/json_pref_store.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" diff --git a/chrome/browser/sync/glue/typed_url_data_type_controller.h b/chrome/browser/sync/glue/typed_url_data_type_controller.h index 258a7c2..650152a 100644 --- a/chrome/browser/sync/glue/typed_url_data_type_controller.h +++ b/chrome/browser/sync/glue/typed_url_data_type_controller.h @@ -9,7 +9,7 @@ #include "base/compiler_specific.h" #include "base/memory/ref_counted.h" -#include "chrome/browser/api/prefs/pref_change_registrar.h" +#include "base/prefs/public/pref_change_registrar.h" #include "chrome/browser/common/cancelable_request.h" #include "chrome/browser/sync/glue/non_frontend_data_type_controller.h" #include "content/public/browser/notification_observer.h" diff --git a/chrome/browser/sync/profile_sync_service_mock.cc b/chrome/browser/sync/profile_sync_service_mock.cc index e62e8f1..978aef9 100644 --- a/chrome/browser/sync/profile_sync_service_mock.cc +++ b/chrome/browser/sync/profile_sync_service_mock.cc @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "base/prefs/testing_pref_store.h" #include "chrome/browser/prefs/pref_service.h" -#include "chrome/browser/prefs/testing_pref_store.h" #include "chrome/browser/signin/signin_manager_factory.h" #include "chrome/browser/sync/profile_sync_service_mock.h" #include "chrome/browser/ui/webui/chrome_url_data_manager.h" diff --git a/chrome/browser/translate/translate_manager.h b/chrome/browser/translate/translate_manager.h index 842d329..93eca3a 100644 --- a/chrome/browser/translate/translate_manager.h +++ b/chrome/browser/translate/translate_manager.h @@ -14,8 +14,8 @@ #include "base/lazy_instance.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" +#include "base/prefs/public/pref_change_registrar.h" #include "base/time.h" -#include "chrome/browser/api/prefs/pref_change_registrar.h" #include "chrome/common/translate_errors.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" diff --git a/chrome/browser/translate/translate_manager_browsertest.cc b/chrome/browser/translate/translate_manager_browsertest.cc index b08c8cd..30cd55b 100644 --- a/chrome/browser/translate/translate_manager_browsertest.cc +++ b/chrome/browser/translate/translate_manager_browsertest.cc @@ -9,11 +9,11 @@ #include "base/json/json_writer.h" #include "base/memory/scoped_ptr.h" +#include "base/prefs/public/pref_change_registrar.h" #include "base/stringprintf.h" #include "base/utf_string_conversions.h" #include "base/values.h" #include "chrome/app/chrome_command_ids.h" -#include "chrome/browser/api/prefs/pref_change_registrar.h" #include "chrome/browser/extensions/test_extension_system.h" #include "chrome/browser/infobars/infobar.h" #include "chrome/browser/infobars/infobar_tab_helper.h" diff --git a/chrome/browser/ui/alternate_error_tab_observer.h b/chrome/browser/ui/alternate_error_tab_observer.h index 47c65b5..d5da940 100644 --- a/chrome/browser/ui/alternate_error_tab_observer.h +++ b/chrome/browser/ui/alternate_error_tab_observer.h @@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_UI_ALTERNATE_ERROR_TAB_OBSERVER_H_ #define CHROME_BROWSER_UI_ALTERNATE_ERROR_TAB_OBSERVER_H_ -#include "chrome/browser/api/prefs/pref_change_registrar.h" +#include "base/prefs/public/pref_change_registrar.h" #include "chrome/browser/prefs/pref_service.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" diff --git a/chrome/browser/ui/app_list/apps_model_builder.h b/chrome/browser/ui/app_list/apps_model_builder.h index e687f33..5c91583 100644 --- a/chrome/browser/ui/app_list/apps_model_builder.h +++ b/chrome/browser/ui/app_list/apps_model_builder.h @@ -8,7 +8,7 @@ #include <string> #include "base/gtest_prod_util.h" -#include "chrome/browser/api/prefs/pref_change_registrar.h" +#include "base/prefs/public/pref_change_registrar.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" #include "ui/app_list/app_list_model.h" diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_controller.h b/chrome/browser/ui/ash/launcher/chrome_launcher_controller.h index 93d06316..b286b7e 100644 --- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller.h +++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller.h @@ -17,8 +17,8 @@ #include "base/basictypes.h" #include "base/compiler_specific.h" #include "base/memory/scoped_ptr.h" +#include "base/prefs/public/pref_change_registrar.h" #include "base/timer.h" -#include "chrome/browser/api/prefs/pref_change_registrar.h" #include "chrome/browser/api/sync/profile_sync_service_observer.h" #include "chrome/browser/extensions/extension_prefs.h" #include "content/public/browser/notification_observer.h" diff --git a/chrome/browser/ui/bookmarks/bookmark_context_menu_controller.cc b/chrome/browser/ui/bookmarks/bookmark_context_menu_controller.cc index f7e8715..5f5355e 100644 --- a/chrome/browser/ui/bookmarks/bookmark_context_menu_controller.cc +++ b/chrome/browser/ui/bookmarks/bookmark_context_menu_controller.cc @@ -5,8 +5,8 @@ #include "chrome/browser/ui/bookmarks/bookmark_context_menu_controller.h" #include "base/compiler_specific.h" +#include "base/prefs/public/pref_service_base.h" #include "chrome/app/chrome_command_ids.h" -#include "chrome/browser/api/prefs/pref_service_base.h" #include "chrome/browser/bookmarks/bookmark_editor.h" #include "chrome/browser/bookmarks/bookmark_model.h" #include "chrome/browser/bookmarks/bookmark_model_factory.h" diff --git a/chrome/browser/ui/browser.h b/chrome/browser/ui/browser.h index c07215a..8a23866 100644 --- a/chrome/browser/ui/browser.h +++ b/chrome/browser/ui/browser.h @@ -15,8 +15,8 @@ #include "base/gtest_prod_util.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" +#include "base/prefs/public/pref_change_registrar.h" #include "base/string16.h" -#include "chrome/browser/api/prefs/pref_change_registrar.h" #include "chrome/browser/api/prefs/pref_member.h" #include "chrome/browser/debugger/devtools_toggle_action.h" #include "chrome/browser/event_disposition.h" diff --git a/chrome/browser/ui/browser_command_controller.h b/chrome/browser/ui/browser_command_controller.h index 5ec5e0b..7dae505 100644 --- a/chrome/browser/ui/browser_command_controller.h +++ b/chrome/browser/ui/browser_command_controller.h @@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_UI_BROWSER_COMMAND_CONTROLLER_H_ #define CHROME_BROWSER_UI_BROWSER_COMMAND_CONTROLLER_H_ -#include "chrome/browser/api/prefs/pref_change_registrar.h" +#include "base/prefs/public/pref_change_registrar.h" #include "chrome/browser/api/sync/profile_sync_service_observer.h" #include "chrome/browser/command_updater.h" #include "chrome/browser/sessions/tab_restore_service_observer.h" diff --git a/chrome/browser/ui/browser_instant_controller.h b/chrome/browser/ui/browser_instant_controller.h index 1408dd5..2eeb699 100644 --- a/chrome/browser/ui/browser_instant_controller.h +++ b/chrome/browser/ui/browser_instant_controller.h @@ -8,8 +8,8 @@ #include "base/basictypes.h" #include "base/compiler_specific.h" #include "base/memory/scoped_ptr.h" +#include "base/prefs/public/pref_change_registrar.h" #include "base/string16.h" -#include "chrome/browser/api/prefs/pref_change_registrar.h" #include "chrome/browser/instant/instant_controller_delegate.h" #include "chrome/browser/instant/instant_unload_handler.h" #include "chrome/browser/ui/search/search_model_observer.h" diff --git a/chrome/browser/ui/cocoa/browser_window_cocoa.h b/chrome/browser/ui/cocoa/browser_window_cocoa.h index 8908be4..1b88cb6 100644 --- a/chrome/browser/ui/cocoa/browser_window_cocoa.h +++ b/chrome/browser/ui/cocoa/browser_window_cocoa.h @@ -7,7 +7,7 @@ #include "base/memory/scoped_nsobject.h" #include "base/memory/weak_ptr.h" -#include "chrome/browser/api/prefs/pref_change_registrar.h" +#include "base/prefs/public/pref_change_registrar.h" #include "chrome/browser/bookmarks/bookmark_model.h" #include "chrome/browser/extensions/extension_keybinding_registry.h" #include "chrome/browser/ui/browser_window.h" diff --git a/chrome/browser/ui/cocoa/extensions/extension_action_context_menu.mm b/chrome/browser/ui/cocoa/extensions/extension_action_context_menu.mm index 30daa72..1777669 100644 --- a/chrome/browser/ui/cocoa/extensions/extension_action_context_menu.mm +++ b/chrome/browser/ui/cocoa/extensions/extension_action_context_menu.mm @@ -4,8 +4,8 @@ #import "chrome/browser/ui/cocoa/extensions/extension_action_context_menu.h" +#include "base/prefs/public/pref_change_registrar.h" #include "base/sys_string_conversions.h" -#include "chrome/browser/api/prefs/pref_change_registrar.h" #include "chrome/browser/extensions/extension_action.h" #include "chrome/browser/extensions/extension_action_manager.h" #include "chrome/browser/extensions/extension_service.h" diff --git a/chrome/browser/ui/gesture_prefs_observer_factory_aura.cc b/chrome/browser/ui/gesture_prefs_observer_factory_aura.cc index 6bfc0df..16fa3ef 100644 --- a/chrome/browser/ui/gesture_prefs_observer_factory_aura.cc +++ b/chrome/browser/ui/gesture_prefs_observer_factory_aura.cc @@ -5,7 +5,7 @@ #include "chrome/browser/ui/gesture_prefs_observer_factory_aura.h" #include "base/compiler_specific.h" -#include "chrome/browser/api/prefs/pref_change_registrar.h" +#include "base/prefs/public/pref_change_registrar.h" #include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile_dependency_manager.h" diff --git a/chrome/browser/ui/gtk/global_menu_bar.h b/chrome/browser/ui/gtk/global_menu_bar.h index 7a3b77d..ba72f89 100644 --- a/chrome/browser/ui/gtk/global_menu_bar.h +++ b/chrome/browser/ui/gtk/global_menu_bar.h @@ -8,7 +8,7 @@ #include <map> #include "base/compiler_specific.h" -#include "chrome/browser/api/prefs/pref_change_registrar.h" +#include "base/prefs/public/pref_change_registrar.h" #include "chrome/browser/command_observer.h" #include "chrome/browser/ui/gtk/global_history_menu.h" #include "content/public/browser/notification_observer.h" diff --git a/chrome/browser/ui/gtk/gtk_theme_service.h b/chrome/browser/ui/gtk/gtk_theme_service.h index bf2576b..12dba20 100644 --- a/chrome/browser/ui/gtk/gtk_theme_service.h +++ b/chrome/browser/ui/gtk/gtk_theme_service.h @@ -11,7 +11,7 @@ #include "base/compiler_specific.h" #include "base/lazy_instance.h" #include "base/memory/scoped_ptr.h" -#include "chrome/browser/api/prefs/pref_change_registrar.h" +#include "base/prefs/public/pref_change_registrar.h" #include "chrome/browser/themes/theme_service.h" #include "content/public/browser/notification_observer.h" #include "ui/base/glib/glib_integers.h" diff --git a/chrome/browser/ui/prefs/prefs_tab_helper.cc b/chrome/browser/ui/prefs/prefs_tab_helper.cc index 9c181f5..903cb9d 100644 --- a/chrome/browser/ui/prefs/prefs_tab_helper.cc +++ b/chrome/browser/ui/prefs/prefs_tab_helper.cc @@ -6,10 +6,10 @@ #include <string> +#include "base/prefs/overlay_user_pref_store.h" #include "base/string_util.h" #include "base/stringprintf.h" #include "chrome/browser/browser_process.h" -#include "chrome/browser/prefs/overlay_user_pref_store.h" #include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/renderer_preferences_util.h" diff --git a/chrome/browser/ui/prefs/prefs_tab_helper.h b/chrome/browser/ui/prefs/prefs_tab_helper.h index 0059673..c55746a 100644 --- a/chrome/browser/ui/prefs/prefs_tab_helper.h +++ b/chrome/browser/ui/prefs/prefs_tab_helper.h @@ -6,7 +6,7 @@ #define CHROME_BROWSER_UI_PREFS_PREFS_TAB_HELPER_H_ #include "base/compiler_specific.h" -#include "chrome/browser/api/prefs/pref_change_registrar.h" +#include "base/prefs/public/pref_change_registrar.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" #include "content/public/browser/web_contents_user_data.h" diff --git a/chrome/browser/ui/views/tabs/browser_tab_strip_controller.h b/chrome/browser/ui/views/tabs/browser_tab_strip_controller.h index c1729f7..0ed9504 100644 --- a/chrome/browser/ui/views/tabs/browser_tab_strip_controller.h +++ b/chrome/browser/ui/views/tabs/browser_tab_strip_controller.h @@ -7,7 +7,7 @@ #include "base/compiler_specific.h" #include "base/memory/scoped_ptr.h" -#include "chrome/browser/api/prefs/pref_change_registrar.h" +#include "base/prefs/public/pref_change_registrar.h" #include "chrome/browser/ui/search/search_model_observer.h" #include "chrome/browser/ui/search/toolbar_search_animator_observer.h" #include "chrome/browser/ui/tabs/hover_tab_selector.h" diff --git a/chrome/browser/ui/webui/extensions/extension_settings_handler.h b/chrome/browser/ui/webui/extensions/extension_settings_handler.h index 1f80d25..50e0160 100644 --- a/chrome/browser/ui/webui/extensions/extension_settings_handler.h +++ b/chrome/browser/ui/webui/extensions/extension_settings_handler.h @@ -10,7 +10,7 @@ #include <vector> #include "base/memory/scoped_ptr.h" -#include "chrome/browser/api/prefs/pref_change_registrar.h" +#include "base/prefs/public/pref_change_registrar.h" #include "chrome/browser/extensions/extension_install_ui.h" #include "chrome/browser/extensions/extension_uninstall_dialog.h" #include "chrome/browser/extensions/extension_warning_set.h" diff --git a/chrome/browser/ui/webui/ntp/app_launcher_handler.h b/chrome/browser/ui/webui/ntp/app_launcher_handler.h index ecb7cd5..d91f6ec 100644 --- a/chrome/browser/ui/webui/ntp/app_launcher_handler.h +++ b/chrome/browser/ui/webui/ntp/app_launcher_handler.h @@ -8,7 +8,7 @@ #include <string> #include "base/memory/scoped_ptr.h" -#include "chrome/browser/api/prefs/pref_change_registrar.h" +#include "base/prefs/public/pref_change_registrar.h" #include "chrome/browser/common/cancelable_request.h" #include "chrome/browser/extensions/extension_install_prompt.h" #include "chrome/browser/extensions/extension_uninstall_dialog.h" diff --git a/chrome/browser/ui/webui/ntp/new_tab_ui.h b/chrome/browser/ui/webui/ntp/new_tab_ui.h index 388af47..0fd64c5 100644 --- a/chrome/browser/ui/webui/ntp/new_tab_ui.h +++ b/chrome/browser/ui/webui/ntp/new_tab_ui.h @@ -9,9 +9,9 @@ #include <string> #include "base/gtest_prod_util.h" +#include "base/prefs/public/pref_change_registrar.h" #include "base/time.h" #include "base/timer.h" -#include "chrome/browser/api/prefs/pref_change_registrar.h" #include "chrome/browser/sessions/tab_restore_service.h" #include "chrome/browser/ui/webui/chrome_url_data_manager.h" #include "content/public/browser/notification_observer.h" diff --git a/chrome/browser/ui/webui/ntp/ntp_login_handler.cc b/chrome/browser/ui/webui/ntp/ntp_login_handler.cc index 14ea6fa..5918e30 100644 --- a/chrome/browser/ui/webui/ntp/ntp_login_handler.cc +++ b/chrome/browser/ui/webui/ntp/ntp_login_handler.cc @@ -9,12 +9,12 @@ #include "base/bind.h" #include "base/bind_helpers.h" #include "base/metrics/histogram.h" +#include "base/prefs/pref_notifier.h" #include "base/utf_string_conversions.h" #include "base/values.h" #include "chrome/app/chrome_command_ids.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/managed_mode.h" -#include "chrome/browser/prefs/pref_notifier.h" #include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile_info_cache.h" diff --git a/chrome/browser/ui/webui/ntp/ntp_resource_cache.h b/chrome/browser/ui/webui/ntp/ntp_resource_cache.h index 0254e94..c4a57b1 100644 --- a/chrome/browser/ui/webui/ntp/ntp_resource_cache.h +++ b/chrome/browser/ui/webui/ntp/ntp_resource_cache.h @@ -8,8 +8,8 @@ #include "base/basictypes.h" #include "base/compiler_specific.h" #include "base/memory/ref_counted.h" +#include "base/prefs/public/pref_change_registrar.h" #include "base/string16.h" -#include "chrome/browser/api/prefs/pref_change_registrar.h" #include "chrome/browser/profiles/profile_keyed_service.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" diff --git a/chrome/browser/ui/webui/options/browser_options_handler.h b/chrome/browser/ui/webui/options/browser_options_handler.h index 60b57e6..b67757a 100644 --- a/chrome/browser/ui/webui/options/browser_options_handler.h +++ b/chrome/browser/ui/webui/options/browser_options_handler.h @@ -21,7 +21,7 @@ #if defined(OS_CHROMEOS) #include "chrome/browser/chromeos/system/pointer_device_observer.h" #else -#include "chrome/browser/api/prefs/pref_change_registrar.h" +#include "base/prefs/public/pref_change_registrar.h" #endif // defined(OS_CHROMEOS) class AutocompleteController; diff --git a/chrome/browser/ui/webui/options/chromeos/core_chromeos_options_handler.cc b/chrome/browser/ui/webui/options/chromeos/core_chromeos_options_handler.cc index 7894ff1..76f5f716 100644 --- a/chrome/browser/ui/webui/options/chromeos/core_chromeos_options_handler.cc +++ b/chrome/browser/ui/webui/options/chromeos/core_chromeos_options_handler.cc @@ -7,6 +7,7 @@ #include <string> #include "base/bind.h" +#include "base/prefs/public/pref_change_registrar.h" #include "base/string_number_conversions.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" @@ -16,7 +17,6 @@ #include "chrome/browser/chromeos/proxy_cros_settings_parser.h" #include "chrome/browser/chromeos/settings/cros_settings.h" #include "chrome/browser/policy/browser_policy_connector.h" -#include "chrome/browser/api/prefs/pref_change_registrar.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/webui/chromeos/ui_account_tweaks.h" #include "chrome/browser/ui/webui/options/chromeos/accounts_options_handler.h" diff --git a/chrome/browser/ui/webui/options/chromeos/core_chromeos_options_handler.h b/chrome/browser/ui/webui/options/chromeos/core_chromeos_options_handler.h index 46fa0ee..82b9298f 100644 --- a/chrome/browser/ui/webui/options/chromeos/core_chromeos_options_handler.h +++ b/chrome/browser/ui/webui/options/chromeos/core_chromeos_options_handler.h @@ -7,7 +7,7 @@ #include "base/compiler_specific.h" #include "base/memory/weak_ptr.h" -#include "chrome/browser/api/prefs/pref_change_registrar.h" +#include "base/prefs/public/pref_change_registrar.h" #include "chrome/browser/ui/webui/options/core_options_handler.h" namespace chromeos { diff --git a/chrome/browser/ui/webui/options/content_settings_handler.h b/chrome/browser/ui/webui/options/content_settings_handler.h index f876775..63a83ae 100644 --- a/chrome/browser/ui/webui/options/content_settings_handler.h +++ b/chrome/browser/ui/webui/options/content_settings_handler.h @@ -9,11 +9,11 @@ #include <string> #include "base/memory/scoped_ptr.h" -#include "chrome/browser/api/prefs/pref_change_registrar.h" +#include "base/prefs/public/pref_change_registrar.h" #include "chrome/browser/pepper_flash_settings_manager.h" #include "chrome/browser/ui/webui/options/options_ui.h" -#include "chrome/common/content_settings_types.h" #include "chrome/common/content_settings.h" +#include "chrome/common/content_settings_types.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" diff --git a/chrome/browser/ui/webui/options/core_options_handler.h b/chrome/browser/ui/webui/options/core_options_handler.h index 31d8efd..aff1ee7 100644 --- a/chrome/browser/ui/webui/options/core_options_handler.h +++ b/chrome/browser/ui/webui/options/core_options_handler.h @@ -9,8 +9,8 @@ #include <string> #include "base/callback.h" +#include "base/prefs/public/pref_change_registrar.h" #include "base/values.h" -#include "chrome/browser/api/prefs/pref_change_registrar.h" #include "chrome/browser/plugins/plugin_status_pref_setter.h" #include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/ui/webui/options/options_ui.h" diff --git a/chrome/browser/ui/webui/options/media_galleries_handler.h b/chrome/browser/ui/webui/options/media_galleries_handler.h index 13fdac1..d5057b5 100644 --- a/chrome/browser/ui/webui/options/media_galleries_handler.h +++ b/chrome/browser/ui/webui/options/media_galleries_handler.h @@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_UI_WEBUI_OPTIONS_MEDIA_GALLERIES_HANDLER_H_ #define CHROME_BROWSER_UI_WEBUI_OPTIONS_MEDIA_GALLERIES_HANDLER_H_ -#include "chrome/browser/api/prefs/pref_change_registrar.h" +#include "base/prefs/public/pref_change_registrar.h" #include "chrome/browser/ui/webui/options/options_ui.h" #include "content/public/browser/notification_observer.h" #include "ui/base/dialogs/select_file_dialog.h" diff --git a/chrome/browser/ui/webui/options/preferences_browsertest.cc b/chrome/browser/ui/webui/options/preferences_browsertest.cc index 5c1f81c8..b8d3bcc 100644 --- a/chrome/browser/ui/webui/options/preferences_browsertest.cc +++ b/chrome/browser/ui/webui/options/preferences_browsertest.cc @@ -10,8 +10,8 @@ #include "base/json/json_reader.h" #include "base/json/json_writer.h" #include "base/memory/scoped_ptr.h" +#include "base/prefs/public/pref_service_base.h" #include "base/values.h" -#include "chrome/browser/api/prefs/pref_service_base.h" #include "chrome/browser/policy/browser_policy_connector.h" #include "chrome/browser/policy/policy_map.h" #include "chrome/browser/profiles/profile.h" @@ -31,9 +31,9 @@ #include "testing/gtest/include/gtest/gtest.h" #if defined(OS_CHROMEOS) -#include "chrome/browser/chromeos/settings/cros_settings_names.h" -#include "chrome/browser/chromeos/settings/cros_settings.h" #include "chrome/browser/chromeos/proxy_cros_settings_parser.h" +#include "chrome/browser/chromeos/settings/cros_settings.h" +#include "chrome/browser/chromeos/settings/cros_settings_names.h" #endif using testing::AllOf; diff --git a/chrome/browser/ui/webui/options/preferences_browsertest.h b/chrome/browser/ui/webui/options/preferences_browsertest.h index a0878e6..675f76a 100644 --- a/chrome/browser/ui/webui/options/preferences_browsertest.h +++ b/chrome/browser/ui/webui/options/preferences_browsertest.h @@ -10,7 +10,7 @@ #include "base/basictypes.h" #include "base/compiler_specific.h" -#include "chrome/browser/api/prefs/pref_change_registrar.h" +#include "base/prefs/public/pref_change_registrar.h" #include "chrome/browser/policy/mock_configuration_policy_provider.h" #include "chrome/browser/policy/policy_types.h" #include "chrome/browser/prefs/pref_service.h" diff --git a/chrome/browser/ui/webui/options/startup_pages_handler.h b/chrome/browser/ui/webui/options/startup_pages_handler.h index 3a84ac7..98f7f23 100644 --- a/chrome/browser/ui/webui/options/startup_pages_handler.h +++ b/chrome/browser/ui/webui/options/startup_pages_handler.h @@ -8,7 +8,7 @@ #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" -#include "chrome/browser/api/prefs/pref_change_registrar.h" +#include "base/prefs/public/pref_change_registrar.h" #include "chrome/browser/api/prefs/pref_member.h" #include "chrome/browser/autocomplete/autocomplete_controller_delegate.h" #include "chrome/browser/ui/webui/options/options_ui.h" diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi index 00ebc4d..2c1822b 100644 --- a/chrome/chrome_browser.gypi +++ b/chrome/chrome_browser.gypi @@ -150,8 +150,6 @@ 'browser/api/infobars/one_click_signin_infobar_delegate.h', 'browser/api/infobars/simple_alert_infobar_delegate.cc', 'browser/api/infobars/simple_alert_infobar_delegate.h', - 'browser/api/prefs/pref_change_registrar.cc', - 'browser/api/prefs/pref_change_registrar.h', 'browser/api/prefs/pref_member.cc', 'browser/api/prefs/pref_member.h', 'browser/api/sync/profile_sync_service_base.h', @@ -1406,21 +1404,14 @@ 'browser/prefs/browser_prefs.h', 'browser/prefs/command_line_pref_store.cc', 'browser/prefs/command_line_pref_store.h', - 'browser/prefs/default_pref_store.cc', - 'browser/prefs/default_pref_store.h', 'browser/prefs/incognito_mode_prefs.cc', 'browser/prefs/incognito_mode_prefs.h', - 'browser/prefs/overlay_user_pref_store.cc', - 'browser/prefs/overlay_user_pref_store.h', 'browser/prefs/pref_model_associator.cc', 'browser/prefs/pref_model_associator.h', - 'browser/prefs/pref_notifier.h', 'browser/prefs/pref_notifier_impl.cc', 'browser/prefs/pref_notifier_impl.h', 'browser/prefs/pref_service.cc', 'browser/prefs/pref_service.h', - 'browser/prefs/pref_value_map.cc', - 'browser/prefs/pref_value_map.h', 'browser/prefs/pref_value_store.cc', 'browser/prefs/pref_value_store.h', 'browser/prefs/proxy_config_dictionary.cc', @@ -1431,8 +1422,6 @@ 'browser/prefs/scoped_user_pref_update.h', 'browser/prefs/session_startup_pref.cc', 'browser/prefs/session_startup_pref.h', - 'browser/prefs/value_map_pref_store.cc', - 'browser/prefs/value_map_pref_store.h', 'browser/prerender/prerender_condition.h', 'browser/prerender/prerender_config.cc', 'browser/prerender/prerender_config.h', @@ -2135,6 +2124,21 @@ # This file is generated by the autofill_regexes action. '<(SHARED_INTERMEDIATE_DIR)/autofill_regex_constants.cc', + + # TODO(joi): Move to 'base_prefs' target in base/base.gyp once + # Prefs move is complete and dependencies have been broken. + '../base/prefs/default_pref_store.cc', + '../base/prefs/default_pref_store.h', + '../base/prefs/overlay_user_pref_store.cc', + '../base/prefs/overlay_user_pref_store.h', + '../base/prefs/pref_notifier.h', + '../base/prefs/pref_value_map.cc', + '../base/prefs/pref_value_map.h', + '../base/prefs/public/pref_change_registrar.cc', + '../base/prefs/public/pref_change_registrar.h', + '../base/prefs/public/pref_service_base.h', + '../base/prefs/value_map_pref_store.cc', + '../base/prefs/value_map_pref_store.h', ], 'conditions': [ ['enable_one_click_signin==0', { diff --git a/chrome/chrome_common.gypi b/chrome/chrome_common.gypi index e6e52ba5..c154ef8 100644 --- a/chrome/chrome_common.gypi +++ b/chrome/chrome_common.gypi @@ -220,8 +220,6 @@ 'common/important_file_writer.h', 'common/instant_types.cc', 'common/instant_types.h', - 'common/json_pref_store.cc', - 'common/json_pref_store.h', 'common/json_schema_constants.cc', 'common/json_schema_constants.h', 'common/json_schema_validator.cc', @@ -272,9 +270,6 @@ 'common/password_generation_util.h', 'common/pepper_flash.cc', 'common/pepper_flash.h', - 'common/persistent_pref_store.h', - 'common/pref_store.cc', - 'common/pref_store.h', 'common/print_messages.cc', 'common/print_messages.h', 'common/profiling.cc', @@ -322,6 +317,14 @@ 'common/zip_internal.h', 'common/zip_reader.cc', 'common/zip_reader.h', + + # TODO(joi): Move to 'base_prefs' target in base/base.gyp once + # Prefs move is complete and dependencies have been broken. + '../base/prefs/json_pref_store.cc', + '../base/prefs/json_pref_store.h', + '../base/prefs/persistent_pref_store.h', + '../base/prefs/pref_store.cc', + '../base/prefs/pref_store.h', ], 'conditions': [ ['OS != "ios"', { diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi index 807e165..78d993c 100644 --- a/chrome/chrome_tests.gypi +++ b/chrome/chrome_tests.gypi @@ -166,8 +166,6 @@ 'browser/prefs/pref_observer_mock.h', 'browser/prefs/pref_service_mock_builder.cc', 'browser/prefs/pref_service_mock_builder.h', - 'browser/prefs/testing_pref_store.cc', - 'browser/prefs/testing_pref_store.h', 'browser/protector/mock_protector_service.cc', 'browser/protector/mock_protector_service.h', 'browser/protector/mock_setting_change.cc', @@ -209,8 +207,6 @@ 'common/extensions/extension_builder.h', 'common/extensions/value_builder.cc', 'common/extensions/value_builder.h', - 'common/pref_store_observer_mock.cc', - 'common/pref_store_observer_mock.h', 'renderer/chrome_mock_render_thread.cc', 'renderer/chrome_mock_render_thread.h', 'renderer/mock_printer.cc', @@ -289,6 +285,14 @@ 'test/logging/win/test_log_collector.h', 'test/ppapi/ppapi_test.cc', 'test/ppapi/ppapi_test.h', + + # TODO(joi): Move to 'base_prefs' target in base/base.gyp once + # Prefs move is complete and dependencies have been broken. + '../base/prefs/testing_pref_store.cc', + '../base/prefs/testing_pref_store.h', + '../base/prefs/pref_store_observer_mock.cc', + '../base/prefs/pref_store_observer_mock.h', + '../ui/gfx/image/image_unittest_util.h', '../ui/gfx/image/image_unittest_util.cc', '../webkit/quota/mock_quota_manager.cc', @@ -1015,7 +1019,6 @@ 'app/chrome_dll.rc', # All unittests in browser, common, renderer and service. 'browser/about_flags_unittest.cc', - 'browser/api/prefs/pref_change_registrar_unittest.cc', 'browser/api/prefs/pref_member_unittest.cc', 'browser/app_controller_mac_unittest.mm', 'browser/autocomplete/autocomplete_input_unittest.cc', @@ -1519,11 +1522,9 @@ 'browser/preferences_mock_mac.h', 'browser/prefs/command_line_pref_store_unittest.cc', 'browser/prefs/incognito_mode_prefs_unittest.cc', - 'browser/prefs/overlay_user_pref_store_unittest.cc', 'browser/prefs/pref_model_associator_unittest.cc', 'browser/prefs/pref_notifier_impl_unittest.cc', 'browser/prefs/pref_service_unittest.cc', - 'browser/prefs/pref_value_map_unittest.cc', 'browser/prefs/pref_value_store_unittest.cc', 'browser/prefs/proxy_config_dictionary_unittest.cc', 'browser/prefs/proxy_policy_unittest.cc', @@ -2061,7 +2062,6 @@ 'common/extensions/value_counter_unittest.cc', 'common/extensions/api/extension_api_unittest.cc', 'common/important_file_writer_unittest.cc', - 'common/json_pref_store_unittest.cc', 'common/json_schema_validator_unittest.cc', 'common/json_schema_validator_unittest_base.cc', 'common/json_schema_validator_unittest_base.h', @@ -2130,6 +2130,14 @@ '../ash/test/test_launcher_delegate.cc', '../ash/test/test_launcher_delegate.h', '../ash/test/test_shell_delegate.cc', + + # TODO(joi): Move to 'base_prefs' target in base/base.gyp once + # Prefs move is complete and dependencies have been broken. + '../base/prefs/public/pref_change_registrar_unittest.cc', + '../base/prefs/overlay_user_pref_store_unittest.cc', + '../base/prefs/pref_value_map_unittest.cc', + '../base/prefs/json_pref_store_unittest.cc', + # TODO(joi): Move the google_apis tests to a separate # google_apis_unittests executable. '../google_apis/google_api_keys_unittest.cc', diff --git a/chrome/service/service_process_prefs.h b/chrome/service/service_process_prefs.h index ef6d836..2bc3e5fe 100644 --- a/chrome/service/service_process_prefs.h +++ b/chrome/service/service_process_prefs.h @@ -7,7 +7,7 @@ #include <string> -#include "chrome/common/json_pref_store.h" +#include "base/prefs/json_pref_store.h" namespace base { class DictionaryValue; diff --git a/chrome/test/base/testing_pref_service.cc b/chrome/test/base/testing_pref_service.cc index 15eac13..b066439 100644 --- a/chrome/test/base/testing_pref_service.cc +++ b/chrome/test/base/testing_pref_service.cc @@ -4,14 +4,14 @@ #include "chrome/test/base/testing_pref_service.h" +#include "base/prefs/default_pref_store.h" +#include "base/prefs/testing_pref_store.h" #include "chrome/browser/policy/configuration_policy_pref_store.h" #include "chrome/browser/prefs/browser_prefs.h" #include "chrome/browser/prefs/command_line_pref_store.h" -#include "chrome/browser/prefs/default_pref_store.h" #include "chrome/browser/prefs/pref_model_associator.h" #include "chrome/browser/prefs/pref_notifier_impl.h" #include "chrome/browser/prefs/pref_value_store.h" -#include "chrome/browser/prefs/testing_pref_store.h" #include "chrome/test/base/testing_browser_process.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/test/base/testing_profile.cc b/chrome/test/base/testing_profile.cc index 63eab1b..8089ec5 100644 --- a/chrome/test/base/testing_profile.cc +++ b/chrome/test/base/testing_profile.cc @@ -11,6 +11,7 @@ #include "base/file_util.h" #include "base/message_loop_proxy.h" #include "base/path_service.h" +#include "base/prefs/testing_pref_store.h" #include "base/run_loop.h" #include "base/string_number_conversions.h" #include "chrome/browser/autocomplete/autocomplete_classifier.h" @@ -37,7 +38,6 @@ #include "chrome/browser/notifications/desktop_notification_service_factory.h" #include "chrome/browser/policy/user_cloud_policy_manager.h" #include "chrome/browser/prefs/browser_prefs.h" -#include "chrome/browser/prefs/testing_pref_store.h" #include "chrome/browser/prerender/prerender_manager.h" #include "chrome/browser/profiles/profile_dependency_manager.h" #include "chrome/browser/protector/protector_service_factory.h" diff --git a/chrome/test/reliability/page_load_test.cc b/chrome/test/reliability/page_load_test.cc index ef814e3..9e3909d 100644 --- a/chrome/test/reliability/page_load_test.cc +++ b/chrome/test/reliability/page_load_test.cc @@ -43,6 +43,7 @@ #include "base/i18n/time_formatting.h" #include "base/memory/scoped_ptr.h" #include "base/path_service.h" +#include "base/prefs/json_pref_store.h" #include "base/string_number_conversions.h" #include "base/string_util.h" #include "base/test/test_file_util.h" @@ -56,7 +57,6 @@ #include "chrome/common/chrome_paths.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/chrome_version_info.h" -#include "chrome/common/json_pref_store.h" #include "chrome/common/logging_chrome.h" #include "chrome/common/pref_names.h" #include "chrome/common/render_messages.h" diff --git a/chrome_frame/test/reliability/page_load_test.cc b/chrome_frame/test/reliability/page_load_test.cc index f8accc2..72e653b 100644 --- a/chrome_frame/test/reliability/page_load_test.cc +++ b/chrome_frame/test/reliability/page_load_test.cc @@ -28,6 +28,7 @@ #include "base/file_version_info.h" #include "base/i18n/time_formatting.h" #include "base/path_service.h" +#include "base/prefs/json_pref_store.h" #include "base/string_number_conversions.h" #include "base/string_util.h" #include "base/test/test_file_util.h" @@ -42,7 +43,6 @@ #include "chrome/common/chrome_paths.h" #include "chrome/common/chrome_paths_internal.h" #include "chrome/common/chrome_switches.h" -#include "chrome/common/json_pref_store.h" #include "chrome/common/logging_chrome.h" #include "chrome/common/pref_names.h" #include "chrome/test/automation/automation_proxy.h" |