Commit 4caa96fb authored by Oleg Davydov's avatar Oleg Davydov Committed by Commit Bot

Move ExtensionCacheFake to extensions/

ExceptionCacheFake class don't have dependencies in chrome/ and can be
useful in tests in extensions/.

Bug: 1015817
Change-Id: I91613840fa5c6f5cc2543157be3ef11997aadaea
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1879262Reviewed-by: default avatarAnatoliy Potapchuk <apotapchuk@chromium.org>
Reviewed-by: default avatarMaksim Ivanov <emaxx@chromium.org>
Reviewed-by: default avatarDevlin <rdevlin.cronin@chromium.org>
Commit-Queue: Oleg Davydov <burunduk@chromium.org>
Cr-Commit-Position: refs/heads/master@{#709852}
parent 3f824413
...@@ -35,7 +35,6 @@ ...@@ -35,7 +35,6 @@
#include "chrome/browser/extensions/extension_util.h" #include "chrome/browser/extensions/extension_util.h"
#include "chrome/browser/extensions/load_error_reporter.h" #include "chrome/browser/extensions/load_error_reporter.h"
#include "chrome/browser/extensions/unpacked_installer.h" #include "chrome/browser/extensions/unpacked_installer.h"
#include "chrome/browser/extensions/updater/extension_cache_fake.h"
#include "chrome/browser/extensions/updater/extension_updater.h" #include "chrome/browser/extensions/updater/extension_updater.h"
#include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile.h"
#include "chrome/browser/profiles/profile_manager.h" #include "chrome/browser/profiles/profile_manager.h"
...@@ -69,6 +68,7 @@ ...@@ -69,6 +68,7 @@
#include "extensions/browser/notification_types.h" #include "extensions/browser/notification_types.h"
#include "extensions/browser/test_extension_registry_observer.h" #include "extensions/browser/test_extension_registry_observer.h"
#include "extensions/browser/uninstall_reason.h" #include "extensions/browser/uninstall_reason.h"
#include "extensions/browser/updater/extension_cache_fake.h"
#include "extensions/common/constants.h" #include "extensions/common/constants.h"
#include "extensions/common/extension_set.h" #include "extensions/common/extension_set.h"
#include "extensions/common/file_test_util.h" #include "extensions/common/file_test_util.h"
......
...@@ -23,7 +23,6 @@ ...@@ -23,7 +23,6 @@
#include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/chrome_notification_types.h"
#include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/extensions/extension_service.h"
#include "chrome/browser/extensions/extension_service_test_base.h" #include "chrome/browser/extensions/extension_service_test_base.h"
#include "chrome/browser/extensions/updater/extension_cache_fake.h"
#include "chrome/browser/extensions/updater/extension_updater.h" #include "chrome/browser/extensions/updater/extension_updater.h"
#include "chrome/common/chrome_constants.h" #include "chrome/common/chrome_constants.h"
#include "chrome/common/chrome_paths.h" #include "chrome/common/chrome_paths.h"
...@@ -35,6 +34,7 @@ ...@@ -35,6 +34,7 @@
#include "content/public/browser/notification_service.h" #include "content/public/browser/notification_service.h"
#include "content/public/test/test_utils.h" #include "content/public/test/test_utils.h"
#include "extensions/browser/pref_names.h" #include "extensions/browser/pref_names.h"
#include "extensions/browser/updater/extension_cache_fake.h"
#include "net/test/embedded_test_server/embedded_test_server.h" #include "net/test/embedded_test_server/embedded_test_server.h"
#include "net/test/embedded_test_server/http_request.h" #include "net/test/embedded_test_server/http_request.h"
#include "net/test/embedded_test_server/http_response.h" #include "net/test/embedded_test_server/http_response.h"
......
...@@ -15,7 +15,6 @@ ...@@ -15,7 +15,6 @@
#include "chrome/browser/extensions/install_verifier.h" #include "chrome/browser/extensions/install_verifier.h"
#include "chrome/browser/extensions/shared_module_service.h" #include "chrome/browser/extensions/shared_module_service.h"
#include "chrome/browser/extensions/unpacked_installer.h" #include "chrome/browser/extensions/unpacked_installer.h"
#include "chrome/browser/extensions/updater/extension_cache_fake.h"
#include "chrome/browser/extensions/updater/extension_updater.h" #include "chrome/browser/extensions/updater/extension_updater.h"
#include "chrome/browser/policy/policy_test_utils.h" #include "chrome/browser/policy/policy_test_utils.h"
#include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile.h"
...@@ -37,6 +36,7 @@ ...@@ -37,6 +36,7 @@
#include "extensions/browser/notification_types.h" #include "extensions/browser/notification_types.h"
#include "extensions/browser/scoped_ignore_content_verifier_for_test.h" #include "extensions/browser/scoped_ignore_content_verifier_for_test.h"
#include "extensions/browser/test_extension_registry_observer.h" #include "extensions/browser/test_extension_registry_observer.h"
#include "extensions/browser/updater/extension_cache_fake.h"
#include "extensions/common/constants.h" #include "extensions/common/constants.h"
#include "extensions/common/features/feature_channel.h" #include "extensions/common/features/feature_channel.h"
#include "extensions/common/manifest_handlers/shared_module_info.h" #include "extensions/common/manifest_handlers/shared_module_info.h"
......
...@@ -1763,8 +1763,6 @@ if (!is_android) { ...@@ -1763,8 +1763,6 @@ if (!is_android) {
"../browser/extensions/stubs_apitest.cc", "../browser/extensions/stubs_apitest.cc",
"../browser/extensions/subscribe_page_action_browsertest.cc", "../browser/extensions/subscribe_page_action_browsertest.cc",
"../browser/extensions/test_resources_browsertest.cc", "../browser/extensions/test_resources_browsertest.cc",
"../browser/extensions/updater/extension_cache_fake.cc",
"../browser/extensions/updater/extension_cache_fake.h",
"../browser/extensions/updater/extension_update_client_base_browsertest.cc", "../browser/extensions/updater/extension_update_client_base_browsertest.cc",
"../browser/extensions/updater/extension_update_client_base_browsertest.h", "../browser/extensions/updater/extension_update_client_base_browsertest.h",
"../browser/extensions/updater/update_service_browsertest.cc", "../browser/extensions/updater/update_service_browsertest.cc",
...@@ -4338,8 +4336,6 @@ test("unit_tests") { ...@@ -4338,8 +4336,6 @@ test("unit_tests") {
"../browser/extensions/system_display/display_info_provider_chromeos_unittest.cc", "../browser/extensions/system_display/display_info_provider_chromeos_unittest.cc",
"../browser/extensions/tab_helper_unittest.cc", "../browser/extensions/tab_helper_unittest.cc",
"../browser/extensions/update_install_gate_unittest.cc", "../browser/extensions/update_install_gate_unittest.cc",
"../browser/extensions/updater/extension_cache_fake.cc",
"../browser/extensions/updater/extension_cache_fake.h",
"../browser/extensions/updater/extension_update_client_command_line_config_policy_unittest.cc", "../browser/extensions/updater/extension_update_client_command_line_config_policy_unittest.cc",
"../browser/extensions/updater/extension_updater_unittest.cc", "../browser/extensions/updater/extension_updater_unittest.cc",
"../browser/extensions/user_script_listener_unittest.cc", "../browser/extensions/user_script_listener_unittest.cc",
...@@ -5391,8 +5387,6 @@ if (!is_android) { ...@@ -5391,8 +5387,6 @@ if (!is_android) {
"../browser/extensions/extension_fullscreen_apitest.cc", "../browser/extensions/extension_fullscreen_apitest.cc",
"../browser/extensions/extension_function_test_utils.cc", "../browser/extensions/extension_function_test_utils.cc",
"../browser/extensions/extension_keybinding_apitest.cc", "../browser/extensions/extension_keybinding_apitest.cc",
"../browser/extensions/updater/extension_cache_fake.cc",
"../browser/extensions/updater/extension_cache_fake.h",
"../browser/extensions/window_open_interactive_apitest.cc", "../browser/extensions/window_open_interactive_apitest.cc",
"../browser/global_keyboard_shortcuts_mac_browsertest.mm", "../browser/global_keyboard_shortcuts_mac_browsertest.mm",
"../browser/mouse_events_interactive_uitest.cc", "../browser/mouse_events_interactive_uitest.cc",
......
...@@ -537,6 +537,8 @@ jumbo_source_set("test_support") { ...@@ -537,6 +537,8 @@ jumbo_source_set("test_support") {
"preload_check_test_util.h", "preload_check_test_util.h",
"test_event_router_observer.cc", "test_event_router_observer.cc",
"test_event_router_observer.h", "test_event_router_observer.h",
"updater/extension_cache_fake.cc",
"updater/extension_cache_fake.h",
"updater/extension_downloader_test_helper.cc", "updater/extension_downloader_test_helper.cc",
"updater/extension_downloader_test_helper.h", "updater/extension_downloader_test_helper.h",
"value_store/test_value_store_factory.cc", "value_store/test_value_store_factory.cc",
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
#include "chrome/browser/extensions/updater/extension_cache_fake.h" #include "extensions/browser/updater/extension_cache_fake.h"
#include "base/bind.h" #include "base/bind.h"
#include "base/stl_util.h" #include "base/stl_util.h"
...@@ -12,11 +12,9 @@ ...@@ -12,11 +12,9 @@
namespace extensions { namespace extensions {
ExtensionCacheFake::ExtensionCacheFake() { ExtensionCacheFake::ExtensionCacheFake() = default;
}
ExtensionCacheFake::~ExtensionCacheFake() { ExtensionCacheFake::~ExtensionCacheFake() = default;
}
void ExtensionCacheFake::Start(const base::Closure& callback) { void ExtensionCacheFake::Start(const base::Closure& callback) {
base::PostTask(FROM_HERE, {content::BrowserThread::UI}, callback); base::PostTask(FROM_HERE, {content::BrowserThread::UI}, callback);
......
...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
#ifndef CHROME_BROWSER_EXTENSIONS_UPDATER_EXTENSION_CACHE_FAKE_H_ #ifndef EXTENSIONS_BROWSER_UPDATER_EXTENSION_CACHE_FAKE_H_
#define CHROME_BROWSER_EXTENSIONS_UPDATER_EXTENSION_CACHE_FAKE_H_ #define EXTENSIONS_BROWSER_UPDATER_EXTENSION_CACHE_FAKE_H_
#include <map> #include <map>
#include <set> #include <set>
...@@ -35,7 +35,7 @@ class ExtensionCacheFake : public ExtensionCache { ...@@ -35,7 +35,7 @@ class ExtensionCacheFake : public ExtensionCache {
const PutExtensionCallback& callback) override; const PutExtensionCallback& callback) override;
private: private:
typedef std::map<std::string, std::pair<std::string, base::FilePath> > Map; typedef std::map<std::string, std::pair<std::string, base::FilePath>> Map;
// Set of extensions that can be cached. // Set of extensions that can be cached.
std::set<std::string> allowed_extensions_; std::set<std::string> allowed_extensions_;
...@@ -47,4 +47,4 @@ class ExtensionCacheFake : public ExtensionCache { ...@@ -47,4 +47,4 @@ class ExtensionCacheFake : public ExtensionCache {
} // namespace extensions } // namespace extensions
#endif // CHROME_BROWSER_EXTENSIONS_UPDATER_EXTENSION_CACHE_FAKE_H_ #endif // EXTENSIONS_BROWSER_UPDATER_EXTENSION_CACHE_FAKE_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