net-www/inox: bump to 49.0.2623.111

This commit is contained in:
Julian Ospald 2016-05-05 14:42:46 +02:00
parent f45262df90
commit dcc1ed7b1a
No known key found for this signature in database
GPG Key ID: 511B62C09D50CD28
9 changed files with 108 additions and 117 deletions

View File

@ -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<int>(100 * compressed_data.size() / form_xml.size()),
- request_data.request_type);
- const int compression_ratio = base::checked_cast<int>(
- 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;
}

View File

@ -1,6 +1,6 @@
--- ./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());
@ -11,7 +11,7 @@
#if defined(OS_CHROMEOS)
{
@@ -52,17 +48,6 @@
@@ -53,17 +49,6 @@
}
#endif
@ -32,7 +32,7 @@
--- ./chrome/browser/extensions/component_loader.cc
+++ ./chrome/browser/extensions/component_loader.cc.new
@@ -350,24 +350,12 @@
@@ -351,24 +351,12 @@
}
void ComponentLoader::AddHangoutServicesExtension() {
@ -57,11 +57,11 @@
}
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,11 +97,11 @@
- } 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() {
@ -117,7 +117,7 @@
}
scoped_refptr<const Extension> 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")));

View File

@ -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<GoogleURLTrackerClient> client,
Mode mode)
@@ -143,48 +143,4 @@
@@ -146,48 +146,4 @@
}
void GoogleURLTracker::StartFetchIfDesirable() {

View File

@ -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";

View File

@ -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() {

View File

@ -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,12 +54,12 @@
+ 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
@ -61,6 +67,8 @@
+ registry->RegisterBooleanPref(prefs::kBackgroundModeEnabled, false);
}
void BackgroundModeManager::RegisterProfile(Profile* profile) {
--- ./components/content_settings/core/browser/cookie_settings.cc
+++ ./components/content_settings/core/browser/cookie_settings.cc.new
@ -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 @@
<div id="feedback-bar"
class="gray-bottom-bar checkbox controlled-setting-with-label">
<label>
@ -115,8 +123,8 @@
--- ./chrome/browser/io_thread.cc
+++ ./chrome/browser/io_thread.cc.new
@@ -1113,7 +1113,7 @@
data_reduction_proxy::prefs::kDataReductionProxy, std::string());
@@ -1043,7 +1043,7 @@ void IOThread::RegisterPrefs(PrefRegistr
std::string());
registry->RegisterBooleanPref(prefs::kEnableReferrers, true);
data_reduction_proxy::RegisterPrefs(registry);
- registry->RegisterBooleanPref(prefs::kBuiltInDnsClientEnabled, true);
@ -127,7 +135,7 @@
--- ./extensions/common/extension.cc
+++ ./extensions/common/extension.cc.new
@@ -347,7 +347,7 @@
@@ -357,7 +357,7 @@ bool Extension::ShouldNotBeVisible() con
if (extensions::Manifest::IsComponentLocation(location()) &&
!base::CommandLine::ForCurrentProcess()->HasSwitch(
switches::kShowComponentExtensionOptions)) {
@ -136,7 +144,7 @@
}
// Always show unpacked extensions and apps.
@@ -356,7 +356,7 @@
@@ -366,7 +366,7 @@ bool Extension::ShouldNotBeVisible() con
// Don't show apps that aren't visible in either launcher or ntp.
if (is_app() && !ShouldDisplayInAppLauncher() && !ShouldDisplayInNewTabPage())
@ -149,7 +157,7 @@
--- ./chrome/browser/signin/signin_promo.cc
+++ ./chrome/browser/signin/signin_promo.cc.new
@@ -253,8 +253,8 @@
@@ -353,8 +354,8 @@ void ForceWebBasedSigninFlowForTesting(b
void RegisterProfilePrefs(
user_prefs::PrefRegistrySyncable* registry) {
registry->RegisterIntegerPref(prefs::kSignInPromoStartupCount, 0);
@ -162,32 +170,16 @@
--- ./chrome/browser/ui/browser_ui_prefs.cc
+++ ./chrome/browser/ui/browser_ui_prefs.cc.new
@@ -102,7 +102,7 @@ void RegisterBrowserUserPrefs(user_prefs::PrefRegistrySyncable* registry) {
user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
registry->RegisterBooleanPref(
prefs::kEnableTranslate,
- true,
+ false,
user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
registry->RegisterStringPref(
prefs::kCloudPrintEmail,
--- ./components/bookmarks/browser/bookmark_utils.cc
+++ ./components/bookmarks/browser/bookmark_utils.cc.new
@@ -424,7 +424,7 @@
@@ -430,12 +430,12 @@ void GetBookmarksMatchingProperties(Book
void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
registry->RegisterBooleanPref(
prefs::kShowBookmarkBar,
- false,
+ true,
user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
registry->RegisterBooleanPref(
prefs::kEditBookmarksEnabled,
@@ -432,7 +432,7 @@
user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
registry->RegisterBooleanPref(prefs::kEditBookmarksEnabled, true);
registry->RegisterBooleanPref(
prefs::kShowAppsShortcutInBookmarkBar,
- true,
@ -199,25 +191,25 @@
--- ./chrome/browser/profiles/profile.cc
+++ ./chrome/browser/profiles/profile.cc.new
@@ -76,7 +76,7 @@
@@ -77,7 +77,7 @@ const char Profile::kNoHostedDomainFound
void Profile::RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
registry->RegisterBooleanPref(
prefs::kSearchSuggestEnabled,
- true,
+ false,
user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
#if defined(OS_ANDROID)
#if BUILDFLAG(ANDROID_JAVA_UI)
registry->RegisterStringPref(
@@ -94,7 +94,7 @@
user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
@@ -89,7 +89,7 @@ void Profile::RegisterProfilePrefs(user_
registry->RegisterStringPref(prefs::kSessionExitType, std::string());
registry->RegisterBooleanPref(
prefs::kSafeBrowsingEnabled,
- true,
+ false,
user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
registry->RegisterBooleanPref(
prefs::kSafeBrowsingExtendedReportingEnabled,
@@ -104,7 +104,7 @@
registry->RegisterBooleanPref(prefs::kSafeBrowsingExtendedReportingEnabled,
false);
@@ -105,7 +105,7 @@ void Profile::RegisterProfilePrefs(user_
// This pref is intentionally outside the above #if. That flag corresponds
// to the Notifier extension and does not gate the launcher page.
// TODO(skare): Remove or rename ENABLE_GOOGLE_NOW: http://crbug.com/459827.
@ -231,7 +223,7 @@
--- ./chrome/service/cloud_print/connector_settings.cc
+++ ./chrome/service/cloud_print/connector_settings.cc.new
@@ -58,7 +58,7 @@
@@ -60,7 +60,7 @@ void ConnectorSettings::InitFrom(Service
DCHECK(server_url_.is_valid());
connect_new_printers_ = prefs->GetBoolean(
@ -245,7 +237,7 @@
--- ./chrome/browser/ui/webui/local_discovery/local_discovery_ui.cc
+++ ./chrome/browser/ui/webui/local_discovery/local_discovery_ui.cc.new
@@ -140,10 +140,6 @@ void LocalDiscoveryUI::RegisterProfilePrefs(
@@ -142,10 +142,6 @@ void LocalDiscoveryUI::RegisterProfilePr
user_prefs::PrefRegistrySyncable* registry) {
registry->RegisterBooleanPref(
prefs::kLocalDiscoveryNotificationsEnabled,