From 47c9ab1255a1a7bdfc1517350de5ffd5edcc6a24 Mon Sep 17 00:00:00 2001 From: deepak1556 Date: Fri, 23 Nov 2018 15:12:45 +0530 Subject: [PATCH] chore: update api for Ch66 --- atom/browser/api/atom_api_net_log.cc | 9 ++++----- atom/browser/atom_browser_client.cc | 1 + atom/browser/atom_browser_context.cc | 5 +++-- atom/browser/atom_browser_context.h | 5 ++++- atom/browser/atom_browser_main_parts.cc | 5 ++++- atom/browser/io_thread.cc | 2 +- atom/browser/net/resolve_proxy_helper.cc | 9 --------- atom/browser/net/resolve_proxy_helper.h | 9 +-------- atom/browser/net/url_request_context_getter.cc | 12 ++++-------- brightray/brightray.gyp | 3 +++ brightray/filenames.gypi | 10 ---------- filenames.gypi | 16 ++++++++++++---- 12 files changed, 37 insertions(+), 49 deletions(-) diff --git a/atom/browser/api/atom_api_net_log.cc b/atom/browser/api/atom_api_net_log.cc index 676dca42ebf41..f15b3840b89ea 100644 --- a/atom/browser/api/atom_api_net_log.cc +++ b/atom/browser/api/atom_api_net_log.cc @@ -43,9 +43,8 @@ void NetLog::StartLogging(mate::Arguments* args) { return; } - auto* network_context = - content::BrowserContext::GetDefaultStoragePartition(browser_context_) - ->GetNetworkContext(); + net_log::NetExportFileWriter::URLRequestContextGetterList context_getters = { + browser_context_->GetRequestContext()}; // TODO(deepak1556): Provide more flexibility to this module // by allowing customizations on the capturing options. @@ -53,7 +52,7 @@ void NetLog::StartLogging(mate::Arguments* args) { log_path, net::NetLogCaptureMode::Default(), net_log::NetExportFileWriter::kNoLimit /* file size limit */, base::CommandLine::ForCurrentProcess()->GetCommandLineString(), - std::string(), network_context); + std::string(), context_getters); } std::string NetLog::GetLoggingState() const { @@ -95,7 +94,7 @@ void NetLog::StopLogging(mate::Arguments* args) { if (IsCurrentlyLogging()) { stop_callback_queue_.emplace_back(callback); - net_log_writer_->StopNetLog(nullptr); + net_log_writer_->StopNetLog(nullptr, nullptr); } else { callback.Run(base::FilePath()); } diff --git a/atom/browser/atom_browser_client.cc b/atom/browser/atom_browser_client.cc index 5ba013bc610a0..acd9a3d4e22ea 100644 --- a/atom/browser/atom_browser_client.cc +++ b/atom/browser/atom_browser_client.cc @@ -33,6 +33,7 @@ #include "base/stl_util.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_util.h" +#include "base/strings/utf_string_conversions.h" #include "chrome/browser/printing/printing_message_filter.h" #include "chrome/browser/renderer_host/pepper/chrome_browser_pepper_host_factory.h" #include "chrome/browser/speech/tts_message_filter.h" diff --git a/atom/browser/atom_browser_context.cc b/atom/browser/atom_browser_context.cc index 8528d2bbf1838..ad5fc61708acd 100644 --- a/atom/browser/atom_browser_context.cc +++ b/atom/browser/atom_browser_context.cc @@ -14,7 +14,6 @@ #include "atom/browser/cookie_change_notifier.h" #include "atom/browser/net/resolve_proxy_helper.h" #include "atom/browser/pref_store_delegate.h" -#include "atom/browser/special_storage_policy.h" #include "atom/browser/web_view_manager.h" #include "atom/common/atom_version.h" #include "atom/common/chrome_version.h" @@ -28,6 +27,7 @@ #include "base/threading/thread_restrictions.h" #include "brightray/browser/brightray_paths.h" #include "brightray/browser/inspectable_web_contents_impl.h" +#include "brightray/browser/special_storage_policy.h" #include "brightray/browser/zoom_level_delegate.h" #include "brightray/common/application_info.h" #include "chrome/common/chrome_paths.h" @@ -40,6 +40,7 @@ #include "components/proxy_config/pref_proxy_config_tracker_impl.h" #include "components/proxy_config/proxy_config_pref_names.h" #include "content/browser/blob_storage/chrome_blob_storage_context.h" +#include "content/public/browser/browser_thread.h" #include "content/public/browser/storage_partition.h" #include "content/public/common/user_agent.h" #include "net/base/escape.h" @@ -74,7 +75,7 @@ AtomBrowserContext::AtomBrowserContext(const std::string& partition, : base::RefCountedDeleteOnSequence( base::SequencedTaskRunnerHandle::Get()), in_memory_pref_store_(nullptr), - storage_policy_(new SpecialStoragePolicy), + storage_policy_(new brightray::SpecialStoragePolicy), in_memory_(in_memory), weak_factory_(this) { // Construct user agent string. diff --git a/atom/browser/atom_browser_context.h b/atom/browser/atom_browser_context.h index 83d9e529984ae..db777f2e78d39 100644 --- a/atom/browser/atom_browser_context.h +++ b/atom/browser/atom_browser_context.h @@ -21,6 +21,10 @@ class PrefRegistrySimple; class PrefService; class ValueMapPrefStore; +namespace brightray { +class SpecialStoragePolicy; +} + namespace atom { class AtomBlobReader; @@ -29,7 +33,6 @@ class AtomDownloadManagerDelegate; class AtomPermissionManager; class CookieChangeNotifier; class ResolveProxyHelper; -class SpecialStoragePolicy; class WebViewManager; class AtomBrowserContext diff --git a/atom/browser/atom_browser_main_parts.cc b/atom/browser/atom_browser_main_parts.cc index 651ccb228d8bb..4096f43bae676 100644 --- a/atom/browser/atom_browser_main_parts.cc +++ b/atom/browser/atom_browser_main_parts.cc @@ -22,6 +22,7 @@ #include "chrome/browser/net/chrome_net_log_helper.h" #include "components/net_log/chrome_net_log.h" #include "components/net_log/net_export_file_writer.h" +#include "content/public/browser/browser_thread.h" #include "content/public/browser/child_process_security_policy.h" #include "content/public/common/result_codes.h" #include "content/public/common/service_manager_connection.h" @@ -195,7 +196,9 @@ int AtomBrowserMainParts::PreCreateThreads() { } } // Initialize net log file exporter. - net_log_->net_export_file_writer()->Initialize(); + net_log_->net_export_file_writer()->Initialize( + content::BrowserThread::GetTaskRunnerForThread( + content::BrowserThread::IO)); // Manage global state of net and other IO thread related. io_thread_ = std::make_unique(net_log_.get()); diff --git a/atom/browser/io_thread.cc b/atom/browser/io_thread.cc index 15a60e3a2dc36..e01f9f28904a8 100644 --- a/atom/browser/io_thread.cc +++ b/atom/browser/io_thread.cc @@ -6,7 +6,7 @@ #include "components/net_log/chrome_net_log.h" #include "content/public/browser/browser_thread.h" -#include "net/proxy_resolution/proxy_resolution_service.h" +#include "net/proxy_resolution/proxy_service.h" #include "net/url_request/url_request_context.h" #include "net/url_request/url_request_context_builder.h" #include "net/url_request/url_request_context_getter.h" diff --git a/atom/browser/net/resolve_proxy_helper.cc b/atom/browser/net/resolve_proxy_helper.cc index cf148183de5de..51767418bdc40 100644 --- a/atom/browser/net/resolve_proxy_helper.cc +++ b/atom/browser/net/resolve_proxy_helper.cc @@ -84,13 +84,4 @@ ResolveProxyHelper::PendingRequest::PendingRequest( const ResolveProxyCallback& callback) : url(url), callback(callback) {} -ResolveProxyHelper::PendingRequest::PendingRequest( - ResolveProxyHelper::PendingRequest&& pending_request) = default; - -ResolveProxyHelper::PendingRequest::~PendingRequest() noexcept = default; - -ResolveProxyHelper::PendingRequest& ResolveProxyHelper::PendingRequest:: -operator=(ResolveProxyHelper::PendingRequest&& pending_request) noexcept = - default; - } // namespace atom diff --git a/atom/browser/net/resolve_proxy_helper.h b/atom/browser/net/resolve_proxy_helper.h index 864ca674db1e6..45cd3374262aa 100644 --- a/atom/browser/net/resolve_proxy_helper.h +++ b/atom/browser/net/resolve_proxy_helper.h @@ -9,7 +9,7 @@ #include #include "base/memory/ref_counted.h" -#include "net/proxy_resolution/proxy_resolution_service.h" +#include "net/proxy_resolution/proxy_service.h" #include "url/gurl.h" namespace net { @@ -35,16 +35,9 @@ class ResolveProxyHelper struct PendingRequest { public: PendingRequest(const GURL& url, const ResolveProxyCallback& callback); - PendingRequest(PendingRequest&& pending_request) noexcept; - ~PendingRequest(); - - PendingRequest& operator=(PendingRequest&& pending_request) noexcept; GURL url; ResolveProxyCallback callback; - - private: - DISALLOW_COPY_AND_ASSIGN(PendingRequest); }; ~ResolveProxyHelper(); diff --git a/atom/browser/net/url_request_context_getter.cc b/atom/browser/net/url_request_context_getter.cc index 328b9625bbd23..234e1901c59fd 100644 --- a/atom/browser/net/url_request_context_getter.cc +++ b/atom/browser/net/url_request_context_getter.cc @@ -46,8 +46,7 @@ #include "net/log/net_log.h" #include "net/proxy_resolution/proxy_config.h" #include "net/proxy_resolution/proxy_config_service.h" -#include "net/proxy_resolution/proxy_config_with_annotation.h" -#include "net/proxy_resolution/proxy_resolution_service.h" +#include "net/proxy_resolution/proxy_service.h" #include "net/traffic_annotation/network_traffic_annotation.h" #include "net/url_request/data_protocol_handler.h" #include "net/url_request/static_http_user_agent_settings.h" @@ -80,10 +79,6 @@ network::mojom::NetworkContextParamsPtr CreateDefaultNetworkContextParams( network_context_params->enable_brotli = true; network_context_params->user_agent = user_agent; network_context_params->http_cache_enabled = use_cache; - network_context_params->accept_language = - net::HttpUtil::GenerateAcceptLanguageHeader( - brightray::BrowserClient::Get()->GetApplicationLocale()); - network_context_params->allow_gssapi_library_load = true; network_context_params->enable_data_url_support = false; network_context_params->proxy_resolver_factory = ChromeMojoProxyResolverFactory::CreateWithStrongBinding().PassInterface(); @@ -112,8 +107,9 @@ void SetupAtomURLRequestJobFactory( net::URLRequestContext* url_request_context, AtomURLRequestJobFactory* job_factory) { for (auto& protocol_handler : *protocol_handlers) { - job_factory->SetProtocolHandler(protocol_handler.first, - std::move(protocol_handler.second)); + job_factory->SetProtocolHandler( + protocol_handler.first, + base::WrapUnique(protocol_handler.second.release())); } protocol_handlers->clear(); diff --git a/brightray/brightray.gyp b/brightray/brightray.gyp index 5b353f0a7a9b5..8daa155902169 100644 --- a/brightray/brightray.gyp +++ b/brightray/brightray.gyp @@ -126,6 +126,7 @@ '<(libchromiumcontent_dir)/librenderer.a', '<(libchromiumcontent_dir)/libsecurity_state.a', '<(libchromiumcontent_dir)/libviz_service.a', + '<(libchromiumcontent_dir)/libchrome.a', # services/device/wake_lock/power_save_blocker/ '<(libchromiumcontent_dir)/libpower_save_blocker.a', # Friends of libpdf.a: @@ -221,6 +222,7 @@ '<(libchromiumcontent_dir)/librenderer.a', '<(libchromiumcontent_dir)/libsecurity_state.a', '<(libchromiumcontent_dir)/libviz_service.a', + '<(libchromiumcontent_dir)/libchrome.a', # services/device/wake_lock/power_save_blocker/ '<(libchromiumcontent_dir)/libpower_save_blocker.a', # Friends of libpdf.a: @@ -360,6 +362,7 @@ '<(libchromiumcontent_dir)/renderer.lib', '<(libchromiumcontent_dir)/security_state.lib', '<(libchromiumcontent_dir)/viz_service.lib', + '<(libchromiumcontent_dir)/chrome.lib', # services/device/wake_lock/power_save_blocker/ '<(libchromiumcontent_dir)/power_save_blocker.lib', # Friends of pdf.lib: diff --git a/brightray/filenames.gypi b/brightray/filenames.gypi index 03b1106f978cb..ac1f8eb8e654e 100644 --- a/brightray/filenames.gypi +++ b/brightray/filenames.gypi @@ -4,8 +4,6 @@ 'browser/brightray_paths.h', 'browser/browser_client.cc', 'browser/browser_client.h', - 'browser/browser_context.cc', - 'browser/browser_context.h', 'browser/browser_main_parts.cc', 'browser/browser_main_parts.h', 'browser/browser_main_parts_mac.mm', @@ -29,8 +27,6 @@ 'browser/inspectable_web_contents_view.h', 'browser/inspectable_web_contents_view_mac.h', 'browser/inspectable_web_contents_view_mac.mm', - 'browser/io_thread.cc', - 'browser/io_thread.h', 'browser/mac/bry_inspectable_web_contents_view.h', 'browser/mac/bry_inspectable_web_contents_view.mm', 'browser/mac/cocoa_notification.h', @@ -49,8 +45,6 @@ 'browser/media/media_stream_devices_controller.h', 'browser/net/require_ct_delegate.cc', 'browser/net/require_ct_delegate.h', - 'browser/net_log.cc', - 'browser/net_log.h', 'browser/notification_delegate.h', 'browser/notification_presenter.cc', 'browser/notification_presenter.h', @@ -81,8 +75,6 @@ 'browser/win/windows_toast_notification.h', 'browser/special_storage_policy.cc', 'browser/special_storage_policy.h', - 'browser/url_request_context_getter.cc', - 'browser/url_request_context_getter.h', 'browser/views/inspectable_web_contents_view_views.h', 'browser/views/inspectable_web_contents_view_views.cc', 'browser/views/views_delegate.cc', @@ -102,8 +94,6 @@ 'common/main_delegate.cc', 'common/main_delegate.h', 'common/main_delegate_mac.mm', - 'common/switches.cc', - 'common/switches.h', 'common/platform_util_linux.cc', 'common/platform_util.h', ], diff --git a/filenames.gypi b/filenames.gypi index 9aa6f5ea335bd..fd90119491fe8 100644 --- a/filenames.gypi +++ b/filenames.gypi @@ -230,6 +230,10 @@ 'atom/browser/common_web_contents_delegate_views.cc', 'atom/browser/common_web_contents_delegate.cc', 'atom/browser/common_web_contents_delegate.h', + 'atom/browser/cookie_change_notifier.cc', + 'atom/browser/cookie_change_notifier.h', + 'atom/browser/io_thread.cc', + 'atom/browser/io_thread.h', 'atom/browser/javascript_environment.cc', 'atom/browser/javascript_environment.h', 'atom/browser/lib/bluetooth_chooser.cc', @@ -285,20 +289,26 @@ 'atom/browser/net/http_protocol_handler.h', 'atom/browser/net/js_asker.cc', 'atom/browser/net/js_asker.h', + 'atom/browser/net/resolve_proxy_helper.cc', + 'atom/browser/net/resolve_proxy_helper.h', 'atom/browser/net/url_request_about_job.cc', 'atom/browser/net/url_request_about_job.h', 'atom/browser/net/url_request_async_asar_job.cc', 'atom/browser/net/url_request_async_asar_job.h', - 'atom/browser/net/url_request_string_job.cc', - 'atom/browser/net/url_request_string_job.h', 'atom/browser/net/url_request_buffer_job.cc', 'atom/browser/net/url_request_buffer_job.h', + 'atom/browser/net/url_request_context_getter.cc', + 'atom/browser/net/url_request_context_getter.h', 'atom/browser/net/url_request_fetch_job.cc', 'atom/browser/net/url_request_fetch_job.h', 'atom/browser/net/url_request_stream_job.cc', 'atom/browser/net/url_request_stream_job.h', + 'atom/browser/net/url_request_string_job.cc', + 'atom/browser/net/url_request_string_job.h', 'atom/browser/node_debugger.cc', 'atom/browser/node_debugger.h', + 'atom/browser/pref_store_delegate.cc', + 'atom/browser/pref_store_delegate.h', 'atom/browser/relauncher_linux.cc', 'atom/browser/relauncher_mac.cc', 'atom/browser/relauncher_win.cc', @@ -306,8 +316,6 @@ 'atom/browser/relauncher.h', 'atom/browser/render_process_preferences.cc', 'atom/browser/render_process_preferences.h', - 'atom/browser/request_context_delegate.cc', - 'atom/browser/request_context_delegate.h', 'atom/browser/session_preferences.cc', 'atom/browser/session_preferences.h', 'atom/browser/ui/accelerator_util.cc',