Skip to content

GitLab

T
tangled
Commit f4044df1 authored by jamescook@chromium.org's avatar jamescook@chromium.org
Browse files
Options

Move extensions storage API implementation to src/extensions 

This moves the core functionality (frontend, backend and local storage
implementations) to src/extensions while leaving Chrome-specific sync storage
and managed storage implementations in src/chrome.

BUG=348058
TEST=unit_tests *Storage*:*Settings* browser_tests ExtensionSettings*
TBR=zea@chromium.org for header file move touching chrome/browser/sync/test/integration/extension_settings_helper.cc

Review URL: https://codereview.chromium.org/189263013

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@255901 0039d316-1c4b-4281-b951-d872f2087c98
parent 1901dbcb
Hide whitespace changes
Inline Side-by-side
Showing with 150 additions and 150 deletions
chrome/browser/extensions/api/storage/managed_value_store_cache.cc
View file @ f4044df1
......@@ -12,7 +12,6 @@
#include "base/memory/weak_ptr.h"
#include "chrome/browser/chrome_notification_types.h"
#include "chrome/browser/extensions/api/storage/policy_value_store.h"
#include "chrome/browser/extensions/api/storage/settings_storage_factory.h"
#include "chrome/browser/extensions/extension_service.h"
#include "chrome/browser/policy/profile_policy_connector.h"
#include "chrome/browser/policy/profile_policy_connector_factory.h"
......@@ -30,6 +29,7 @@
#include "content/public/browser/notification_observer.h"
#include "content/public/browser/notification_registrar.h"
#include "content/public/browser/notification_source.h"
#include "extensions/browser/api/storage/settings_storage_factory.h"
#include "extensions/browser/extension_prefs.h"
#include "extensions/browser/extension_system.h"
#include "extensions/browser/value_store/value_store_change.h"
......
chrome/browser/extensions/api/storage/managed_value_store_cache.h
View file @ f4044df1
......@@ -14,9 +14,9 @@
#include "base/memory/linked_ptr.h"
#include "base/memory/ref_counted.h"
#include "base/memory/scoped_ptr.h"
#include "chrome/browser/extensions/api/storage/settings_observer.h"
#include "chrome/browser/extensions/api/storage/value_store_cache.h"
#include "components/policy/core/common/policy_service.h"
#include "extensions/browser/api/storage/settings_observer.h"
#include "extensions/browser/api/storage/value_store_cache.h"
class Profile;
......
chrome/browser/extensions/api/storage/policy_value_store.h
View file @ f4044df1
......@@ -11,7 +11,7 @@
#include "base/compiler_specific.h"
#include "base/memory/ref_counted.h"
#include "base/memory/scoped_ptr.h"
#include "chrome/browser/extensions/api/storage/settings_observer.h"
#include "extensions/browser/api/storage/settings_observer.h"
#include "extensions/browser/value_store/value_store.h"
namespace policy {
......
chrome/browser/extensions/api/storage/policy_value_store_unittest.cc
View file @ f4044df1
......@@ -10,10 +10,10 @@
#include "base/memory/ref_counted.h"
#include "base/memory/scoped_ptr.h"
#include "base/message_loop/message_loop.h"
#include "chrome/browser/extensions/api/storage/settings_observer.h"
#include "components/policy/core/common/external_data_fetcher.h"
#include "components/policy/core/common/policy_map.h"
#include "content/public/test/test_browser_thread.h"
#include "extensions/browser/api/storage/settings_observer.h"
#include "extensions/browser/value_store/leveldb_value_store.h"
#include "extensions/browser/value_store/value_store_unittest.h"
#include "testing/gmock/include/gmock/gmock.h"
......
chrome/browser/extensions/api/storage/settings_apitest.cc
View file @ f4044df1
......@@ -7,7 +7,6 @@
#include "base/memory/ref_counted.h"
#include "base/run_loop.h"
#include "base/values.h"
#include "chrome/browser/extensions/api/storage/settings_frontend.h"
#include "chrome/browser/extensions/api/storage/settings_sync_util.h"
#include "chrome/browser/extensions/extension_apitest.h"
#include "chrome/browser/extensions/extension_system_factory.h"
......@@ -15,6 +14,7 @@
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/ui/browser.h"
#include "chrome/test/base/ui_test_utils.h"
#include "extensions/browser/api/storage/settings_frontend.h"
#include "extensions/browser/api/storage/settings_namespace.h"
#include "extensions/browser/extension_system.h"
#include "extensions/common/value_builder.h"
......
chrome/browser/extensions/api/storage/settings_sync_unittest.cc
View file @ f4044df1
......@@ -8,15 +8,14 @@
#include "base/json/json_writer.h"
#include "base/memory/scoped_ptr.h"
#include "base/message_loop/message_loop.h"
#include "chrome/browser/extensions/api/storage/leveldb_settings_storage_factory.h"
#include "chrome/browser/extensions/api/storage/settings_frontend.h"
#include "chrome/browser/extensions/api/storage/settings_storage_factory.h"
#include "chrome/browser/extensions/api/storage/settings_sync_util.h"
#include "chrome/browser/extensions/api/storage/settings_test_util.h"
#include "chrome/browser/extensions/api/storage/sync_value_store_cache.h"
#include "chrome/browser/extensions/api/storage/syncable_settings_storage.h"
#include "chrome/browser/extensions/test_extension_service.h"
#include "content/public/test/test_browser_thread.h"
#include "extensions/browser/api/storage/leveldb_settings_storage_factory.h"
#include "extensions/browser/api/storage/settings_frontend.h"
#include "extensions/browser/api/storage/settings_storage_factory.h"
#include "extensions/browser/api/storage/settings_test_util.h"
#include "extensions/browser/extension_system.h"
#include "extensions/browser/value_store/testing_value_store.h"
#include "extensions/common/manifest.h"
......
chrome/browser/extensions/api/storage/settings_sync_util.cc
View file @ f4044df1
......@@ -6,9 +6,9 @@
#include "base/json/json_writer.h"
#include "base/values.h"
#include "chrome/browser/extensions/api/storage/settings_frontend.h"
#include "chrome/browser/extensions/api/storage/sync_value_store_cache.h"
#include "content/public/browser/browser_thread.h"
#include "extensions/browser/api/storage/settings_frontend.h"
#include "sync/protocol/app_setting_specifics.pb.h"
#include "sync/protocol/extension_setting_specifics.pb.h"
#include "sync/protocol/sync.pb.h"
......
chrome/browser/extensions/api/storage/storage_api.cc
View file @ f4044df1
......@@ -10,9 +10,9 @@
#include "base/bind.h"
#include "base/strings/stringprintf.h"
#include "base/values.h"
#include "chrome/browser/extensions/api/storage/settings_frontend.h"
#include "chrome/common/extensions/api/storage.h"
#include "content/public/browser/browser_thread.h"
#include "extensions/browser/api/storage/settings_frontend.h"
#include "extensions/browser/quota_service.h"
namespace extensions {
......
chrome/browser/extensions/api/storage/storage_api.h
View file @ f4044df1
......@@ -7,9 +7,9 @@
#include "base/compiler_specific.h"
#include "base/memory/ref_counted.h"
#include "chrome/browser/extensions/api/storage/settings_observer.h"
#include "chrome/browser/extensions/chrome_extension_function.h"
#include "extensions/browser/api/storage/settings_namespace.h"
#include "extensions/browser/api/storage/settings_observer.h"
#include "extensions/browser/value_store/value_store.h"
namespace extensions {
......
chrome/browser/extensions/api/storage/storage_api_unittest.cc
View file @ f4044df1
......@@ -6,14 +6,14 @@
#include "base/files/file_path.h"
#include "base/memory/ref_counted.h"
#include "base/strings/stringprintf.h"
#include "chrome/browser/extensions/api/storage/leveldb_settings_storage_factory.h"
#include "chrome/browser/extensions/api/storage/settings_frontend.h"
#include "chrome/browser/extensions/api/storage/settings_storage_quota_enforcer.h"
#include "chrome/browser/extensions/api/storage/settings_test_util.h"
#include "chrome/browser/extensions/api/storage/storage_api.h"
#include "chrome/browser/extensions/extension_api_unittest.h"
#include "chrome/browser/extensions/extension_service.h"
#include "chrome/browser/extensions/test_extension_system.h"
#include "extensions/browser/api/storage/leveldb_settings_storage_factory.h"
#include "extensions/browser/api/storage/settings_frontend.h"
#include "extensions/browser/api/storage/settings_storage_quota_enforcer.h"
#include "extensions/browser/api/storage/settings_test_util.h"
#include "extensions/browser/event_router.h"
#include "extensions/browser/extension_prefs.h"
#include "extensions/browser/extension_system.h"
......
chrome/browser/extensions/api/storage/sync_storage_backend.h
View file @ f4044df1
......@@ -14,10 +14,10 @@
#include "base/memory/linked_ptr.h"
#include "base/memory/ref_counted.h"
#include "base/memory/scoped_ptr.h"
#include "chrome/browser/extensions/api/storage/settings_backend.h"
#include "chrome/browser/extensions/api/storage/settings_observer.h"
#include "chrome/browser/extensions/api/storage/settings_storage_factory.h"
#include "chrome/browser/extensions/api/storage/settings_storage_quota_enforcer.h"
#include "extensions/browser/api/storage/settings_backend.h"
#include "extensions/browser/api/storage/settings_observer.h"
#include "extensions/browser/api/storage/settings_storage_factory.h"
#include "extensions/browser/api/storage/settings_storage_quota_enforcer.h"
#include "sync/api/syncable_service.h"
namespace syncer {
......
chrome/browser/extensions/api/storage/sync_value_store_cache.cc
View file @ f4044df1
......@@ -8,12 +8,12 @@
#include "base/callback.h"
#include "base/files/file_path.h"
#include "base/sequenced_task_runner.h"
#include "chrome/browser/extensions/api/storage/settings_frontend.h"
#include "chrome/browser/extensions/api/storage/settings_storage_quota_enforcer.h"
#include "chrome/browser/extensions/api/storage/sync_storage_backend.h"
#include "chrome/browser/sync/glue/sync_start_util.h"
#include "chrome/common/extensions/api/storage.h"
#include "content/public/browser/browser_thread.h"
#include "extensions/browser/api/storage/settings_frontend.h"
#include "extensions/browser/api/storage/settings_storage_quota_enforcer.h"
#include "extensions/common/constants.h"
#include "extensions/common/extension.h"
......
chrome/browser/extensions/api/storage/sync_value_store_cache.h
View file @ f4044df1
......@@ -9,8 +9,8 @@
#include "base/compiler_specific.h"
#include "base/memory/ref_counted.h"
#include "base/memory/scoped_ptr.h"
#include "chrome/browser/extensions/api/storage/settings_observer.h"
#include "chrome/browser/extensions/api/storage/value_store_cache.h"
#include "extensions/browser/api/storage/settings_observer.h"
#include "extensions/browser/api/storage/value_store_cache.h"
#include "sync/api/syncable_service.h"
namespace base {
......
chrome/browser/extensions/api/storage/syncable_settings_storage.h
View file @ f4044df1
......@@ -11,7 +11,7 @@
#include "base/observer_list_threadsafe.h"
#include "base/values.h"
#include "chrome/browser/extensions/api/storage/setting_sync_data.h"
#include "chrome/browser/extensions/api/storage/settings_observer.h"
#include "extensions/browser/api/storage/settings_observer.h"
#include "extensions/browser/value_store/value_store.h"
#include "sync/api/sync_change.h"
#include "sync/api/syncable_service.h"
......
chrome/browser/extensions/data_deleter.cc
View file @ f4044df1
......@@ -4,7 +4,6 @@
#include "chrome/browser/extensions/data_deleter.h"
#include "chrome/browser/extensions/api/storage/settings_frontend.h"
#include "chrome/browser/extensions/extension_service.h"
#include "chrome/browser/extensions/extension_special_storage_policy.h"
#include "chrome/browser/profiles/profile.h"
......@@ -14,6 +13,7 @@
#include "content/public/browser/browser_thread.h"
#include "content/public/browser/site_instance.h"
#include "content/public/browser/storage_partition.h"
#include "extensions/browser/api/storage/settings_frontend.h"
#include "extensions/browser/extension_prefs.h"
#include "extensions/common/constants.h"
#include "extensions/common/extension.h"
......
chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
View file @ f4044df1
......@@ -92,7 +92,6 @@
#include "chrome/browser/extensions/api/sockets_tcp/tcp_socket_event_dispatcher.h"
#include "chrome/browser/extensions/api/sockets_tcp_server/tcp_server_socket_event_dispatcher.h"
#include "chrome/browser/extensions/api/sockets_udp/udp_socket_event_dispatcher.h"
#include "chrome/browser/extensions/api/storage/settings_frontend.h"
#include "chrome/browser/extensions/api/streams_private/streams_private_api.h"
#include "chrome/browser/extensions/api/system_info/system_info_api.h"
#include "chrome/browser/extensions/api/tab_capture/tab_capture_registry.h"
......@@ -109,6 +108,7 @@
#include "chrome/browser/extensions/plugin_manager.h"
#include "chrome/browser/extensions/token_cache/token_cache_service_factory.h"
#include "extensions/browser/api/api_resource_manager.h"
#include "extensions/browser/api/storage/settings_frontend.h"
#include "extensions/browser/extension_prefs_factory.h"
#include "extensions/browser/renderer_startup_helper.h"
#endif // defined(ENABLE_EXTENSIONS)
......
chrome/browser/sync/test/integration/extension_settings_helper.cc
View file @ f4044df1
......@@ -10,12 +10,12 @@
#include "base/memory/scoped_ptr.h"
#include "base/synchronization/waitable_event.h"
#include "base/values.h"
#include "chrome/browser/extensions/api/storage/settings_frontend.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/sync/test/integration/extensions_helper.h"
#include "chrome/browser/sync/test/integration/sync_datatype_helper.h"
#include "chrome/browser/sync/test/integration/sync_extension_helper.h"
#include "content/public/browser/browser_thread.h"
#include "extensions/browser/api/storage/settings_frontend.h"
#include "extensions/browser/extension_registry.h"
#include "extensions/browser/value_store/value_store.h"
#include "extensions/common/extension.h"
......
chrome/chrome_browser_extensions.gypi
View file @ f4044df1
......@@ -494,26 +494,12 @@
'browser/extensions/api/sockets_udp/sockets_udp_api.h',
'browser/extensions/api/spellcheck/spellcheck_api.cc',
'browser/extensions/api/spellcheck/spellcheck_api.h',
'browser/extensions/api/storage/leveldb_settings_storage_factory.cc',
'browser/extensions/api/storage/leveldb_settings_storage_factory.h',
'browser/extensions/api/storage/local_storage_backend.cc',
'browser/extensions/api/storage/local_storage_backend.h',
'browser/extensions/api/storage/local_value_store_cache.cc',
'browser/extensions/api/storage/local_value_store_cache.h',
'browser/extensions/api/storage/managed_value_store_cache.cc',
'browser/extensions/api/storage/managed_value_store_cache.h',
'browser/extensions/api/storage/policy_value_store.cc',
'browser/extensions/api/storage/policy_value_store.h',
'browser/extensions/api/storage/setting_sync_data.cc',
'browser/extensions/api/storage/setting_sync_data.h',
'browser/extensions/api/storage/settings_backend.cc',
'browser/extensions/api/storage/settings_backend.h',
'browser/extensions/api/storage/settings_frontend.cc',
'browser/extensions/api/storage/settings_frontend.h',
'browser/extensions/api/storage/settings_observer.h',
'browser/extensions/api/storage/settings_storage_factory.h',
'browser/extensions/api/storage/settings_storage_quota_enforcer.cc',
'browser/extensions/api/storage/settings_storage_quota_enforcer.h',
'browser/extensions/api/storage/settings_sync_processor.cc',
'browser/extensions/api/storage/settings_sync_processor.h',
'browser/extensions/api/storage/settings_sync_util.cc',
......@@ -526,10 +512,6 @@
'browser/extensions/api/storage/sync_value_store_cache.h',
'browser/extensions/api/storage/syncable_settings_storage.cc',
'browser/extensions/api/storage/syncable_settings_storage.h',
'browser/extensions/api/storage/value_store_cache.cc',
'browser/extensions/api/storage/value_store_cache.h',
'browser/extensions/api/storage/weak_unlimited_settings_storage.cc',
'browser/extensions/api/storage/weak_unlimited_settings_storage.h',
'browser/extensions/api/streams_private/streams_private_api.cc',
'browser/extensions/api/streams_private/streams_private_api.h',
'browser/extensions/api/sync_file_system/extension_sync_event_observer.cc',
......
chrome/chrome_tests_unit.gypi
View file @ f4044df1
......@@ -541,6 +541,10 @@
'../components/autofill/content/renderer/test_password_generation_agent.h',
# TODO: Create an extensions_unittests target. http://crbug.com/348066
'../extensions/browser/admin_policy_unittest.cc',
'../extensions/browser/api/storage/settings_frontend_unittest.cc',
'../extensions/browser/api/storage/settings_quota_unittest.cc',
'../extensions/browser/api/storage/settings_test_util.cc',
'../extensions/browser/api/storage/settings_test_util.h',
'../extensions/browser/error_map_unittest.cc',
'../extensions/browser/event_listener_map_unittest.cc',
'../extensions/browser/event_router_unittest.cc',
......@@ -904,11 +908,7 @@
'browser/extensions/api/sockets_tcp_server/sockets_tcp_server_api_unittest.cc',
'browser/extensions/api/sockets_udp/sockets_udp_api_unittest.cc',
'browser/extensions/api/storage/policy_value_store_unittest.cc',
'browser/extensions/api/storage/settings_frontend_unittest.cc',
'browser/extensions/api/storage/settings_quota_unittest.cc',
'browser/extensions/api/storage/settings_sync_unittest.cc',
'browser/extensions/api/storage/settings_test_util.cc',
'browser/extensions/api/storage/settings_test_util.h',
'browser/extensions/api/storage/storage_api_unittest.cc',
'browser/extensions/api/streams_private/streams_private_manifest_unittest.cc',
'browser/extensions/api/system_display/display_info_provider_chromeos_unittest.cc',
......
extensions/browser/DEPS
View file @ f4044df1
......@@ -25,12 +25,20 @@ include_rules = [
]
specific_include_rules = {
".*test\.cc": [
"(.*test|.*test_util)\.(cc|h)": [
# Temporarily allowed testing includes. See above.
# TODO(jamescook): Remove these. http://crbug.com/162530
"+chrome/browser/extensions/extension_service_unittest.h",
"+chrome/browser/extensions/test_extension_system.h",
"+chrome/common/chrome_paths.h",
"+chrome/test/base/testing_profile.h",
],
# TODO(jamescook): Eliminate these after moving storage.idl to src/extensions.
# http://crbug.com/348058
"local_value_store_cache\.cc": [
"+chrome/common/extensions/api/storage.h"
],
"settings_frontend\.cc": [
"+chrome/common/extensions/api/storage.h"
]
}
extensions/browser/api/storage/OWNERS 0 → 100644
View file @ f4044df1
kalman@chromium.org
rdevlin.cronin@chromium.org
chrome/browser/extensions/api/storage/leveldb_settings_storage_factory.cc → extensions/browser/api/storage/leveldb_settings_storage_factory.cc
View file @ f4044df1
// Copyright (c) 2012 The Chromium Authors. All rights reserved.
// Copyright 2014 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#include "chrome/browser/extensions/api/storage/leveldb_settings_storage_factory.h"
#include "extensions/browser/api/storage/leveldb_settings_storage_factory.h"
#include "base/file_util.h"
#include "base/logging.h"
......
chrome/browser/extensions/api/storage/leveldb_settings_storage_factory.h → extensions/browser/api/storage/leveldb_settings_storage_factory.h
View file @ f4044df1
// Copyright (c) 2012 The Chromium Authors. All rights reserved.
// Copyright 2014 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#ifndef CHROME_BROWSER_EXTENSIONS_API_STORAGE_LEVELDB_SETTINGS_STORAGE_FACTORY_H_
#define CHROME_BROWSER_EXTENSIONS_API_STORAGE_LEVELDB_SETTINGS_STORAGE_FACTORY_H_
#ifndef EXTENSIONS_BROWSER_API_STORAGE_LEVELDB_SETTINGS_STORAGE_FACTORY_H_
#define EXTENSIONS_BROWSER_API_STORAGE_LEVELDB_SETTINGS_STORAGE_FACTORY_H_
#include "chrome/browser/extensions/api/storage/settings_storage_factory.h"
#include "extensions/browser/api/storage/settings_storage_factory.h"
namespace extensions {
......@@ -25,4 +25,4 @@ class LeveldbSettingsStorageFactory : public SettingsStorageFactory {
} // namespace extensions
#endif // CHROME_BROWSER_EXTENSIONS_API_STORAGE_LEVELDB_SETTINGS_STORAGE_FACTORY_H_
#endif // EXTENSIONS_BROWSER_API_STORAGE_LEVELDB_SETTINGS_STORAGE_FACTORY_H_
chrome/browser/extensions/api/storage/local_storage_backend.cc → extensions/browser/api/storage/local_storage_backend.cc
View file @ f4044df1
......@@ -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/extensions/api/storage/local_storage_backend.h"
#include "extensions/browser/api/storage/local_storage_backend.h"
#include "base/file_util.h"
#include "chrome/browser/extensions/api/storage/settings_storage_factory.h"
#include "extensions/browser/api/storage/settings_storage_factory.h"
namespace extensions {
......
chrome/browser/extensions/api/storage/local_storage_backend.h → extensions/browser/api/storage/local_storage_backend.h
View file @ f4044df1
......@@ -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_EXTENSIONS_API_STORAGE_LOCAL_STORAGE_BACKEND_H_
#define CHROME_BROWSER_EXTENSIONS_API_STORAGE_LOCAL_STORAGE_BACKEND_H_
#ifndef EXTENSIONS_BROWSER_API_STORAGE_LOCAL_STORAGE_BACKEND_H_
#define EXTENSIONS_BROWSER_API_STORAGE_LOCAL_STORAGE_BACKEND_H_
#include <map>
#include <string>
#include "base/memory/linked_ptr.h"
#include "base/memory/ref_counted.h"
#include "chrome/browser/extensions/api/storage/settings_backend.h"
#include "chrome/browser/extensions/api/storage/settings_storage_quota_enforcer.h"
#include "extensions/browser/api/storage/settings_backend.h"
#include "extensions/browser/api/storage/settings_storage_quota_enforcer.h"
namespace base {
class FilePath;
......@@ -44,4 +44,4 @@ class LocalStorageBackend : public SettingsBackend {
} // namespace extensions
#endif // CHROME_BROWSER_EXTENSIONS_API_STORAGE_LOCAL_STORAGE_BACKEND_H_
#endif // EXTENSIONS_BROWSER_API_STORAGE_LOCAL_STORAGE_BACKEND_H_
chrome/browser/extensions/api/storage/local_value_store_cache.cc → extensions/browser/api/storage/local_value_store_cache.cc
View file @ f4044df1
......@@ -2,19 +2,19 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#include "chrome/browser/extensions/api/storage/local_value_store_cache.h"
#include "extensions/browser/api/storage/local_value_store_cache.h"
#include <limits>
#include "base/bind.h"
#include "base/callback.h"
#include "base/files/file_path.h"
#include "chrome/browser/extensions/api/storage/local_storage_backend.h"
#include "chrome/browser/extensions/api/storage/settings_storage_factory.h"
#include "chrome/browser/extensions/api/storage/settings_storage_quota_enforcer.h"
#include "chrome/browser/extensions/api/storage/weak_unlimited_settings_storage.h"
#include "chrome/common/extensions/api/storage.h"
#include "content/public/browser/browser_thread.h"
#include "extensions/browser/api/storage/local_storage_backend.h"
#include "extensions/browser/api/storage/settings_storage_factory.h"
#include "extensions/browser/api/storage/settings_storage_quota_enforcer.h"
#include "extensions/browser/api/storage/weak_unlimited_settings_storage.h"
#include "extensions/common/constants.h"
#include "extensions/common/extension.h"
#include "extensions/common/permissions/api_permission.h"
......
chrome/browser/extensions/api/storage/local_value_store_cache.h → extensions/browser/api/storage/local_value_store_cache.h
View file @ f4044df1
......@@ -2,14 +2,14 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#ifndef CHROME_BROWSER_EXTENSIONS_API_STORAGE_LOCAL_VALUE_STORE_CACHE_H_
#define CHROME_BROWSER_EXTENSIONS_API_STORAGE_LOCAL_VALUE_STORE_CACHE_H_
#ifndef EXTENSIONS_BROWSER_API_STORAGE_LOCAL_VALUE_STORE_CACHE_H_
#define EXTENSIONS_BROWSER_API_STORAGE_LOCAL_VALUE_STORE_CACHE_H_
#include "base/basictypes.h"
#include "base/compiler_specific.h"
#include "base/memory/ref_counted.h"
#include "base/memory/scoped_ptr.h"
#include "chrome/browser/extensions/api/storage/value_store_cache.h"
#include "extensions/browser/api/storage/value_store_cache.h"
namespace base {
class FilePath;
......@@ -47,4 +47,4 @@ class LocalValueStoreCache : public ValueStoreCache {
} // namespace extensions
#endif // CHROME_BROWSER_EXTENSIONS_API_STORAGE_LOCAL_VALUE_STORE_CACHE_H_
#endif // EXTENSIONS_BROWSER_API_STORAGE_LOCAL_VALUE_STORE_CACHE_H_
chrome/browser/extensions/api/storage/settings_backend.cc → extensions/browser/api/storage/settings_backend.cc
View file @ f4044df1
// Copyright (c) 2012 The Chromium Authors. All rights reserved.
// Copyright 2014 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#include "chrome/browser/extensions/api/storage/settings_backend.h"
#include "extensions/browser/api/storage/settings_backend.h"
#include "base/logging.h"
#include "chrome/browser/extensions/api/storage/settings_storage_factory.h"
#include "content/public/browser/browser_thread.h"
#include "extensions/browser/api/storage/settings_storage_factory.h"
using content::BrowserThread;
......
chrome/browser/extensions/api/storage/settings_backend.h → extensions/browser/api/storage/settings_backend.h
View file @ f4044df1
// Copyright (c) 2012 The Chromium Authors. All rights reserved.
// Copyright 2014 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#ifndef CHROME_BROWSER_EXTENSIONS_API_STORAGE_SETTINGS_BACKEND_H_
#define CHROME_BROWSER_EXTENSIONS_API_STORAGE_SETTINGS_BACKEND_H_
#ifndef EXTENSIONS_BROWSER_API_STORAGE_SETTINGS_BACKEND_H_
#define EXTENSIONS_BROWSER_API_STORAGE_SETTINGS_BACKEND_H_
#include <string>
#include "base/files/file_path.h"
#include "base/memory/ref_counted.h"
#include "base/memory/scoped_ptr.h"
#include "chrome/browser/extensions/api/storage/settings_storage_quota_enforcer.h"
#include "extensions/browser/api/storage/settings_storage_quota_enforcer.h"
namespace syncer {
class SyncableService;
......@@ -71,4 +71,4 @@ class SettingsBackend {
} // namespace extensions
#endif // CHROME_BROWSER_EXTENSIONS_API_STORAGE_SETTINGS_BACKEND_H_
#endif // EXTENSIONS_BROWSER_API_STORAGE_SETTINGS_BACKEND_H_
chrome/browser/extensions/api/storage/settings_frontend.cc → extensions/browser/api/storage/settings_frontend.cc
View file @ f4044df1
// Copyright (c) 2012 The Chromium Authors. All rights reserved.
// Copyright 2014 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#include "chrome/browser/extensions/api/storage/settings_frontend.h"
#include "extensions/browser/api/storage/settings_frontend.h"
#include "base/bind.h"
#include "base/bind_helpers.h"
#include "base/files/file_path.h"
#include "base/json/json_reader.h"
#include "base/lazy_instance.h"
#include "chrome/browser/extensions/api/storage/leveldb_settings_storage_factory.h"
#include "chrome/browser/extensions/api/storage/local_value_store_cache.h"
#include "chrome/common/extensions/api/storage.h"
#include "content/public/browser/browser_context.h"
#include "content/public/browser/browser_thread.h"
#include "extensions/browser/api/extensions_api_client.h"
#include "extensions/browser/api/storage/leveldb_settings_storage_factory.h"
#include "extensions/browser/api/storage/local_value_store_cache.h"
#include "extensions/browser/event_router.h"
#include "extensions/browser/extension_registry.h"
#include "extensions/browser/extension_system.h"
......
chrome/browser/extensions/api/storage/settings_frontend.h → extensions/browser/api/storage/settings_frontend.h
View file @ f4044df1
// Copyright (c) 2012 The Chromium Authors. All rights reserved.
// Copyright 2014 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#ifndef CHROME_BROWSER_EXTENSIONS_API_STORAGE_SETTINGS_FRONTEND_H_
#define CHROME_BROWSER_EXTENSIONS_API_STORAGE_SETTINGS_FRONTEND_H_
#ifndef EXTENSIONS_BROWSER_API_STORAGE_SETTINGS_FRONTEND_H_
#define EXTENSIONS_BROWSER_API_STORAGE_SETTINGS_FRONTEND_H_
#include <map>
#include <string>
#include "base/memory/ref_counted.h"
#include "base/memory/scoped_ptr.h"
#include "chrome/browser/extensions/api/storage/settings_observer.h"
#include "chrome/browser/extensions/api/storage/settings_storage_factory.h"
#include "chrome/browser/extensions/api/storage/value_store_cache.h"
#include "extensions/browser/api/storage/settings_namespace.h"
#include "extensions/browser/api/storage/settings_observer.h"
#include "extensions/browser/api/storage/settings_storage_factory.h"
#include "extensions/browser/api/storage/value_store_cache.h"
#include "extensions/browser/browser_context_keyed_api_factory.h"
namespace content {
......@@ -97,4 +97,4 @@ class SettingsFrontend : public BrowserContextKeyedAPI {
} // namespace extensions
#endif // CHROME_BROWSER_EXTENSIONS_API_STORAGE_SETTINGS_FRONTEND_H_
#endif // EXTENSIONS_BROWSER_API_STORAGE_SETTINGS_FRONTEND_H_
chrome/browser/extensions/api/storage/settings_frontend_unittest.cc → extensions/browser/api/storage/settings_frontend_unittest.cc
View file @ f4044df1
// Copyright (c) 2012 The Chromium Authors. All rights reserved.
// Copyright 2014 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
......@@ -8,12 +8,11 @@
#include "base/memory/scoped_ptr.h"
#include "base/message_loop/message_loop.h"
#include "base/strings/stringprintf.h"
#include "chrome/browser/chrome_notification_types.h"
#include "chrome/browser/extensions/api/storage/leveldb_settings_storage_factory.h"
#include "chrome/browser/extensions/api/storage/settings_frontend.h"
#include "chrome/browser/extensions/api/storage/settings_test_util.h"
#include "content/public/test/test_browser_thread.h"
#include "extensions/browser/api/storage/leveldb_settings_storage_factory.h"
#include "extensions/browser/api/storage/settings_frontend.h"
#include "extensions/browser/api/storage/settings_namespace.h"
#include "extensions/browser/api/storage/settings_test_util.h"
#include "extensions/browser/value_store/value_store.h"
#include "testing/gtest/include/gtest/gtest.h"
......
chrome/browser/extensions/api/storage/settings_observer.h → extensions/browser/api/storage/settings_observer.h
View file @ f4044df1
// Copyright (c) 2011 The Chromium Authors. All rights reserved.
// Copyright 2014 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#ifndef CHROME_BROWSER_EXTENSIONS_API_STORAGE_SETTINGS_OBSERVER_H_
#define CHROME_BROWSER_EXTENSIONS_API_STORAGE_SETTINGS_OBSERVER_H_
#ifndef EXTENSIONS_BROWSER_API_STORAGE_SETTINGS_OBSERVER_H_
#define EXTENSIONS_BROWSER_API_STORAGE_SETTINGS_OBSERVER_H_
#include "base/observer_list_threadsafe.h"
#include "extensions/browser/api/storage/settings_namespace.h"
......@@ -27,4 +27,4 @@ typedef ObserverListThreadSafe<SettingsObserver>
} // namespace extensions
#endif // CHROME_BROWSER_EXTENSIONS_API_STORAGE_SETTINGS_OBSERVER_H_
#endif // EXTENSIONS_BROWSER_API_STORAGE_SETTINGS_OBSERVER_H_
chrome/browser/extensions/api/storage/settings_quota_unittest.cc → extensions/browser/api/storage/settings_quota_unittest.cc
View file @ f4044df1
// Copyright (c) 2012 The Chromium Authors. All rights reserved.
// Copyright 2014 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
......@@ -6,7 +6,7 @@
#include "base/memory/ref_counted.h"
#include "base/memory/scoped_ptr.h"
#include "base/values.h"
#include "chrome/browser/extensions/api/storage/settings_storage_quota_enforcer.h"
#include "extensions/browser/api/storage/settings_storage_quota_enforcer.h"
#include "extensions/browser/value_store/testing_value_store.h"
#include "testing/gtest/include/gtest/gtest.h"
......
chrome/browser/extensions/api/storage/settings_storage_factory.h → extensions/browser/api/storage/settings_storage_factory.h
View file @ f4044df1
// Copyright (c) 2012 The Chromium Authors. All rights reserved.
// Copyright 2014 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#ifndef CHROME_BROWSER_EXTENSIONS_API_STORAGE_SETTINGS_STORAGE_FACTORY_H_
#define CHROME_BROWSER_EXTENSIONS_API_STORAGE_SETTINGS_STORAGE_FACTORY_H_
#ifndef EXTENSIONS_BROWSER_API_STORAGE_SETTINGS_STORAGE_FACTORY_H_
#define EXTENSIONS_BROWSER_API_STORAGE_SETTINGS_STORAGE_FACTORY_H_
#include <string>
......@@ -39,4 +39,4 @@ class SettingsStorageFactory
} // namespace extensions
#endif // CHROME_BROWSER_EXTENSIONS_API_STORAGE_SETTINGS_STORAGE_FACTORY_H_
#endif // EXTENSIONS_BROWSER_API_STORAGE_SETTINGS_STORAGE_FACTORY_H_
chrome/browser/extensions/api/storage/settings_storage_quota_enforcer.cc → extensions/browser/api/storage/settings_storage_quota_enforcer.cc
View file @ f4044df1
// Copyright (c) 2012 The Chromium Authors. All rights reserved.
// Copyright 2014 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#include "chrome/browser/extensions/api/storage/settings_storage_quota_enforcer.h"
#include "extensions/browser/api/storage/settings_storage_quota_enforcer.h"
#include "base/bind.h"
#include "base/json/json_writer.h"
......
chrome/browser/extensions/api/storage/settings_storage_quota_enforcer.h → extensions/browser/api/storage/settings_storage_quota_enforcer.h
View file @ f4044df1
// Copyright (c) 2012 The Chromium Authors. All rights reserved.
// Copyright 2014 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#ifndef CHROME_BROWSER_EXTENSIONS_API_STORAGE_SETTINGS_STORAGE_QUOTA_ENFORCER_H_
#define CHROME_BROWSER_EXTENSIONS_API_STORAGE_SETTINGS_STORAGE_QUOTA_ENFORCER_H_
#ifndef EXTENSIONS_BROWSER_API_STORAGE_SETTINGS_STORAGE_QUOTA_ENFORCER_H_
#define EXTENSIONS_BROWSER_API_STORAGE_SETTINGS_STORAGE_QUOTA_ENFORCER_H_
#include "base/compiler_specific.h"
#include "base/memory/weak_ptr.h"
......@@ -73,4 +73,4 @@ class SettingsStorageQuotaEnforcer : public ValueStore {
} // namespace extensions
#endif // CHROME_BROWSER_EXTENSIONS_API_STORAGE_SETTINGS_STORAGE_QUOTA_ENFORCER_H_
#endif // EXTENSIONS_BROWSER_API_STORAGE_SETTINGS_STORAGE_QUOTA_ENFORCER_H_
chrome/browser/extensions/api/storage/settings_test_util.cc → extensions/browser/api/storage/settings_test_util.cc
View file @ f4044df1
// Copyright (c) 2012 The Chromium Authors. All rights reserved.
// Copyright 2014 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#include "chrome/browser/extensions/api/storage/settings_test_util.h"
#include "extensions/browser/api/storage/settings_test_util.h"
#include "base/files/file_path.h"
#include "chrome/browser/extensions/api/storage/settings_frontend.h"
#include "chrome/browser/extensions/extension_system_factory.h"
#include "extensions/browser/api/storage/settings_frontend.h"
#include "extensions/browser/extension_registry.h"
#include "extensions/browser/extension_system_provider.h"
#include "extensions/browser/extensions_browser_client.h"
#include "extensions/common/extension.h"
#include "extensions/common/permissions/permissions_data.h"
......@@ -110,12 +111,6 @@ EventRouter* MockExtensionSystem::event_router() {
return event_router_.get();
}
ExtensionService* MockExtensionSystem::extension_service() {
ExtensionServiceInterface* as_interface =
static_cast<ExtensionServiceInterface*>(&extension_service_);
return static_cast<ExtensionService*>(as_interface);
}
BrowserContextKeyedService* BuildMockExtensionSystem(
content::BrowserContext* profile) {
return new MockExtensionSystem(static_cast<Profile*>(profile));
......@@ -125,8 +120,9 @@ BrowserContextKeyedService* BuildMockExtensionSystem(
MockProfile::MockProfile(const base::FilePath& file_path)
: TestingProfile(file_path) {
ExtensionSystemFactory::GetInstance()->SetTestingFactoryAndUse(this,
&BuildMockExtensionSystem);
ExtensionsBrowserClient::Get()
->GetExtensionSystemFactory()
->SetTestingFactoryAndUse(this, &BuildMockExtensionSystem);
}
MockProfile::~MockProfile() {}
......
chrome/browser/extensions/api/storage/settings_test_util.h → extensions/browser/api/storage/settings_test_util.h
View file @ f4044df1
// Copyright (c) 2012 The Chromium Authors. All rights reserved.
// Copyright 2014 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#ifndef CHROME_BROWSER_EXTENSIONS_API_STORAGE_SETTINGS_TEST_UTIL_H_
#define CHROME_BROWSER_EXTENSIONS_API_STORAGE_SETTINGS_TEST_UTIL_H_
#ifndef EXTENSIONS_BROWSER_API_STORAGE_SETTINGS_TEST_UTIL_H_
#define EXTENSIONS_BROWSER_API_STORAGE_SETTINGS_TEST_UTIL_H_
#include <set>
#include <string>
......@@ -12,12 +12,10 @@
#include "base/memory/linked_ptr.h"
#include "base/memory/ref_counted.h"
#include "base/memory/scoped_ptr.h"
#include "chrome/browser/extensions/api/storage/settings_storage_factory.h"
#include "chrome/browser/extensions/extension_service.h"
#include "chrome/browser/extensions/test_extension_service.h"
#include "chrome/browser/extensions/test_extension_system.h"
#include "chrome/test/base/testing_profile.h"
#include "extensions/browser/api/storage/settings_namespace.h"
#include "extensions/browser/api/storage/settings_storage_factory.h"
#include "extensions/browser/event_router.h"
#include "extensions/common/extension.h"
......@@ -58,16 +56,14 @@ class MockExtensionSystem : public TestExtensionSystem {
virtual ~MockExtensionSystem();
virtual EventRouter* event_router() OVERRIDE;
virtual ExtensionService* extension_service() OVERRIDE;
private:
scoped_ptr<EventRouter> event_router_;
TestExtensionService extension_service_;
DISALLOW_COPY_AND_ASSIGN(MockExtensionSystem);
};
// A Profile which returns an ExtensionService with enough functionality for
// A Profile which returns an ExtensionSystem with enough functionality for
// the tests.
class MockProfile : public TestingProfile {
public:
......@@ -104,4 +100,4 @@ class ScopedSettingsStorageFactory : public SettingsStorageFactory {
} // namespace extensions
#endif // CHROME_BROWSER_EXTENSIONS_API_STORAGE_SETTINGS_TEST_UTIL_H_
#endif // EXTENSIONS_BROWSER_API_STORAGE_SETTINGS_TEST_UTIL_H_
chrome/browser/extensions/api/storage/value_store_cache.cc → extensions/browser/api/storage/value_store_cache.cc
View file @ f4044df1
// Copyright (c) 2012 The Chromium Authors. All rights reserved.
// Copyright 2014 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#include "chrome/browser/extensions/api/storage/value_store_cache.h"
#include "extensions/browser/api/storage/value_store_cache.h"
namespace extensions {
......
chrome/browser/extensions/api/storage/value_store_cache.h → extensions/browser/api/storage/value_store_cache.h
View file @ f4044df1
// Copyright (c) 2012 The Chromium Authors. All rights reserved.
// Copyright 2014 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#ifndef CHROME_BROWSER_EXTENSIONS_API_STORAGE_VALUE_STORE_CACHE_H_
#define CHROME_BROWSER_EXTENSIONS_API_STORAGE_VALUE_STORE_CACHE_H_
#ifndef EXTENSIONS_BROWSER_API_STORAGE_VALUE_STORE_CACHE_H_
#define EXTENSIONS_BROWSER_API_STORAGE_VALUE_STORE_CACHE_H_
#include <string>
......@@ -54,4 +54,4 @@ class ValueStoreCache {
} // namespace extensions
#endif // CHROME_BROWSER_EXTENSIONS_API_STORAGE_VALUE_STORE_CACHE_H_
#endif // EXTENSIONS_BROWSER_API_STORAGE_VALUE_STORE_CACHE_H_
chrome/browser/extensions/api/storage/weak_unlimited_settings_storage.cc → extensions/browser/api/storage/weak_unlimited_settings_storage.cc
View file @ f4044df1
// Copyright (c) 2012 The Chromium Authors. All rights reserved.
// Copyright 2014 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#include "chrome/browser/extensions/api/storage/weak_unlimited_settings_storage.h"
#include "extensions/browser/api/storage/weak_unlimited_settings_storage.h"
namespace extensions {
......
chrome/browser/extensions/api/storage/weak_unlimited_settings_storage.h → extensions/browser/api/storage/weak_unlimited_settings_storage.h
View file @ f4044df1
// Copyright (c) 2012 The Chromium Authors. All rights reserved.
// Copyright 2014 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#ifndef CHROME_BROWSER_EXTENSIONS_API_STORAGE_WEAK_UNLIMITED_SETTINGS_STORAGE_H_
#define CHROME_BROWSER_EXTENSIONS_API_STORAGE_WEAK_UNLIMITED_SETTINGS_STORAGE_H_
#ifndef EXTENSIONS_BROWSER_API_STORAGE_WEAK_UNLIMITED_SETTINGS_STORAGE_H_
#define EXTENSIONS_BROWSER_API_STORAGE_WEAK_UNLIMITED_SETTINGS_STORAGE_H_
#include "base/compiler_specific.h"
#include "extensions/browser/value_store/value_store.h"
......@@ -48,4 +48,4 @@ class WeakUnlimitedSettingsStorage : public ValueStore {
} // namespace extensions
#endif // CHROME_BROWSER_EXTENSIONS_API_STORAGE_WEAK_UNLIMITED_SETTINGS_STORAGE_H_
#endif // EXTENSIONS_BROWSER_API_STORAGE_WEAK_UNLIMITED_SETTINGS_STORAGE_H_
extensions/extensions.gyp
View file @ f4044df1
......@@ -175,8 +175,26 @@
'browser/api/async_api_function.h',
'browser/api/extensions_api_client.cc',
'browser/api/extensions_api_client.h',
'browser/api/storage/leveldb_settings_storage_factory.cc',
'browser/api/storage/leveldb_settings_storage_factory.h',
'browser/api/storage/local_storage_backend.cc',
'browser/api/storage/local_storage_backend.h',
'browser/api/storage/local_value_store_cache.cc',
'browser/api/storage/local_value_store_cache.h',
'browser/api/storage/settings_backend.cc',
'browser/api/storage/settings_backend.h',
'browser/api/storage/settings_frontend.cc',
'browser/api/storage/settings_frontend.h',
'browser/api/storage/settings_namespace.cc',
'browser/api/storage/settings_namespace.h',
'browser/api/storage/settings_observer.h',
'browser/api/storage/settings_storage_factory.h',
'browser/api/storage/settings_storage_quota_enforcer.cc',
'browser/api/storage/settings_storage_quota_enforcer.h',
'browser/api/storage/value_store_cache.cc',
'browser/api/storage/value_store_cache.h',
'browser/api/storage/weak_unlimited_settings_storage.cc',
'browser/api/storage/weak_unlimited_settings_storage.h',
'browser/api_activity_monitor.h',
'browser/app_sorting.h',
'browser/blacklist_state.h',
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment