From dcc1ed7b1ab73640eb9152c768d94e559afc95a6 Mon Sep 17 00:00:00 2001 From: Julian Ospald Date: Thu, 5 May 2016 14:42:46 +0200 Subject: [PATCH] net-www/inox: bump to 49.0.2623.111 --- ...ox-flash-plugin-49.0.2623.111_1.exheres-0} | 0 ...widevine-plugin-49.0.2623.111_1.exheres-0} | 0 .../disable-autofill-download-manager.patch | 27 +++--- .../inox/disable-default-extensions.patch | 40 ++++----- .../inox/disable-google-url-tracker.patch | 4 +- .../disable-notification-promo-fetch.patch | 36 -------- .../inox/disable-web-resource-service.patch | 34 ++++++++ .../files/inox/modify-default-prefs.patch | 84 +++++++++---------- ...exheres-0 => inox-49.0.2623.111.exheres-0} | 0 9 files changed, 108 insertions(+), 117 deletions(-) rename packages/net-www/inox-flash-plugin/{inox-flash-plugin-48.0.2564.109_1.exheres-0 => inox-flash-plugin-49.0.2623.111_1.exheres-0} (100%) rename packages/net-www/inox-widevine-plugin/{inox-widevine-plugin-48.0.2564.109_1.exheres-0 => inox-widevine-plugin-49.0.2623.111_1.exheres-0} (100%) delete mode 100644 packages/net-www/inox/files/inox/disable-notification-promo-fetch.patch create mode 100644 packages/net-www/inox/files/inox/disable-web-resource-service.patch rename packages/net-www/inox/{inox-48.0.2564.109.exheres-0 => inox-49.0.2623.111.exheres-0} (100%) diff --git a/packages/net-www/inox-flash-plugin/inox-flash-plugin-48.0.2564.109_1.exheres-0 b/packages/net-www/inox-flash-plugin/inox-flash-plugin-49.0.2623.111_1.exheres-0 similarity index 100% rename from packages/net-www/inox-flash-plugin/inox-flash-plugin-48.0.2564.109_1.exheres-0 rename to packages/net-www/inox-flash-plugin/inox-flash-plugin-49.0.2623.111_1.exheres-0 diff --git a/packages/net-www/inox-widevine-plugin/inox-widevine-plugin-48.0.2564.109_1.exheres-0 b/packages/net-www/inox-widevine-plugin/inox-widevine-plugin-49.0.2623.111_1.exheres-0 similarity index 100% rename from packages/net-www/inox-widevine-plugin/inox-widevine-plugin-48.0.2564.109_1.exheres-0 rename to packages/net-www/inox-widevine-plugin/inox-widevine-plugin-49.0.2623.111_1.exheres-0 diff --git a/packages/net-www/inox/files/inox/disable-autofill-download-manager.patch b/packages/net-www/inox/files/inox/disable-autofill-download-manager.patch index a5e06d62..2ef90fd3 100644 --- a/packages/net-www/inox/files/inox/disable-autofill-download-manager.patch +++ b/packages/net-www/inox/files/inox/disable-autofill-download-manager.patch @@ -1,6 +1,6 @@ ---- ./components/autofill/core/browser/autofill_download_manager.cc -+++ ./components/autofill/core/browser/autofill_download_manager.cc.new -@@ -57,8 +57,7 @@ +--- ./components/autofill/core/browser/autofill_download_manager.cc 2016-03-08 04:12:53.191538227 +0300 ++++ ./components/autofill/core/browser/autofill_download_manager.cc.new 2016-03-08 04:14:33.351542560 +0300 +@@ -87,8 +87,7 @@ } GURL GetRequestUrl(AutofillDownloadManager::RequestType request_type) { @@ -10,9 +10,9 @@ } } // namespace -@@ -190,46 +189,6 @@ +@@ -174,48 +173,6 @@ + bool AutofillDownloadManager::StartRequest( - const std::string& form_xml, const FormRequestData& request_data) { - net::URLRequestContextGetter* request_context = - driver_->GetURLRequestContext(); @@ -20,14 +20,15 @@ - GURL request_url = GetRequestUrl(request_data.request_type); - - std::string compressed_data; -- if (!compression::GzipCompress(form_xml, &compressed_data)) { +- if (!compression::GzipCompress(request_data.payload, &compressed_data)) { - NOTREACHED(); - return false; - } - -- AutofillMetrics::LogPayloadCompressionRatio( -- static_cast(100 * compressed_data.size() / form_xml.size()), -- request_data.request_type); +- const int compression_ratio = base::checked_cast( +- 100 * compressed_data.size() / request_data.payload.size()); +- AutofillMetrics::LogPayloadCompressionRatio(compression_ratio, +- request_data.request_type); - - // Id is ignored for regular chrome, in unit test id's for fake fetcher - // factory will be 0, 1, 2, ... @@ -45,16 +46,16 @@ - // Add Chrome experiment state and GZIP encoding to the request headers. - net::HttpRequestHeaders headers; - headers.SetHeaderIfMissing("content-encoding", "gzip"); -- variations::VariationsHttpHeaderProvider::GetInstance()->AppendHeaders( +- variations::AppendVariationHeaders( - fetcher->GetOriginalURL(), driver_->IsOffTheRecord(), false, &headers); - fetcher->SetExtraRequestHeaders(headers.ToString()); - fetcher->Start(); - - VLOG(1) << "Sending AutofillDownloadManager " -- << RequestTypeToString(request_data.request_type) -- << " request: " << form_xml; +- << RequestTypeToString(request_data.request_type) +- << " request (compression " << compression_ratio +- << "): " << request_data.payload; - return true; } - diff --git a/packages/net-www/inox/files/inox/disable-default-extensions.patch b/packages/net-www/inox/files/inox/disable-default-extensions.patch index 83d3b2d3..9f9cc9ed 100644 --- a/packages/net-www/inox/files/inox/disable-default-extensions.patch +++ b/packages/net-www/inox/files/inox/disable-default-extensions.patch @@ -1,20 +1,20 @@ --- ./chrome/browser/extensions/external_component_loader.cc +++ ./chrome/browser/extensions/external_component_loader.cc.new -@@ -38,10 +38,6 @@ - +@@ -39,10 +39,6 @@ + void ExternalComponentLoader::StartLoading() { prefs_.reset(new base::DictionaryValue()); - AddExternalExtension(extension_misc::kInAppPaymentsSupportAppId); - - if (HotwordServiceFactory::IsHotwordAllowed(profile_)) - AddExternalExtension(extension_misc::kHotwordSharedModuleId); - + #if defined(OS_CHROMEOS) { -@@ -52,17 +48,6 @@ +@@ -53,17 +49,6 @@ } #endif - + -#if defined(ENABLE_MEDIA_ROUTER) && defined(GOOGLE_CHROME_BUILD) - if (media_router::MediaRouterEnabled(profile_)) - AddExternalExtension(extension_misc::kMediaRouterStableExtensionId); @@ -32,36 +32,36 @@ --- ./chrome/browser/extensions/component_loader.cc +++ ./chrome/browser/extensions/component_loader.cc.new -@@ -350,24 +350,12 @@ +@@ -351,24 +351,12 @@ } - + void ComponentLoader::AddHangoutServicesExtension() { -#if defined(GOOGLE_CHROME_BUILD) || defined(ENABLE_HANGOUT_SERVICES_EXTENSION) - Add(IDR_HANGOUT_SERVICES_MANIFEST, - base::FilePath(FILE_PATH_LITERAL("hangout_services"))); -#endif } - + void ComponentLoader::AddHotwordAudioVerificationApp() { - if (HotwordServiceFactory::IsAlwaysOnAvailable()) { - Add(IDR_HOTWORD_AUDIO_VERIFICATION_MANIFEST, - base::FilePath(FILE_PATH_LITERAL("hotword_audio_verification"))); - } } - + void ComponentLoader::AddHotwordHelperExtension() { - if (HotwordServiceFactory::IsHotwordAllowed(profile_)) { - Add(IDR_HOTWORD_MANIFEST, - base::FilePath(FILE_PATH_LITERAL("hotword"))); - } } - + void ComponentLoader::AddImageLoaderExtension() { -@@ -384,43 +384,6 @@ +@@ -384,43 +372,6 @@ } - + void ComponentLoader::AddGoogleNowExtension() { --#if defined(ENABLE_GOOGLE_NOW) +-#if BUILDFLAG(ENABLE_GOOGLE_NOW) - const char kEnablePrefix[] = "Enable"; - const char kFieldTrialName[] = "GoogleNow"; - std::string enable_prefix(kEnablePrefix); @@ -97,13 +97,13 @@ - } else { - DeleteData(google_now_manifest_id, root_directory); - } --#endif // defined(ENABLE_GOOGLE_NOW) +-#endif // BUILDFLAG(ENABLE_GOOGLE_NOW) } - + #if defined(OS_CHROMEOS) -@@ -495,15 +446,6 @@ +@@ -496,15 +447,6 @@ } - + void ComponentLoader::AddWebStoreApp() { -#if defined(OS_CHROMEOS) - if (!IsNormalSession()) @@ -115,9 +115,9 @@ - l10n_util::GetStringUTF8(IDS_WEBSTORE_NAME_STORE), - l10n_util::GetStringUTF8(IDS_WEBSTORE_APP_DESCRIPTION)); } - + scoped_refptr ComponentLoader::CreateExtension( -@@ -555,9 +555,6 @@ +@@ -555,9 +497,6 @@ DCHECK(!skip_session_components); Add(IDR_BOOKMARKS_MANIFEST, base::FilePath(FILE_PATH_LITERAL("bookmark_manager"))); @@ -125,7 +125,7 @@ - Add(IDR_CLOUDPRINT_MANIFEST, - base::FilePath(FILE_PATH_LITERAL("cloud_print"))); #endif - + if (!skip_session_components) { diff --git a/packages/net-www/inox/files/inox/disable-google-url-tracker.patch b/packages/net-www/inox/files/inox/disable-google-url-tracker.patch index a3f21d2f..302b0971 100644 --- a/packages/net-www/inox/files/inox/disable-google-url-tracker.patch +++ b/packages/net-www/inox/files/inox/disable-google-url-tracker.patch @@ -1,6 +1,6 @@ --- ./components/google/core/browser/google_url_tracker.cc +++ ./components/google/core/browser/google_url_tracker.cc.new -@@ -22,9 +22,9 @@ +@@ -25,9 +25,9 @@ const char GoogleURLTracker::kDefaultGoogleHomepage[] = @@ -12,7 +12,7 @@ GoogleURLTracker::GoogleURLTracker(scoped_ptr client, Mode mode) -@@ -143,48 +143,4 @@ +@@ -146,48 +146,4 @@ } void GoogleURLTracker::StartFetchIfDesirable() { diff --git a/packages/net-www/inox/files/inox/disable-notification-promo-fetch.patch b/packages/net-www/inox/files/inox/disable-notification-promo-fetch.patch deleted file mode 100644 index 4816fc01..00000000 --- a/packages/net-www/inox/files/inox/disable-notification-promo-fetch.patch +++ /dev/null @@ -1,36 +0,0 @@ ---- ./chrome/browser/browser_process_impl.cc -+++ ./chrome/browser/browser_process_impl.cc.new -@@ -1082,7 +1082,6 @@ - local_state(), chrome::GetChannel(), GetApplicationLocale(), - system_request_context(), switches::kDisableBackgroundNetworking, - base::Bind(safe_json::SafeJsonParser::Parse))); -- promo_resource_service_->StartAfterDelay(); - } - - #if !defined(OS_ANDROID) && !defined(OS_IOS) - - - ---- ./chrome/browser/signin/signin_promo.cc -+++ ./chrome/browser/signin/signin_promo.cc.new -@@ -105,6 +105,7 @@ bool ShouldShowPromo(Profile* profile) { - - bool ShouldShowPromoAtStartup(Profile* profile, bool is_new_profile) { - DCHECK(profile); -+ return false; - - // Don't show if the profile is an incognito. - if (profile->IsOffTheRecord()) - - ---- ./components/web_resource/notification_promo.cc -+++ ./components/web_resource/notification_promo.cc.new -@@ -30,7 +30,7 @@ namespace { - - const int kDefaultGroupSize = 100; - --const char promo_server_url[] = "https://clients3.google.com/crsignal/client"; -+const char promo_server_url[] = "about:blank"; - - // The name of the preference that stores the promotion object. - const char kPrefPromoObject[] = "promo"; diff --git a/packages/net-www/inox/files/inox/disable-web-resource-service.patch b/packages/net-www/inox/files/inox/disable-web-resource-service.patch new file mode 100644 index 00000000..2ab7bad5 --- /dev/null +++ b/packages/net-www/inox/files/inox/disable-web-resource-service.patch @@ -0,0 +1,34 @@ +# Disable the web resource service + +--- a/./components/web_resource/web_resource_service.cc ++++ b/./components/web_resource/web_resource_service.cc +@@ -114,27 +114,8 @@ void WebResourceService::StartFetch() { + prefs_->SetString(last_update_time_pref_name_, + base::DoubleToString(base::Time::Now().ToDoubleT())); + +- // If we are still fetching data, exit. +- if (in_fetch_) +- return; +- in_fetch_ = true; +- +- GURL web_resource_server = +- application_locale_.empty() +- ? web_resource_server_ +- : google_util::AppendGoogleLocaleParam(web_resource_server_, +- application_locale_); +- +- DVLOG(1) << "WebResourceService StartFetch " << web_resource_server; +- url_fetcher_ = +- net::URLFetcher::Create(web_resource_server, net::URLFetcher::GET, this); +- // Do not let url fetcher affect existing state in system context +- // (by setting cookies, for example). +- url_fetcher_->SetLoadFlags(net::LOAD_DISABLE_CACHE | +- net::LOAD_DO_NOT_SEND_COOKIES | +- net::LOAD_DO_NOT_SAVE_COOKIES); +- url_fetcher_->SetRequestContext(request_context_.get()); +- url_fetcher_->Start(); ++ in_fetch_ = false; ++ return; + } + + void WebResourceService::EndFetch() { diff --git a/packages/net-www/inox/files/inox/modify-default-prefs.patch b/packages/net-www/inox/files/inox/modify-default-prefs.patch index c6c9a06b..1fe2ef23 100644 --- a/packages/net-www/inox/files/inox/modify-default-prefs.patch +++ b/packages/net-www/inox/files/inox/modify-default-prefs.patch @@ -1,6 +1,6 @@ --- ./chrome/browser/chrome_content_browser_client.cc +++ ./chrome/browser/chrome_content_browser_client.cc.new -@@ -639,7 +639,7 @@ +@@ -733,7 +733,7 @@ void ChromeContentBrowserClient::RegisterProfilePrefs( user_prefs::PrefRegistrySyncable* registry) { registry->RegisterBooleanPref(prefs::kDisable3DAPIs, false); @@ -13,7 +13,12 @@ --- ./chrome/browser/ui/browser_ui_prefs.cc +++ ./chrome/browser/ui/browser_ui_prefs.cc.new -@@ -86,7 +86,7 @@ +@@ -83,11 +83,11 @@ + registry->RegisterBooleanPref(prefs::kWebAppCreateInQuickLaunchBar, true); + registry->RegisterBooleanPref( + prefs::kEnableTranslate, +- true, ++ false, user_prefs::PrefRegistrySyncable::SYNCABLE_PREF); registry->RegisterStringPref(prefs::kCloudPrintEmail, std::string()); registry->RegisterBooleanPref(prefs::kCloudPrintProxyEnabled, true); @@ -27,15 +32,16 @@ --- ./chrome/browser/net/prediction_options.cc +++ ./chrome/browser/net/prediction_options.cc.new -@@ -25,7 +25,7 @@ bool CanPrefetchAndPrerender(int network_prediction_options) { +@@ -26,7 +26,7 @@ case NETWORK_PREDICTION_NEVER: - return false; + return NetworkPredictionStatus::DISABLED_ALWAYS; default: - DCHECK_EQ(NETWORK_PREDICTION_WIFI_ONLY, network_prediction_options); + //DCHECK_EQ(NETWORK_PREDICTION_WIFI_ONLY, network_prediction_options); - return !net::NetworkChangeNotifier::IsConnectionCellular( - net::NetworkChangeNotifier::GetConnectionType()); - } + if (net::NetworkChangeNotifier::IsConnectionCellular( + net::NetworkChangeNotifier::GetConnectionType())) { + return NetworkPredictionStatus::DISABLED_DUE_TO_NETWORK; + --- ./chrome/browser/net/prediction_options.h @@ -48,18 +54,20 @@ + NETWORK_PREDICTION_DEFAULT = NETWORK_PREDICTION_NEVER, }; - void RegisterPredictionOptionsProfilePrefs( + enum class NetworkPredictionStatus { --- ./chrome/browser/background/background_mode_manager.cc +++ ./chrome/browser/background/background_mode_manager.cc.new -@@ -330,7 +330,7 @@ void BackgroundModeManager::RegisterPrefs(PrefRegistrySimple* registry) { +@@ -356,7 +356,7 @@ void BackgroundModeManager::RegisterPref registry->RegisterBooleanPref(prefs::kChromeCreatedLoginItem, false); registry->RegisterBooleanPref(prefs::kMigratedLoginItemPref, false); #endif - registry->RegisterBooleanPref(prefs::kBackgroundModeEnabled, true); + registry->RegisterBooleanPref(prefs::kBackgroundModeEnabled, false); } + + void BackgroundModeManager::RegisterProfile(Profile* profile) { --- ./components/content_settings/core/browser/cookie_settings.cc @@ -77,7 +85,7 @@ --- ./chrome/browser/ui/navigation_correction_tab_observer.cc +++ ./chrome/browser/ui/navigation_correction_tab_observer.cc.new -@@ -58,7 +58,7 @@ NavigationCorrectionTabObserver::~NavigationCorrectionTabObserver() { +@@ -56,7 +56,7 @@ NavigationCorrectionTabObserver::~Naviga void NavigationCorrectionTabObserver::RegisterProfilePrefs( user_prefs::PrefRegistrySyncable* prefs) { prefs->RegisterBooleanPref(prefs::kAlternateErrorPagesEnabled, @@ -89,20 +97,20 @@ --- ./components/autofill/core/browser/autofill_manager.cc +++ ./components/autofill/core/browser/autofill_manager.cc.new -@@ -164,7 +164,7 @@ void AutofillManager::RegisterProfilePrefs( +@@ -140,7 +140,7 @@ void AutofillManager::RegisterProfilePre user_prefs::PrefRegistrySyncable* registry) { registry->RegisterBooleanPref( prefs::kAutofillEnabled, - true, + false, user_prefs::PrefRegistrySyncable::SYNCABLE_PREF); - registry->RegisterBooleanPref( - prefs::kAutofillWalletSyncExperimentEnabled, + registry->RegisterBooleanPref(prefs::kAutofillWalletSyncExperimentEnabled, + false); --- ./chrome/browser/resources/options/reset_profile_settings_overlay.html +++ ./chrome/browser/resources/options/reset_profile_settings_overlay.html.new -@@ -24,7 +24,7 @@ +@@ -26,7 +26,7 @@