0

Remove all the browser side extensions code from Android.

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@288184 0039d316-1c4b-4281-b951-d872f2087c98
This commit is contained in:
thestig@chromium.org
2014-08-08 01:01:27 +00:00
parent 7d7bbe1dd1
commit d5a74be564
15 changed files with 530 additions and 510 deletions

@ -35,7 +35,6 @@
#include "chrome/browser/devtools/remote_debugging_server.h"
#include "chrome/browser/download/download_request_limiter.h"
#include "chrome/browser/download/download_status_updater.h"
#include "chrome/browser/extensions/chrome_extensions_browser_client.h"
#include "chrome/browser/first_run/upgrade_util.h"
#include "chrome/browser/gpu/gl_string_manager.h"
#include "chrome/browser/gpu/gpu_mode_manager.h"
@ -123,6 +122,7 @@
#endif // defined(ENABLE_CONFIGURATION_POLICY)
#if defined(ENABLE_EXTENSIONS)
#include "chrome/browser/extensions/chrome_extensions_browser_client.h"
#include "chrome/browser/extensions/event_router_forwarder.h"
#include "chrome/browser/extensions/extension_renderer_state.h"
#include "chrome/browser/media_galleries/media_file_system_registry.h"
@ -196,7 +196,6 @@ BrowserProcessImpl::BrowserProcessImpl(
extension_event_router_forwarder_ = new extensions::EventRouterForwarder;
ExtensionRendererState::GetInstance()->Init();
#endif
extensions::ExtensionsClient::Set(
extensions::ChromeExtensionsClient::GetInstance());
@ -204,6 +203,7 @@ BrowserProcessImpl::BrowserProcessImpl(
extensions_browser_client_.reset(
new extensions::ChromeExtensionsBrowserClient);
extensions::ExtensionsBrowserClient::Set(extensions_browser_client_.get());
#endif
message_center::MessageCenter::Initialize();

@ -194,9 +194,9 @@ class BrowserProcessImpl : public BrowserProcess,
scoped_ptr<GpuModeManager> gpu_mode_manager_;
#if defined(ENABLE_EXTENSIONS)
scoped_ptr<extensions::ExtensionsBrowserClient> extensions_browser_client_;
#if defined(ENABLE_EXTENSIONS)
scoped_refptr<extensions::EventRouterForwarder>
extension_event_router_forwarder_;

@ -23,6 +23,7 @@
#include "chrome/browser/browsing_data/browsing_data_helper.h"
#include "chrome/browser/browsing_data/browsing_data_remover.h"
#include "chrome/browser/character_encoding.h"
#include "chrome/browser/chrome_content_browser_client_parts.h"
#include "chrome/browser/chrome_net_benchmarking_message_filter.h"
#include "chrome/browser/chrome_quota_permission_context.h"
#include "chrome/browser/content_settings/content_settings_utils.h"
@ -33,7 +34,6 @@
#include "chrome/browser/defaults.h"
#include "chrome/browser/devtools/chrome_devtools_manager_delegate.h"
#include "chrome/browser/download/download_prefs.h"
#include "chrome/browser/extensions/chrome_content_browser_client_extensions_part.h"
#include "chrome/browser/font_family_cache.h"
#include "chrome/browser/geolocation/chrome_access_token_store.h"
#include "chrome/browser/geolocation/geolocation_permission_context.h"
@ -217,6 +217,7 @@
#endif
#if defined(ENABLE_EXTENSIONS)
#include "chrome/browser/extensions/chrome_content_browser_client_extensions_part.h"
#include "chrome/browser/extensions/extension_service.h"
#include "chrome/browser/extensions/extension_util.h"
#include "chrome/browser/extensions/suggest_permission_util.h"
@ -255,7 +256,6 @@ using content::SiteInstance;
using content::WebContents;
using content::WebPreferences;
using extensions::APIPermission;
using extensions::ChromeContentBrowserClientExtensionsPart;
using extensions::Extension;
using extensions::InfoMap;
using extensions::Manifest;
@ -265,6 +265,10 @@ using message_center::NotifierId;
using content::FileDescriptorInfo;
#endif
#if defined(ENABLE_EXTENSIONS)
using extensions::ChromeContentBrowserClientExtensionsPart;
#endif
namespace {
// Cached version of the locale so we can return the locale on the I/O
@ -579,7 +583,9 @@ ChromeContentBrowserClient::ChromeContentBrowserClient()
TtsController::GetInstance()->SetTtsEngineDelegate(tts_extension_engine);
#endif
#if defined(ENABLE_EXTENSIONS)
extra_parts_.push_back(new ChromeContentBrowserClientExtensionsPart);
#endif
}
ChromeContentBrowserClient::~ChromeContentBrowserClient() {
@ -848,8 +854,12 @@ GURL ChromeContentBrowserClient::GetEffectiveURL(
return GetEffectiveURLForSignin(url);
#endif
#if defined(ENABLE_EXTENSIONS)
return ChromeContentBrowserClientExtensionsPart::GetEffectiveURL(
profile, url);
#else
return url;
#endif
}
bool ChromeContentBrowserClient::ShouldUseProcessPerSite(
@ -871,8 +881,12 @@ bool ChromeContentBrowserClient::ShouldUseProcessPerSite(
return true;
#endif
#if defined(ENABLE_EXTENSIONS)
return ChromeContentBrowserClientExtensionsPart::ShouldUseProcessPerSite(
profile, effective_url);
#else
return false;
#endif
}
// These are treated as WebUI schemes but do not get WebUI bindings. Also,
@ -925,18 +939,24 @@ bool ChromeContentBrowserClient::IsHandledURL(const GURL& url) {
bool ChromeContentBrowserClient::CanCommitURL(
content::RenderProcessHost* process_host,
const GURL& url) {
#if defined(ENABLE_EXTENSIONS)
return ChromeContentBrowserClientExtensionsPart::CanCommitURL(
process_host, url);
#else
return true;
#endif
}
bool ChromeContentBrowserClient::ShouldAllowOpenURL(
content::SiteInstance* site_instance, const GURL& url) {
GURL from_url = site_instance->GetSiteURL();
#if defined(ENABLE_EXTENSIONS)
bool result;
if (ChromeContentBrowserClientExtensionsPart::ShouldAllowOpenURL(
site_instance, from_url, url, &result))
return result;
#endif
// Do not allow chrome://chrome-signin navigate to other chrome:// URLs, since
// the signin page may host untrusted web content.
@ -981,8 +1001,12 @@ bool ChromeContentBrowserClient::IsSuitableHost(
return SigninManager::IsWebBasedSigninFlowURL(site_url);
#endif
#if defined(ENABLE_EXTENSIONS)
return ChromeContentBrowserClientExtensionsPart::IsSuitableHost(
profile, process_host, site_url);
#else
return true;
#endif
}
bool ChromeContentBrowserClient::MayReuseHost(
@ -1009,10 +1033,14 @@ bool ChromeContentBrowserClient::ShouldTryToUseExistingProcessHost(
if (!url.is_valid())
return false;
#if defined(ENABLE_EXTENSIONS)
Profile* profile = Profile::FromBrowserContext(browser_context);
return ChromeContentBrowserClientExtensionsPart::
ShouldTryToUseExistingProcessHost(
profile, url);
#else
return false;
#endif
}
void ChromeContentBrowserClient::SiteInstanceGotProcess(
@ -1043,7 +1071,9 @@ void ChromeContentBrowserClient::SiteInstanceGotProcess(
ChromeSigninClientFactory::GetForProfile(profile);
if (signin_client)
signin_client->SetSigninProcess(site_instance->GetProcess()->GetID());
#if defined(ENABLE_EXTENSIONS)
ChromeContentBrowserClientExtensionsPart::SetSigninProcess(site_instance);
#endif
}
#endif
@ -1078,9 +1108,13 @@ bool ChromeContentBrowserClient::ShouldSwapBrowsingInstancesForNavigation(
SiteInstance* site_instance,
const GURL& current_url,
const GURL& new_url) {
#if defined(ENABLE_EXTENSIONS)
return ChromeContentBrowserClientExtensionsPart::
ShouldSwapBrowsingInstancesForNavigation(
site_instance, current_url, new_url);
#else
return false;
#endif
}
bool ChromeContentBrowserClient::ShouldSwapProcessesForRedirect(

@ -14,10 +14,7 @@ gypi_values = exec_script(
# GYP version: chrome/chrome_browser_extensions.gypi:browser_extensions
static_library("extensions") {
sources = rebase_path(
gypi_values.chrome_browser_extensions_extensions_sources,
".", "//chrome")
sources = []
defines = []
# TODO(GYP) remove this when webrtc is ported.

@ -8,13 +8,17 @@
#include "base/command_line.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/extensions/api/web_request/web_request_api.h"
#include "chrome/browser/extensions/browser_permissions_policy_delegate.h"
#include "chrome/browser/extensions/extension_service.h"
#include "chrome/browser/extensions/extension_web_ui.h"
#include "chrome/browser/extensions/extension_webkit_preferences.h"
#include "chrome/browser/media_galleries/fileapi/media_file_system_backend.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/profiles/profile_io_data.h"
#include "chrome/browser/profiles/profile_manager.h"
#include "chrome/browser/renderer_host/chrome_extension_message_filter.h"
#include "chrome/browser/sync_file_system/local/sync_file_system_backend.h"
#include "chrome/common/chrome_constants.h"
#include "chrome/common/extensions/extension_constants.h"
#include "chrome/common/extensions/extension_process_policy.h"
@ -26,6 +30,7 @@
#include "content/public/browser/site_instance.h"
#include "content/public/browser/web_contents.h"
#include "extensions/browser/extension_host.h"
#include "extensions/browser/extension_message_filter.h"
#include "extensions/browser/extension_registry.h"
#include "extensions/browser/extension_system.h"
#include "extensions/browser/info_map.h"
@ -35,15 +40,6 @@
#include "extensions/common/manifest_handlers/web_accessible_resources_info.h"
#include "extensions/common/switches.h"
// TODO(thestig): Remove ifdefs when extensions no longer build on mobile.
#if defined(ENABLE_EXTENSIONS)
#include "chrome/browser/extensions/api/web_request/web_request_api.h"
#include "chrome/browser/media_galleries/fileapi/media_file_system_backend.h"
#include "chrome/browser/renderer_host/chrome_extension_message_filter.h"
#include "chrome/browser/sync_file_system/local/sync_file_system_backend.h"
#include "extensions/browser/extension_message_filter.h"
#endif
using content::BrowserThread;
using content::BrowserURLHandler;
using content::RenderViewHost;
@ -408,14 +404,12 @@ void ChromeContentBrowserClientExtensionsPart::SetSigninProcess(
void ChromeContentBrowserClientExtensionsPart::RenderProcessWillLaunch(
content::RenderProcessHost* host) {
#if defined(ENABLE_EXTENSIONS)
int id = host->GetID();
Profile* profile = Profile::FromBrowserContext(host->GetBrowserContext());
host->AddFilter(new ChromeExtensionMessageFilter(id, profile));
host->AddFilter(new ExtensionMessageFilter(id, profile));
SendExtensionWebRequestStatusToHost(host);
#endif
}
void ChromeContentBrowserClientExtensionsPart::SiteInstanceGotProcess(
@ -544,17 +538,14 @@ void ChromeContentBrowserClientExtensionsPart::
void ChromeContentBrowserClientExtensionsPart::GetURLRequestAutoMountHandlers(
std::vector<fileapi::URLRequestAutoMountHandler>* handlers) {
#if defined(ENABLE_EXTENSIONS)
handlers->push_back(
base::Bind(MediaFileSystemBackend::AttemptAutoMountForURLRequest));
#endif
}
void ChromeContentBrowserClientExtensionsPart::GetAdditionalFileSystemBackends(
content::BrowserContext* browser_context,
const base::FilePath& storage_partition_path,
ScopedVector<fileapi::FileSystemBackend>* additional_backends) {
#if defined(ENABLE_EXTENSIONS)
base::SequencedWorkerPool* pool = content::BrowserThread::GetBlockingPool();
additional_backends->push_back(new MediaFileSystemBackend(
storage_partition_path,
@ -564,7 +555,6 @@ void ChromeContentBrowserClientExtensionsPart::GetAdditionalFileSystemBackends(
additional_backends->push_back(new sync_file_system::SyncFileSystemBackend(
Profile::FromBrowserContext(browser_context)));
#endif
}
void ChromeContentBrowserClientExtensionsPart::

@ -23,7 +23,6 @@
#include "chrome/browser/custom_handlers/protocol_handler_registry.h"
#include "chrome/browser/devtools/devtools_window.h"
#include "chrome/browser/download/download_prefs.h"
#include "chrome/browser/extensions/extension_web_ui.h"
#include "chrome/browser/external_protocol/external_protocol_handler.h"
#include "chrome/browser/first_run/first_run.h"
#include "chrome/browser/geolocation/geolocation_prefs.h"
@ -95,7 +94,6 @@
#include "components/sync_driver/sync_prefs.h"
#include "components/translate/core/browser/translate_prefs.h"
#include "content/public/browser/render_process_host.h"
#include "extensions/browser/extension_prefs.h"
#include "net/http/http_server_properties_manager.h"
#if defined(ENABLE_AUTOFILL_DIALOG)
@ -113,8 +111,10 @@
#include "chrome/browser/extensions/activity_log/activity_log.h"
#include "chrome/browser/extensions/api/commands/command_service.h"
#include "chrome/browser/extensions/api/tabs/tabs_api.h"
#include "chrome/browser/extensions/extension_web_ui.h"
#include "chrome/browser/extensions/launch_util.h"
#include "chrome/browser/signin/easy_unlock_service.h"
#include "extensions/browser/extension_prefs.h"
#endif
#if defined(ENABLE_MANAGED_USERS)
@ -406,11 +406,9 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
EasyUnlockService::RegisterProfilePrefs(registry);
extensions::ActivityLog::RegisterProfilePrefs(registry);
extensions::launch_util::RegisterProfilePrefs(registry);
#endif
// TODO(thestig) These should be in ifdef'd out, but too many parts of Chrome
// still expects it to be registered.
ExtensionWebUI::RegisterProfilePrefs(registry);
extensions::ExtensionPrefs::RegisterProfilePrefs(registry);
#endif
#if defined(ENABLE_FULL_PRINTING)
print_dialog_cloud::RegisterProfilePrefs(registry);

@ -21,7 +21,6 @@
#include "content/public/browser/notification_source.h"
#include "content/public/browser/web_contents.h"
#include "content/public/browser/web_ui.h"
#include "extensions/browser/pref_names.h"
#if defined(OS_CHROMEOS)
#include "base/command_line.h"
@ -33,6 +32,10 @@
#include "chrome/browser/safe_browsing/safe_browsing_service.h"
#endif
#if defined(ENABLE_EXTENSIONS)
#include "extensions/browser/pref_names.h"
#endif
Profile::Profile()
: restored_last_session_(false),
sent_destroyed_notification_(false),
@ -131,10 +134,12 @@ void Profile::RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
prefs::kDisableExtensions,
false,
user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
#if defined(ENABLE_EXTENSIONS)
registry->RegisterBooleanPref(
extensions::pref_names::kAlertsInitialized,
false,
user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
#endif
registry->RegisterStringPref(
prefs::kSelectFileLastDirectory,
std::string(),

@ -10,9 +10,12 @@
#include "content/public/browser/render_view_host.h"
#include "content/public/browser/site_instance.h"
#include "content/public/browser/web_contents.h"
#include "extensions/browser/extension_registry.h"
#include "url/gurl.h"
#if defined(ENABLE_EXTENSIONS)
#include "extensions/browser/extension_registry.h"
#endif
using content::RenderViewHost;
using content::SiteInstance;
using content::WebContents;
@ -32,12 +35,14 @@ SiteInstance* GetSiteInstanceForNewTab(Profile* profile,
const GURL& url) {
// If |url| is a WebUI or extension, we set the SiteInstance up front so that
// we don't end up with an extra process swap on the first navigation.
if (ChromeWebUIControllerFactory::GetInstance()->UseWebUIForURL(
profile, url) ||
extensions::ExtensionRegistry::Get(
profile)->enabled_extensions().GetHostedAppByURL(url)) {
if (ChromeWebUIControllerFactory::GetInstance()->UseWebUIForURL(profile, url))
return SiteInstance::CreateForURL(profile, url);
}
#if defined(ENABLE_EXTENSIONS)
if (extensions::ExtensionRegistry::Get(
profile)->enabled_extensions().GetHostedAppByURL(url))
return SiteInstance::CreateForURL(profile, url);
#endif
// We used to share the SiteInstance for same-site links opened in new tabs,
// to leverage the in-memory cache and reduce process creation. It now

@ -4,299 +4,6 @@
{
'variables': {
# These variables are shared with the GN build.
# Name is that these are the extensions files for the extensions target.
# "chrome_browser_extensions_sources' are the extensions files in the
# browser target.
'chrome_browser_extensions_extensions_sources': [
'browser/apps/ephemeral_app_service.cc',
'browser/apps/ephemeral_app_service.h',
'browser/extensions/active_install_data.h',
'browser/extensions/active_install_data.cc',
'browser/extensions/app_icon_loader.h',
'browser/extensions/app_icon_loader_impl.cc',
'browser/extensions/app_icon_loader_impl.h',
'browser/extensions/app_sync_bundle.cc',
'browser/extensions/app_sync_bundle.h',
'browser/extensions/app_sync_data.cc',
'browser/extensions/app_sync_data.h',
'browser/extensions/blacklist.cc',
'browser/extensions/blacklist.h',
'browser/extensions/blacklist_state_fetcher.cc',
'browser/extensions/blacklist_state_fetcher.h',
'browser/extensions/blob_reader.cc',
'browser/extensions/blob_reader.h',
'browser/extensions/bookmark_app_helper.cc',
'browser/extensions/bookmark_app_helper.h',
'browser/extensions/browser_action_test_util.h',
'browser/extensions/browser_extension_window_controller.cc',
'browser/extensions/browser_extension_window_controller.h',
'browser/extensions/browser_permissions_policy_delegate.cc',
'browser/extensions/browser_permissions_policy_delegate.h',
'browser/extensions/bundle_installer.cc',
'browser/extensions/bundle_installer.h',
'browser/extensions/chrome_app_sorting.cc',
'browser/extensions/chrome_app_sorting.h',
'browser/extensions/chrome_component_extension_resource_manager.cc',
'browser/extensions/chrome_component_extension_resource_manager.h',
'browser/extensions/chrome_content_browser_client_extensions_part.cc',
'browser/extensions/chrome_content_browser_client_extensions_part.h',
'browser/extensions/chrome_extension_function.cc',
'browser/extensions/chrome_extension_function.h',
'browser/extensions/chrome_extension_host_delegate.cc',
'browser/extensions/chrome_extension_host_delegate.h',
'browser/extensions/chrome_extensions_browser_client.cc',
'browser/extensions/chrome_extensions_browser_client.h',
'browser/extensions/chrome_notification_observer.cc',
'browser/extensions/chrome_notification_observer.h',
'browser/extensions/chrome_process_manager_delegate.cc',
'browser/extensions/chrome_process_manager_delegate.h',
'browser/extensions/component_loader.cc',
'browser/extensions/component_loader.h',
'browser/extensions/context_menu_matcher.cc',
'browser/extensions/context_menu_matcher.h',
'browser/extensions/convert_user_script.cc',
'browser/extensions/convert_user_script.h',
'browser/extensions/convert_web_app.cc',
'browser/extensions/convert_web_app.h',
'browser/extensions/crx_installer.cc',
'browser/extensions/crx_installer.h',
'browser/extensions/crx_installer_error.h',
'browser/extensions/data_deleter.cc',
'browser/extensions/data_deleter.h',
'browser/extensions/dev_mode_bubble_controller.cc',
'browser/extensions/dev_mode_bubble_controller.h',
'browser/extensions/devtools_util.cc',
'browser/extensions/devtools_util.h',
'browser/extensions/error_console/error_console.cc',
'browser/extensions/error_console/error_console.h',
'browser/extensions/event_router_forwarder.cc',
'browser/extensions/event_router_forwarder.h',
'browser/extensions/extension_action.cc',
'browser/extensions/extension_action.h',
'browser/extensions/extension_action_icon_factory.cc',
'browser/extensions/extension_action_icon_factory.h',
'browser/extensions/extension_action_manager.cc',
'browser/extensions/extension_action_manager.h',
'browser/extensions/extension_assets_manager.cc',
'browser/extensions/extension_assets_manager.h',
'browser/extensions/extension_assets_manager_chromeos.cc',
'browser/extensions/extension_assets_manager_chromeos.h',
'browser/extensions/extension_commands_global_registry.cc',
'browser/extensions/extension_commands_global_registry.h',
'browser/extensions/extension_creator.cc',
'browser/extensions/extension_creator.h',
'browser/extensions/extension_creator_filter.cc',
'browser/extensions/extension_creator_filter.h',
'browser/extensions/extension_disabled_ui.cc',
'browser/extensions/extension_disabled_ui.h',
'browser/extensions/extension_error_controller.cc',
'browser/extensions/extension_error_controller.h',
'browser/extensions/extension_error_reporter.cc',
'browser/extensions/extension_error_reporter.h',
'browser/extensions/extension_error_ui.cc',
'browser/extensions/extension_error_ui.h',
'browser/extensions/extension_garbage_collector.cc',
'browser/extensions/extension_garbage_collector.h',
'browser/extensions/extension_garbage_collector_chromeos.cc',
'browser/extensions/extension_garbage_collector_chromeos.h',
'browser/extensions/extension_garbage_collector_factory.cc',
'browser/extensions/extension_garbage_collector_factory.h',
'browser/extensions/extension_gcm_app_handler.cc',
'browser/extensions/extension_gcm_app_handler.h',
'browser/extensions/extension_icon_manager.cc',
'browser/extensions/extension_icon_manager.h',
'browser/extensions/extension_install_checker.cc',
'browser/extensions/extension_install_checker.h',
'browser/extensions/extension_install_prompt.cc',
'browser/extensions/extension_install_prompt.h',
'browser/extensions/extension_install_prompt_experiment.cc',
'browser/extensions/extension_install_prompt_experiment.h',
'browser/extensions/extension_keybinding_registry.cc',
'browser/extensions/extension_keybinding_registry.h',
'browser/extensions/extension_message_bubble_controller.cc',
'browser/extensions/extension_message_bubble_controller.h',
'browser/extensions/extension_renderer_state.cc',
'browser/extensions/extension_renderer_state.h',
'browser/extensions/extension_resource_protocols.cc',
'browser/extensions/extension_resource_protocols.h',
'browser/extensions/extension_service.cc',
'browser/extensions/extension_service.h',
'browser/extensions/extension_special_storage_policy.cc',
'browser/extensions/extension_special_storage_policy.h',
'browser/extensions/extension_storage_monitor.cc',
'browser/extensions/extension_storage_monitor.h',
'browser/extensions/extension_storage_monitor_factory.cc',
'browser/extensions/extension_storage_monitor_factory.h',
'browser/extensions/extension_sync_bundle.cc',
'browser/extensions/extension_sync_bundle.h',
'browser/extensions/extension_sync_data.cc',
'browser/extensions/extension_sync_data.h',
'browser/extensions/extension_sync_service.cc',
'browser/extensions/extension_sync_service.h',
'browser/extensions/extension_sync_service_factory.cc',
'browser/extensions/extension_sync_service_factory.h',
'browser/extensions/extension_system_factory.cc',
'browser/extensions/extension_system_factory.h',
'browser/extensions/extension_system_impl.cc',
'browser/extensions/extension_system_impl.h',
'browser/extensions/extension_toolbar_model.cc',
'browser/extensions/extension_toolbar_model.h',
'browser/extensions/extension_toolbar_model_factory.cc',
'browser/extensions/extension_toolbar_model_factory.h',
'browser/extensions/extension_uninstall_dialog.cc',
'browser/extensions/extension_uninstall_dialog.h',
'browser/extensions/extension_ui_util.cc',
'browser/extensions/extension_ui_util.h',
'browser/extensions/extension_util.cc',
'browser/extensions/extension_util.h',
'browser/extensions/extension_view_host.cc',
'browser/extensions/extension_view_host.h',
'browser/extensions/extension_view_host_factory.cc',
'browser/extensions/extension_view_host_factory.h',
'browser/extensions/extension_view_host_mac.h',
'browser/extensions/extension_view_host_mac.mm',
'browser/extensions/extension_warning_badge_service.cc',
'browser/extensions/extension_warning_badge_service.h',
'browser/extensions/extension_warning_service.cc',
'browser/extensions/extension_warning_service.h',
'browser/extensions/extension_warning_set.cc',
'browser/extensions/extension_warning_set.h',
'browser/extensions/extension_web_ui.cc',
'browser/extensions/extension_web_ui.h',
'browser/extensions/extension_web_ui_override_registrar.cc',
'browser/extensions/extension_web_ui_override_registrar.h',
'browser/extensions/extension_webkit_preferences.cc',
'browser/extensions/extension_webkit_preferences.h',
'browser/extensions/external_component_loader.cc',
'browser/extensions/external_component_loader.h',
'browser/extensions/external_install_error.cc',
'browser/extensions/external_install_error.h',
'browser/extensions/external_install_manager.cc',
'browser/extensions/external_install_manager.h',
'browser/extensions/external_loader.cc',
'browser/extensions/external_loader.h',
'browser/extensions/external_policy_loader.cc',
'browser/extensions/external_policy_loader.h',
'browser/extensions/external_pref_loader.cc',
'browser/extensions/external_pref_loader.h',
'browser/extensions/external_provider_impl.cc',
'browser/extensions/external_provider_impl.h',
'browser/extensions/external_registry_loader_win.cc',
'browser/extensions/external_registry_loader_win.h',
'browser/extensions/favicon_downloader.cc',
'browser/extensions/favicon_downloader.h',
'browser/extensions/global_shortcut_listener.cc',
'browser/extensions/global_shortcut_listener.h',
'browser/extensions/global_shortcut_listener_chromeos.cc',
'browser/extensions/global_shortcut_listener_chromeos.h',
'browser/extensions/global_shortcut_listener_mac.h',
'browser/extensions/global_shortcut_listener_mac.mm',
'browser/extensions/global_shortcut_listener_ozone.cc',
'browser/extensions/global_shortcut_listener_ozone.h',
'browser/extensions/global_shortcut_listener_win.cc',
'browser/extensions/global_shortcut_listener_win.h',
'browser/extensions/global_shortcut_listener_x11.cc',
'browser/extensions/global_shortcut_listener_x11.h',
'browser/extensions/install_observer.cc',
'browser/extensions/install_observer.h',
'browser/extensions/install_signer.cc',
'browser/extensions/install_signer.h',
'browser/extensions/install_tracker.cc',
'browser/extensions/install_tracker.h',
'browser/extensions/install_tracker_factory.cc',
'browser/extensions/install_tracker_factory.h',
'browser/extensions/install_verifier.cc',
'browser/extensions/install_verifier.h',
'browser/extensions/installed_loader.cc',
'browser/extensions/installed_loader.h',
'browser/extensions/launch_util.cc',
'browser/extensions/launch_util.h',
'browser/extensions/location_bar_controller.cc',
'browser/extensions/location_bar_controller.h',
'browser/extensions/navigation_observer.cc',
'browser/extensions/navigation_observer.h',
'browser/extensions/ntp_overridden_bubble_controller.cc',
'browser/extensions/ntp_overridden_bubble_controller.h',
'browser/extensions/pack_extension_job.cc',
'browser/extensions/pack_extension_job.h',
'browser/extensions/page_action_controller.cc',
'browser/extensions/page_action_controller.h',
'browser/extensions/path_util.cc',
'browser/extensions/path_util.h',
'browser/extensions/pending_enables.cc',
'browser/extensions/pending_enables.h',
'browser/extensions/pending_extension_info.cc',
'browser/extensions/pending_extension_info.h',
'browser/extensions/pending_extension_manager.cc',
'browser/extensions/pending_extension_manager.h',
'browser/extensions/plugin_manager.cc',
'browser/extensions/plugin_manager.h',
'browser/extensions/proxy_overridden_bubble_controller.cc',
'browser/extensions/proxy_overridden_bubble_controller.h',
'browser/extensions/requirements_checker.cc',
'browser/extensions/requirements_checker.h',
'browser/extensions/script_executor.cc',
'browser/extensions/script_executor.h',
'browser/extensions/settings_api_bubble_controller.cc',
'browser/extensions/settings_api_bubble_controller.h',
'browser/extensions/settings_api_helpers.cc',
'browser/extensions/settings_api_helpers.h',
'browser/extensions/shared_module_service.cc',
'browser/extensions/shared_module_service.h',
'browser/extensions/standard_management_policy_provider.cc',
'browser/extensions/standard_management_policy_provider.h',
'browser/extensions/state_store_notification_observer.cc',
'browser/extensions/state_store_notification_observer.h',
'browser/extensions/startup_helper.cc',
'browser/extensions/startup_helper.h',
'browser/extensions/suggest_permission_util.cc',
'browser/extensions/suggest_permission_util.h',
'browser/extensions/sync_bundle.h',
'browser/extensions/theme_installed_infobar_delegate.cc',
'browser/extensions/theme_installed_infobar_delegate.h',
'browser/extensions/unpacked_installer.cc',
'browser/extensions/unpacked_installer.h',
'browser/extensions/updater/extension_cache.cc',
'browser/extensions/updater/extension_cache.h',
'browser/extensions/updater/extension_downloader.cc',
'browser/extensions/updater/extension_downloader.h',
'browser/extensions/updater/extension_downloader_delegate.cc',
'browser/extensions/updater/extension_downloader_delegate.h',
'browser/extensions/updater/extension_updater.cc',
'browser/extensions/updater/extension_updater.h',
'browser/extensions/updater/manifest_fetch_data.cc',
'browser/extensions/updater/manifest_fetch_data.h',
'browser/extensions/updater/request_queue.h',
'browser/extensions/updater/request_queue_impl.h',
'browser/extensions/url_request_util.cc',
'browser/extensions/url_request_util.h',
'browser/extensions/user_script_listener.cc',
'browser/extensions/user_script_listener.h',
'browser/extensions/user_script_master.cc',
'browser/extensions/user_script_master.h',
'browser/extensions/webstore_data_fetcher.cc',
'browser/extensions/webstore_data_fetcher.h',
'browser/extensions/webstore_data_fetcher_delegate.cc',
'browser/extensions/webstore_data_fetcher_delegate.h',
'browser/extensions/webstore_inline_installer.cc',
'browser/extensions/webstore_inline_installer.h',
'browser/extensions/webstore_inline_installer_factory.cc',
'browser/extensions/webstore_inline_installer_factory.h',
'browser/extensions/webstore_install_with_prompt.cc',
'browser/extensions/webstore_install_with_prompt.h',
'browser/extensions/webstore_installer.cc',
'browser/extensions/webstore_installer.h',
'browser/extensions/webstore_standalone_installer.cc',
'browser/extensions/webstore_standalone_installer.h',
'browser/extensions/webstore_startup_installer.cc',
'browser/extensions/webstore_startup_installer.h',
'browser/extensions/window_controller.cc',
'browser/extensions/window_controller.h',
'browser/extensions/window_controller_list.cc',
'browser/extensions/window_controller_list.h',
'browser/extensions/window_controller_list_observer.h',
],
'chrome_browser_extensions_chromeos_sources': [
'browser/extensions/api/diagnostics/diagnostics_api.cc',
'browser/extensions/api/diagnostics/diagnostics_api.h',
@ -339,6 +46,8 @@
'browser/apps/app_url_redirector.h',
'browser/apps/ephemeral_app_launcher.cc',
'browser/apps/ephemeral_app_launcher.h',
'browser/apps/ephemeral_app_service.cc',
'browser/apps/ephemeral_app_service.h',
'browser/apps/ephemeral_app_service_factory.cc',
'browser/apps/ephemeral_app_service_factory.h',
'browser/apps/ephemeral_app_throttle.cc',
@ -355,6 +64,8 @@
'browser/apps/shortcut_manager_factory.h',
'browser/copresence/chrome_whispernet_client.cc',
'browser/copresence/chrome_whispernet_client.h',
'browser/extensions/active_install_data.cc',
'browser/extensions/active_install_data.h',
'browser/extensions/active_script_controller.cc',
'browser/extensions/active_script_controller.h',
'browser/extensions/active_tab_permission_granter.cc',
@ -543,10 +254,10 @@
'browser/extensions/api/downloads/downloads_api.h',
'browser/extensions/api/downloads_internal/downloads_internal_api.cc',
'browser/extensions/api/downloads_internal/downloads_internal_api.h',
'browser/extensions/api/easy_unlock_private/easy_unlock_private_api.h',
'browser/extensions/api/easy_unlock_private/easy_unlock_private_api.cc',
'browser/extensions/api/easy_unlock_private/easy_unlock_private_bluetooth_util.h',
'browser/extensions/api/easy_unlock_private/easy_unlock_private_api.h',
'browser/extensions/api/easy_unlock_private/easy_unlock_private_bluetooth_util.cc',
'browser/extensions/api/easy_unlock_private/easy_unlock_private_bluetooth_util.h',
'browser/extensions/api/easy_unlock_private/easy_unlock_private_bluetooth_util_chromeos.cc',
'browser/extensions/api/easy_unlock_private/easy_unlock_private_crypto_delegate.h',
'browser/extensions/api/easy_unlock_private/easy_unlock_private_crypto_delegate_chromeos.cc',
@ -875,38 +586,321 @@
'browser/extensions/api/webstore/webstore_api.h',
'browser/extensions/api/webstore_private/webstore_private_api.cc',
'browser/extensions/api/webstore_private/webstore_private_api.h',
'browser/extensions/app_icon_loader.h',
'browser/extensions/app_icon_loader_impl.cc',
'browser/extensions/app_icon_loader_impl.h',
'browser/extensions/app_sync_bundle.cc',
'browser/extensions/app_sync_bundle.h',
'browser/extensions/app_sync_data.cc',
'browser/extensions/app_sync_data.h',
'browser/extensions/blacklist.cc',
'browser/extensions/blacklist.h',
'browser/extensions/blacklist_state_fetcher.cc',
'browser/extensions/blacklist_state_fetcher.h',
'browser/extensions/blob_reader.cc',
'browser/extensions/blob_reader.h',
'browser/extensions/bookmark_app_helper.cc',
'browser/extensions/bookmark_app_helper.h',
'browser/extensions/browser_action_test_util.h',
'browser/extensions/browser_context_keyed_service_factories.cc',
'browser/extensions/browser_context_keyed_service_factories.h',
'browser/extensions/browser_extension_window_controller.cc',
'browser/extensions/browser_extension_window_controller.h',
'browser/extensions/browser_permissions_policy_delegate.cc',
'browser/extensions/browser_permissions_policy_delegate.h',
'browser/extensions/bundle_installer.cc',
'browser/extensions/bundle_installer.h',
'browser/extensions/chrome_app_sorting.cc',
'browser/extensions/chrome_app_sorting.h',
'browser/extensions/chrome_component_extension_resource_manager.cc',
'browser/extensions/chrome_component_extension_resource_manager.h',
'browser/extensions/chrome_content_browser_client_extensions_part.cc',
'browser/extensions/chrome_content_browser_client_extensions_part.h',
'browser/extensions/chrome_extension_function.cc',
'browser/extensions/chrome_extension_function.h',
'browser/extensions/chrome_extension_host_delegate.cc',
'browser/extensions/chrome_extension_host_delegate.h',
'browser/extensions/chrome_extension_web_contents_observer.cc',
'browser/extensions/chrome_extension_web_contents_observer.h',
'browser/extensions/chrome_extensions_browser_client.cc',
'browser/extensions/chrome_extensions_browser_client.h',
'browser/extensions/chrome_notification_observer.cc',
'browser/extensions/chrome_notification_observer.h',
'browser/extensions/chrome_process_manager_delegate.cc',
'browser/extensions/chrome_process_manager_delegate.h',
'browser/extensions/component_loader.cc',
'browser/extensions/component_loader.h',
'browser/extensions/context_menu_matcher.cc',
'browser/extensions/context_menu_matcher.h',
'browser/extensions/convert_user_script.cc',
'browser/extensions/convert_user_script.h',
'browser/extensions/convert_web_app.cc',
'browser/extensions/convert_web_app.h',
'browser/extensions/crx_installer.cc',
'browser/extensions/crx_installer.h',
'browser/extensions/crx_installer_error.h',
'browser/extensions/data_deleter.cc',
'browser/extensions/data_deleter.h',
'browser/extensions/dev_mode_bubble_controller.cc',
'browser/extensions/dev_mode_bubble_controller.h',
'browser/extensions/devtools_util.cc',
'browser/extensions/devtools_util.h',
'browser/extensions/error_console/error_console.cc',
'browser/extensions/error_console/error_console.h',
'browser/extensions/event_router_forwarder.cc',
'browser/extensions/event_router_forwarder.h',
'browser/extensions/extension_action.cc',
'browser/extensions/extension_action.h',
'browser/extensions/extension_action_icon_factory.cc',
'browser/extensions/extension_action_icon_factory.h',
'browser/extensions/extension_action_manager.cc',
'browser/extensions/extension_action_manager.h',
'browser/extensions/extension_assets_manager.cc',
'browser/extensions/extension_assets_manager.h',
'browser/extensions/extension_assets_manager_chromeos.cc',
'browser/extensions/extension_assets_manager_chromeos.h',
'browser/extensions/extension_commands_global_registry.cc',
'browser/extensions/extension_commands_global_registry.h',
'browser/extensions/extension_context_menu_model.cc',
'browser/extensions/extension_context_menu_model.h',
'browser/extensions/extension_creator.cc',
'browser/extensions/extension_creator.h',
'browser/extensions/extension_creator_filter.cc',
'browser/extensions/extension_creator_filter.h',
'browser/extensions/extension_disabled_ui.cc',
'browser/extensions/extension_disabled_ui.h',
'browser/extensions/extension_error_controller.cc',
'browser/extensions/extension_error_controller.h',
'browser/extensions/extension_error_reporter.cc',
'browser/extensions/extension_error_reporter.h',
'browser/extensions/extension_error_ui.cc',
'browser/extensions/extension_error_ui.h',
'browser/extensions/extension_error_ui_default.cc',
'browser/extensions/extension_error_ui_default.h',
'browser/extensions/extension_garbage_collector.cc',
'browser/extensions/extension_garbage_collector.h',
'browser/extensions/extension_garbage_collector_chromeos.cc',
'browser/extensions/extension_garbage_collector_chromeos.h',
'browser/extensions/extension_garbage_collector_factory.cc',
'browser/extensions/extension_garbage_collector_factory.h',
'browser/extensions/extension_gcm_app_handler.cc',
'browser/extensions/extension_gcm_app_handler.h',
'browser/extensions/extension_icon_manager.cc',
'browser/extensions/extension_icon_manager.h',
'browser/extensions/extension_infobar_delegate.cc',
'browser/extensions/extension_infobar_delegate.h',
'browser/extensions/extension_install_checker.cc',
'browser/extensions/extension_install_checker.h',
'browser/extensions/extension_install_prompt.cc',
'browser/extensions/extension_install_prompt.h',
'browser/extensions/extension_install_prompt_experiment.cc',
'browser/extensions/extension_install_prompt_experiment.h',
'browser/extensions/extension_install_ui.cc',
'browser/extensions/extension_install_ui.h',
'browser/extensions/extension_install_ui_util.cc',
'browser/extensions/extension_install_ui_util.h',
'browser/extensions/extension_keybinding_registry.cc',
'browser/extensions/extension_keybinding_registry.h',
'browser/extensions/extension_message_bubble_controller.cc',
'browser/extensions/extension_message_bubble_controller.h',
'browser/extensions/extension_renderer_state.cc',
'browser/extensions/extension_renderer_state.h',
'browser/extensions/extension_resource_protocols.cc',
'browser/extensions/extension_resource_protocols.h',
'browser/extensions/extension_service.cc',
'browser/extensions/extension_service.h',
'browser/extensions/extension_special_storage_policy.cc',
'browser/extensions/extension_special_storage_policy.h',
'browser/extensions/extension_storage_monitor.cc',
'browser/extensions/extension_storage_monitor.h',
'browser/extensions/extension_storage_monitor_factory.cc',
'browser/extensions/extension_storage_monitor_factory.h',
'browser/extensions/extension_sync_bundle.cc',
'browser/extensions/extension_sync_bundle.h',
'browser/extensions/extension_sync_data.cc',
'browser/extensions/extension_sync_data.h',
'browser/extensions/extension_sync_service.cc',
'browser/extensions/extension_sync_service.h',
'browser/extensions/extension_sync_service_factory.cc',
'browser/extensions/extension_sync_service_factory.h',
'browser/extensions/extension_system_factory.cc',
'browser/extensions/extension_system_factory.h',
'browser/extensions/extension_system_impl.cc',
'browser/extensions/extension_system_impl.h',
'browser/extensions/extension_tab_util.cc',
'browser/extensions/extension_tab_util.h',
'browser/extensions/extension_toolbar_model.cc',
'browser/extensions/extension_toolbar_model.h',
'browser/extensions/extension_toolbar_model_factory.cc',
'browser/extensions/extension_toolbar_model_factory.h',
'browser/extensions/extension_ui_util.cc',
'browser/extensions/extension_ui_util.h',
'browser/extensions/extension_uninstall_dialog.cc',
'browser/extensions/extension_uninstall_dialog.h',
'browser/extensions/extension_util.cc',
'browser/extensions/extension_util.h',
'browser/extensions/extension_view_host.cc',
'browser/extensions/extension_view_host.h',
'browser/extensions/extension_view_host_factory.cc',
'browser/extensions/extension_view_host_factory.h',
'browser/extensions/extension_view_host_mac.h',
'browser/extensions/extension_view_host_mac.mm',
'browser/extensions/extension_warning_badge_service.cc',
'browser/extensions/extension_warning_badge_service.h',
'browser/extensions/extension_warning_service.cc',
'browser/extensions/extension_warning_service.h',
'browser/extensions/extension_warning_set.cc',
'browser/extensions/extension_warning_set.h',
'browser/extensions/extension_web_ui.cc',
'browser/extensions/extension_web_ui.h',
'browser/extensions/extension_web_ui_override_registrar.cc',
'browser/extensions/extension_web_ui_override_registrar.h',
'browser/extensions/extension_webkit_preferences.cc',
'browser/extensions/extension_webkit_preferences.h',
'browser/extensions/external_component_loader.cc',
'browser/extensions/external_component_loader.h',
'browser/extensions/external_install_error.cc',
'browser/extensions/external_install_error.h',
'browser/extensions/external_install_manager.cc',
'browser/extensions/external_install_manager.h',
'browser/extensions/external_loader.cc',
'browser/extensions/external_loader.h',
'browser/extensions/external_policy_loader.cc',
'browser/extensions/external_policy_loader.h',
'browser/extensions/external_pref_loader.cc',
'browser/extensions/external_pref_loader.h',
'browser/extensions/external_provider_impl.cc',
'browser/extensions/external_provider_impl.h',
'browser/extensions/external_registry_loader_win.cc',
'browser/extensions/external_registry_loader_win.h',
'browser/extensions/favicon_downloader.cc',
'browser/extensions/favicon_downloader.h',
'browser/extensions/global_shortcut_listener.cc',
'browser/extensions/global_shortcut_listener.h',
'browser/extensions/global_shortcut_listener_chromeos.cc',
'browser/extensions/global_shortcut_listener_chromeos.h',
'browser/extensions/global_shortcut_listener_mac.h',
'browser/extensions/global_shortcut_listener_mac.mm',
'browser/extensions/global_shortcut_listener_ozone.cc',
'browser/extensions/global_shortcut_listener_ozone.h',
'browser/extensions/global_shortcut_listener_win.cc',
'browser/extensions/global_shortcut_listener_win.h',
'browser/extensions/global_shortcut_listener_x11.cc',
'browser/extensions/global_shortcut_listener_x11.h',
'browser/extensions/install_observer.cc',
'browser/extensions/install_observer.h',
'browser/extensions/install_signer.cc',
'browser/extensions/install_signer.h',
'browser/extensions/install_tracker.cc',
'browser/extensions/install_tracker.h',
'browser/extensions/install_tracker_factory.cc',
'browser/extensions/install_tracker_factory.h',
'browser/extensions/install_verifier.cc',
'browser/extensions/install_verifier.h',
'browser/extensions/installed_loader.cc',
'browser/extensions/installed_loader.h',
'browser/extensions/launch_util.cc',
'browser/extensions/launch_util.h',
'browser/extensions/location_bar_controller.cc',
'browser/extensions/location_bar_controller.h',
'browser/extensions/menu_manager.cc',
'browser/extensions/menu_manager.h',
'browser/extensions/menu_manager_factory.cc',
'browser/extensions/menu_manager_factory.h',
'browser/extensions/navigation_observer.cc',
'browser/extensions/navigation_observer.h',
'browser/extensions/ntp_overridden_bubble_controller.cc',
'browser/extensions/ntp_overridden_bubble_controller.h',
'browser/extensions/pack_extension_job.cc',
'browser/extensions/pack_extension_job.h',
'browser/extensions/page_action_controller.cc',
'browser/extensions/page_action_controller.h',
'browser/extensions/path_util.cc',
'browser/extensions/path_util.h',
'browser/extensions/pending_enables.cc',
'browser/extensions/pending_enables.h',
'browser/extensions/pending_extension_info.cc',
'browser/extensions/pending_extension_info.h',
'browser/extensions/pending_extension_manager.cc',
'browser/extensions/pending_extension_manager.h',
'browser/extensions/permissions_updater.cc',
'browser/extensions/permissions_updater.h',
'browser/extensions/plugin_manager.cc',
'browser/extensions/plugin_manager.h',
'browser/extensions/proxy_overridden_bubble_controller.cc',
'browser/extensions/proxy_overridden_bubble_controller.h',
'browser/extensions/requirements_checker.cc',
'browser/extensions/requirements_checker.h',
'browser/extensions/sandboxed_unpacker.cc',
'browser/extensions/sandboxed_unpacker.h',
'browser/extensions/script_executor.cc',
'browser/extensions/script_executor.h',
'browser/extensions/settings_api_bubble_controller.cc',
'browser/extensions/settings_api_bubble_controller.h',
'browser/extensions/settings_api_helpers.cc',
'browser/extensions/settings_api_helpers.h',
'browser/extensions/shared_module_service.cc',
'browser/extensions/shared_module_service.h',
'browser/extensions/standard_management_policy_provider.cc',
'browser/extensions/standard_management_policy_provider.h',
'browser/extensions/startup_helper.cc',
'browser/extensions/startup_helper.h',
'browser/extensions/state_store_notification_observer.cc',
'browser/extensions/state_store_notification_observer.h',
'browser/extensions/suggest_permission_util.cc',
'browser/extensions/suggest_permission_util.h',
'browser/extensions/suspicious_extension_bubble_controller.cc',
'browser/extensions/suspicious_extension_bubble_controller.h',
'browser/extensions/sync_bundle.h',
'browser/extensions/tab_helper.cc',
'browser/extensions/tab_helper.h',
'browser/extensions/theme_installed_infobar_delegate.cc',
'browser/extensions/theme_installed_infobar_delegate.h',
'browser/extensions/unpacked_installer.cc',
'browser/extensions/unpacked_installer.h',
'browser/extensions/updater/extension_cache.cc',
'browser/extensions/updater/extension_cache.h',
'browser/extensions/updater/extension_downloader.cc',
'browser/extensions/updater/extension_downloader.h',
'browser/extensions/updater/extension_downloader_delegate.cc',
'browser/extensions/updater/extension_downloader_delegate.h',
'browser/extensions/updater/extension_updater.cc',
'browser/extensions/updater/extension_updater.h',
'browser/extensions/updater/manifest_fetch_data.cc',
'browser/extensions/updater/manifest_fetch_data.h',
'browser/extensions/updater/request_queue.h',
'browser/extensions/updater/request_queue_impl.h',
'browser/extensions/updater/safe_manifest_parser.cc',
'browser/extensions/updater/safe_manifest_parser.h',
'browser/extensions/url_request_util.cc',
'browser/extensions/url_request_util.h',
'browser/extensions/user_script_listener.cc',
'browser/extensions/user_script_listener.h',
'browser/extensions/user_script_master.cc',
'browser/extensions/user_script_master.h',
'browser/extensions/webstore_data_fetcher.cc',
'browser/extensions/webstore_data_fetcher.h',
'browser/extensions/webstore_data_fetcher_delegate.cc',
'browser/extensions/webstore_data_fetcher_delegate.h',
'browser/extensions/webstore_inline_installer.cc',
'browser/extensions/webstore_inline_installer.h',
'browser/extensions/webstore_inline_installer_factory.cc',
'browser/extensions/webstore_inline_installer_factory.h',
'browser/extensions/webstore_install_helper.cc',
'browser/extensions/webstore_install_helper.h',
'browser/extensions/webstore_install_with_prompt.cc',
'browser/extensions/webstore_install_with_prompt.h',
'browser/extensions/webstore_installer.cc',
'browser/extensions/webstore_installer.h',
'browser/extensions/webstore_standalone_installer.cc',
'browser/extensions/webstore_standalone_installer.h',
'browser/extensions/webstore_startup_installer.cc',
'browser/extensions/webstore_startup_installer.h',
'browser/extensions/window_controller.cc',
'browser/extensions/window_controller.h',
'browser/extensions/window_controller_list.cc',
'browser/extensions/window_controller_list.h',
'browser/extensions/window_controller_list_observer.h',
],
'chrome_browser_extensions_app_list_sources': [
'browser/apps/drive/drive_app_converter.cc',
@ -1019,7 +1013,6 @@
'../content/content.gyp:content_browser',
],
'sources': [
'<@(chrome_browser_extensions_extensions_sources)',
],
'conditions': [
['chromeos==1', {

@ -76,24 +76,6 @@
'browser/download/download_test_file_activity_observer.h',
'browser/download/test_download_shelf.cc',
'browser/download/test_download_shelf.h',
'browser/extensions/extension_notification_observer.cc',
'browser/extensions/extension_notification_observer.h',
'browser/extensions/extension_test_message_listener.cc',
'browser/extensions/extension_test_message_listener.h',
'browser/extensions/mock_extension_special_storage_policy.cc',
'browser/extensions/mock_extension_special_storage_policy.h',
'browser/extensions/test_blacklist.cc',
'browser/extensions/test_blacklist.h',
'browser/extensions/test_blacklist_state_fetcher.cc',
'browser/extensions/test_blacklist_state_fetcher.h',
'browser/extensions/test_extension_environment.cc',
'browser/extensions/test_extension_environment.h',
'browser/extensions/test_extension_prefs.cc',
'browser/extensions/test_extension_prefs.h',
'browser/extensions/test_extension_service.cc',
'browser/extensions/test_extension_service.h',
'browser/extensions/test_extension_system.cc',
'browser/extensions/test_extension_system.h',
'browser/invalidation/fake_invalidation_service.cc',
'browser/invalidation/fake_invalidation_service.h',
'browser/media/fake_desktop_media_list.cc',
@ -364,6 +346,24 @@
'browser/drive/test_util.h',
'browser/extensions/api/messaging/native_messaging_test_util.cc',
'browser/extensions/api/messaging/native_messaging_test_util.h',
'browser/extensions/extension_notification_observer.cc',
'browser/extensions/extension_notification_observer.h',
'browser/extensions/extension_test_message_listener.cc',
'browser/extensions/extension_test_message_listener.h',
'browser/extensions/mock_extension_special_storage_policy.cc',
'browser/extensions/mock_extension_special_storage_policy.h',
'browser/extensions/test_blacklist.cc',
'browser/extensions/test_blacklist.h',
'browser/extensions/test_blacklist_state_fetcher.cc',
'browser/extensions/test_blacklist_state_fetcher.h',
'browser/extensions/test_extension_environment.cc',
'browser/extensions/test_extension_environment.h',
'browser/extensions/test_extension_prefs.cc',
'browser/extensions/test_extension_prefs.h',
'browser/extensions/test_extension_service.cc',
'browser/extensions/test_extension_service.h',
'browser/extensions/test_extension_system.cc',
'browser/extensions/test_extension_system.h',
'browser/media_galleries/media_galleries_test_util.cc',
'browser/media_galleries/media_galleries_test_util.h',
],
@ -2064,10 +2064,10 @@
'sources/': [
['exclude', '^../apps/'],
['exclude', '^../extensions/'],
['exclude', '^browser/apps/'],
['exclude', '^browser/drive/'],
['exclude', '^browser/extensions/activity_log/'],
['exclude', '^browser/extensions/api/'],
['exclude', '^browser/extensions/error_console/'],
['exclude', '^browser/extensions/'],
['exclude', '^browser/sync/glue/extensions_activity_monitor_unittest.cc'],
['exclude', '^browser/sync_file_system/'],
['exclude', '^common/extensions/api/'],
@ -2706,7 +2706,7 @@
['exclude', '^browser/supervised_user/'],
],
}],
['safe_browsing==1', {
['safe_browsing==1 and enable_extensions==1', {
'sources': [
'browser/extensions/blacklist_unittest.cc',
],

@ -11,7 +11,6 @@
#include "chrome/browser/background/background_mode_manager.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/browser_process_impl.h"
#include "chrome/browser/extensions/chrome_extensions_browser_client.h"
#include "chrome/browser/printing/print_job_manager.h"
#include "chrome/browser/profiles/profile_manager.h"
#include "chrome/browser/ui/apps/chrome_apps_client.h"
@ -28,18 +27,19 @@
#include "chrome/browser/safe_browsing/safe_browsing_service.h"
#endif
#if !defined(OS_IOS) && !defined(OS_ANDROID)
#include "chrome/browser/media_galleries/media_file_system_registry.h"
#include "components/storage_monitor/storage_monitor.h"
#include "components/storage_monitor/test_storage_monitor.h"
#endif
#if defined(ENABLE_CONFIGURATION_POLICY)
#include "components/policy/core/browser/browser_policy_connector.h"
#else
#include "components/policy/core/common/policy_service_stub.h"
#endif // defined(ENABLE_CONFIGURATION_POLICY)
#if defined(ENABLE_EXTENSIONS)
#include "chrome/browser/extensions/chrome_extensions_browser_client.h"
#include "chrome/browser/media_galleries/media_file_system_registry.h"
#include "components/storage_monitor/storage_monitor.h"
#include "components/storage_monitor/test_storage_monitor.h"
#endif
#if defined(ENABLE_FULL_PRINTING)
#include "chrome/browser/printing/background_printing_manager.h"
#include "chrome/browser/printing/print_preview_dialog_controller.h"
@ -71,13 +71,13 @@ TestingBrowserProcess::TestingBrowserProcess()
local_state_(NULL),
io_thread_(NULL),
system_request_context_(NULL),
platform_part_(new TestingBrowserProcessPlatformPart()),
extensions_browser_client_(
new extensions::ChromeExtensionsBrowserClient) {
platform_part_(new TestingBrowserProcessPlatformPart()) {
#if defined(ENABLE_EXTENSIONS)
extensions_browser_client_.reset(
new extensions::ChromeExtensionsBrowserClient);
apps::AppsClient::Set(ChromeAppsClient::GetInstance());
#endif
extensions::ExtensionsBrowserClient::Set(extensions_browser_client_.get());
#endif
}
TestingBrowserProcess::~TestingBrowserProcess() {
@ -85,7 +85,9 @@ TestingBrowserProcess::~TestingBrowserProcess() {
#if defined(ENABLE_CONFIGURATION_POLICY)
SetBrowserPolicyConnector(NULL);
#endif
#if defined(ENABLE_EXTENSIONS)
extensions::ExtensionsBrowserClient::Set(NULL);
#endif
// Destructors for some objects owned by TestingBrowserProcess will use
// g_browser_process if it is not NULL, so it must be NULL before proceeding.

@ -166,10 +166,6 @@ class TestingBrowserProcess : public BrowserProcess {
scoped_refptr<SafeBrowsingService> sb_service_;
#endif // !defined(OS_IOS)
#if !defined(OS_IOS) && !defined(OS_ANDROID)
scoped_ptr<MediaFileSystemRegistry> media_file_system_registry_;
#endif
scoped_ptr<network_time::NetworkTimeTracker> network_time_tracker_;
// The following objects are not owned by TestingBrowserProcess:
@ -179,7 +175,11 @@ class TestingBrowserProcess : public BrowserProcess {
scoped_ptr<BrowserProcessPlatformPart> platform_part_;
#if defined(ENABLE_EXTENSIONS)
scoped_ptr<MediaFileSystemRegistry> media_file_system_registry_;
scoped_ptr<extensions::ExtensionsBrowserClient> extensions_browser_client_;
#endif
DISALLOW_COPY_AND_ASSIGN(TestingBrowserProcess);
};

@ -19,8 +19,6 @@
#include "chrome/browser/browser_process.h"
#include "chrome/browser/chrome_notification_types.h"
#include "chrome/browser/content_settings/host_content_settings_map.h"
#include "chrome/browser/extensions/extension_system_factory.h"
#include "chrome/browser/extensions/test_extension_system.h"
#include "chrome/browser/favicon/chrome_favicon_client_factory.h"
#include "chrome/browser/favicon/favicon_service.h"
#include "chrome/browser/favicon/favicon_service_factory.h"
@ -84,6 +82,8 @@
#if defined(ENABLE_EXTENSIONS)
#include "chrome/browser/extensions/extension_special_storage_policy.h"
#include "chrome/browser/extensions/extension_system_factory.h"
#include "chrome/browser/extensions/test_extension_system.h"
#include "chrome/browser/guest_view/guest_view_manager.h"
#include "extensions/browser/extension_system.h"
#endif
@ -354,8 +354,10 @@ void TestingProfile::Init() {
if (!IsOffTheRecord())
CreateProfilePolicyConnector();
#if defined(ENABLE_EXTENSIONS)
extensions::ExtensionSystemFactory::GetInstance()->SetTestingFactory(
this, extensions::TestExtensionSystem::Build);
#endif
// If no original profile was specified for this profile: register preferences
// even if this is an incognito profile - this allows tests to create a

@ -8,139 +8,6 @@ import("//build/config/features.gni")
# GYP version: extensions/extensions.gyp:extensions_browser
source_set("browser") {
sources = [
"admin_policy.cc",
"admin_policy.h",
"api_activity_monitor.h",
"app_sorting.h",
"blacklist_state.h",
"blob_holder.cc",
"blob_holder.h",
"browser_context_keyed_api_factory.h",
"component_extension_resource_manager.h",
"computed_hashes.cc",
"computed_hashes.h",
"content_hash_fetcher.cc",
"content_hash_fetcher.h",
"content_hash_reader.cc",
"content_hash_reader.h",
"content_hash_tree.cc",
"content_hash_tree.h",
"content_verifier.cc",
"content_verifier.h",
"content_verifier_delegate.h",
"content_verifier_io_data.cc",
"content_verifier_io_data.h",
"content_verify_job.cc",
"content_verify_job.h",
"error_map.cc",
"error_map.h",
"event_listener_map.cc",
"event_listener_map.h",
"event_router.cc",
"event_router.h",
"extension_error.cc",
"extension_error.h",
"extension_function.cc",
"extension_function.h",
"extension_function_dispatcher.cc",
"extension_function_dispatcher.h",
"extension_function_registry.cc",
"extension_function_registry.h",
"extension_function_util.cc",
"extension_function_util.h",
"extension_host.cc",
"extension_host.h",
"extension_host_delegate.h",
"extension_icon_image.cc",
"extension_icon_image.h",
"extension_message_filter.cc",
"extension_message_filter.h",
"extension_pref_store.cc",
"extension_pref_store.h",
"extension_pref_value_map.cc",
"extension_pref_value_map.h",
"extension_pref_value_map_factory.cc",
"extension_pref_value_map_factory.h",
"extension_prefs.cc",
"extension_prefs.h",
"extension_prefs_factory.cc",
"extension_prefs_factory.h",
"extension_prefs_observer.h",
"extension_prefs_scope.h",
"extension_protocols.cc",
"extension_protocols.h",
"extension_registry.cc",
"extension_registry.h",
"extension_registry_factory.cc",
"extension_registry_factory.h",
"extension_registry_observer.h",
"extension_scoped_prefs.h",
"extension_system.cc",
"extension_system.h",
"extension_system_provider.cc",
"extension_system_provider.h",
"extension_util.cc",
"extension_util.h",
"extension_web_contents_observer.cc",
"extension_web_contents_observer.h",
"extensions_browser_client.cc",
"extensions_browser_client.h",
"external_provider_interface.h",
"file_highlighter.cc",
"file_highlighter.h",
"file_reader.cc",
"file_reader.h",
"granted_file_entry.cc",
"granted_file_entry.h",
"image_loader.cc",
"image_loader.h",
"image_loader_factory.cc",
"image_loader_factory.h",
"image_util.cc",
"image_util.h",
"info_map.cc",
"info_map.h",
"install_flag.h",
"lazy_background_task_queue.cc",
"lazy_background_task_queue.h",
"management_policy.cc",
"management_policy.h",
"pref_names.cc",
"pref_names.h",
"process_manager.cc",
"process_manager.h",
"process_manager_delegate.h",
"process_manager_observer.h",
"process_map.cc",
"process_map.h",
"process_map_factory.cc",
"process_map_factory.h",
"quota_service.cc",
"quota_service.h",
"renderer_startup_helper.cc",
"renderer_startup_helper.h",
"runtime_data.cc",
"runtime_data.h",
"state_store.cc",
"state_store.h",
"uninstall_reason.h",
"update_observer.h",
"value_store/leveldb_value_store.cc",
"value_store/leveldb_value_store.h",
"value_store/testing_value_store.cc",
"value_store/testing_value_store.h",
"value_store/value_store.cc",
"value_store/value_store.h",
"value_store/value_store_change.cc",
"value_store/value_store_change.h",
"value_store/value_store_frontend.cc",
"value_store/value_store_frontend.h",
"value_store/value_store_util.cc",
"value_store/value_store_util.h",
"verified_contents.cc",
"verified_contents.h",
"view_type_utils.cc",
"view_type_utils.h",
]
deps = [
@ -162,8 +29,8 @@ source_set("browser") {
# TODO: Eventually the entire extensions module should not be built
# when enable_extensions=false.
sources += [
# NOTE: When moving an API out of Chrome be sure to verify that the
# Android build still compiles. See conditions below.
"admin_policy.cc",
"admin_policy.h",
"api/api_resource.cc",
"api/api_resource.h",
"api/api_resource_manager.h",
@ -252,8 +119,139 @@ source_set("browser") {
"api/usb/usb_api.h",
"api/usb/usb_device_resource.cc",
"api/usb/usb_device_resource.h",
"api_activity_monitor.h",
"app_sorting.h",
"blacklist_state.h",
"blob_holder.cc",
"blob_holder.h",
"browser_context_keyed_api_factory.h",
"browser_context_keyed_service_factories.cc",
"browser_context_keyed_service_factories.h",
"component_extension_resource_manager.h",
"computed_hashes.cc",
"computed_hashes.h",
"content_hash_fetcher.cc",
"content_hash_fetcher.h",
"content_hash_reader.cc",
"content_hash_reader.h",
"content_hash_tree.cc",
"content_hash_tree.h",
"content_verifier.cc",
"content_verifier.h",
"content_verifier_delegate.h",
"content_verifier_io_data.cc",
"content_verifier_io_data.h",
"content_verify_job.cc",
"content_verify_job.h",
"error_map.cc",
"error_map.h",
"event_listener_map.cc",
"event_listener_map.h",
"event_router.cc",
"event_router.h",
"extension_error.cc",
"extension_error.h",
"extension_function.cc",
"extension_function.h",
"extension_function_dispatcher.cc",
"extension_function_dispatcher.h",
"extension_function_registry.cc",
"extension_function_registry.h",
"extension_function_util.cc",
"extension_function_util.h",
"extension_host.cc",
"extension_host.h",
"extension_host_delegate.h",
"extension_icon_image.cc",
"extension_icon_image.h",
"extension_message_filter.cc",
"extension_message_filter.h",
"extension_pref_store.cc",
"extension_pref_store.h",
"extension_pref_value_map.cc",
"extension_pref_value_map.h",
"extension_pref_value_map_factory.cc",
"extension_pref_value_map_factory.h",
"extension_prefs.cc",
"extension_prefs.h",
"extension_prefs_factory.cc",
"extension_prefs_factory.h",
"extension_prefs_observer.h",
"extension_prefs_scope.h",
"extension_protocols.cc",
"extension_protocols.h",
"extension_registry.cc",
"extension_registry.h",
"extension_registry_factory.cc",
"extension_registry_factory.h",
"extension_registry_observer.h",
"extension_scoped_prefs.h",
"extension_system.cc",
"extension_system.h",
"extension_system_provider.cc",
"extension_system_provider.h",
"extension_util.cc",
"extension_util.h",
"extension_web_contents_observer.cc",
"extension_web_contents_observer.h",
"extensions_browser_client.cc",
"extensions_browser_client.h",
"external_provider_interface.h",
"file_highlighter.cc",
"file_highlighter.h",
"file_reader.cc",
"file_reader.h",
"granted_file_entry.cc",
"granted_file_entry.h",
"image_loader.cc",
"image_loader.h",
"image_loader_factory.cc",
"image_loader_factory.h",
"image_util.cc",
"image_util.h",
"info_map.cc",
"info_map.h",
"install_flag.h",
"lazy_background_task_queue.cc",
"lazy_background_task_queue.h",
"management_policy.cc",
"management_policy.h",
"pref_names.cc",
"pref_names.h",
"process_manager.cc",
"process_manager.h",
"process_manager_delegate.h",
"process_manager_observer.h",
"process_map.cc",
"process_map.h",
"process_map_factory.cc",
"process_map_factory.h",
"quota_service.cc",
"quota_service.h",
"renderer_startup_helper.cc",
"renderer_startup_helper.h",
"runtime_data.cc",
"runtime_data.h",
"state_store.cc",
"state_store.h",
"uninstall_reason.h",
"update_observer.h",
"value_store/leveldb_value_store.cc",
"value_store/leveldb_value_store.h",
"value_store/testing_value_store.cc",
"value_store/testing_value_store.h",
"value_store/value_store.cc",
"value_store/value_store.h",
"value_store/value_store_change.cc",
"value_store/value_store_change.h",
"value_store/value_store_frontend.cc",
"value_store/value_store_frontend.h",
"value_store/value_store_util.cc",
"value_store/value_store_util.h",
"verified_contents.cc",
"verified_contents.h",
"view_type_utils.cc",
"view_type_utils.h",
]
deps += [

@ -507,11 +507,7 @@
# TODO: Eventually the entire extensions module should not be built
# when enable_extensions==0.
'sources/': [
['exclude', '^browser/api/'],
],
'sources!': [
'browser/browser_context_keyed_service_factories.cc',
'browser/browser_context_keyed_service_factories.h',
['exclude', '^browser/'],
],
'dependencies!': [
'../components/components.gyp:usb_service',