diff --git a/DEPS b/DEPS index 429068e9..8e3b345 100644 --- a/DEPS +++ b/DEPS
@@ -59,7 +59,7 @@ # Three lines of non-changing comments so that # the commit queue can handle CLs rolling Skia # and whatever else without interference from each other. - 'skia_revision': 'f0a30d71ad242b350d12d8c2d93cc825199ee0f8', + 'skia_revision': '9d8850b93c1b5162afd3c01c22ebbd4c7c9d2e47', # Three lines of non-changing comments so that # the commit queue can handle CLs rolling V8 # and whatever else without interference from each other. @@ -83,7 +83,7 @@ # Three lines of non-changing comments so that # the commit queue can handle CLs rolling PDFium # and whatever else without interference from each other. - 'pdfium_revision': '14fe518ae67eac22cc169517e69092f62a195913', + 'pdfium_revision': '68bc6ad5a70fdb35ae5c088bd3ca977e15ea9573', # Three lines of non-changing comments so that # the commit queue can handle CLs rolling openmax_dl # and whatever else without interference from each other.
diff --git a/cc/resources/display_resource_provider.cc b/cc/resources/display_resource_provider.cc index ca32459..d265b8a 100644 --- a/cc/resources/display_resource_provider.cc +++ b/cc/resources/display_resource_provider.cc
@@ -35,6 +35,7 @@ DisplayResourceProvider::~DisplayResourceProvider() { while (!children_.empty()) DestroyChildInternal(children_.begin(), FOR_SHUTDOWN); + resource_sk_image_.clear(); } #if defined(OS_ANDROID) @@ -486,11 +487,13 @@ resource_provider->compositor_context_provider_->GrContext(), backend_texture, kTopLeft_GrSurfaceOrigin, kPremul_SkAlphaType, nullptr); + resource_provider_->resource_sk_image_[resource_id] = sk_image_; } else if (resource->pixels) { SkBitmap sk_bitmap; resource_provider->PopulateSkBitmapWithResource(&sk_bitmap, resource); sk_bitmap.setImmutable(); sk_image_ = SkImage::MakeFromBitmap(sk_bitmap); + resource_provider_->resource_sk_image_[resource_id] = sk_image_; } else { // During render process shutdown, ~RenderMessageFilter which calls // ~HostSharedBitmapClient (which deletes shared bitmaps from child)
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/payments/AutofillPaymentApp.java b/chrome/android/java/src/org/chromium/chrome/browser/payments/AutofillPaymentApp.java index 9d2ffc6..66fb992 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/payments/AutofillPaymentApp.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/payments/AutofillPaymentApp.java
@@ -13,13 +13,10 @@ import org.chromium.chrome.browser.autofill.PersonalDataManager.AutofillProfile; import org.chromium.chrome.browser.autofill.PersonalDataManager.CreditCard; import org.chromium.content_public.browser.WebContents; -import org.chromium.payments.mojom.BasicCardNetwork; -import org.chromium.payments.mojom.BasicCardType; import org.chromium.payments.mojom.PaymentDetailsModifier; import org.chromium.payments.mojom.PaymentMethodData; import java.util.ArrayList; -import java.util.HashMap; import java.util.HashSet; import java.util.List; import java.util.Map; @@ -29,12 +26,6 @@ * Provides access to locally stored user credit cards. */ public class AutofillPaymentApp implements PaymentApp { - /** The method name for any type of credit card. */ - public static final String BASIC_CARD_METHOD_NAME = "basic-card"; - - /** The total number of all possible card types (i.e., credit, debit, prepaid, unknown). */ - private static final int TOTAL_NUMBER_OF_CARD_TYPES = 4; - private final WebContents mWebContents; private Set<Integer> mBasicCardTypes; @@ -55,9 +46,16 @@ List<CreditCard> cards = pdm.getCreditCardsToSuggest(); final List<PaymentInstrument> instruments = new ArrayList<>(cards.size()); - Set<String> basicCardSupportedNetworks = - convertBasicCardToNetworks(methodDataMap.get(BASIC_CARD_METHOD_NAME)); - mBasicCardTypes = convertBasicCardToTypes(methodDataMap.get(BASIC_CARD_METHOD_NAME)); + Set<String> basicCardSupportedNetworks = null; + if (methodDataMap.containsKey(BasicCardUtils.BASIC_CARD_METHOD_NAME)) { + basicCardSupportedNetworks = BasicCardUtils.convertBasicCardToNetworks( + methodDataMap.get(BasicCardUtils.BASIC_CARD_METHOD_NAME)); + mBasicCardTypes = BasicCardUtils.convertBasicCardToTypes( + methodDataMap.get(BasicCardUtils.BASIC_CARD_METHOD_NAME)); + } else { + mBasicCardTypes = new HashSet<>(BasicCardUtils.getCardTypes().values()); + mBasicCardTypes.add(CardType.UNKNOWN); + } for (int i = 0; i < cards.size(); i++) { CreditCard card = cards.get(i); @@ -77,7 +75,7 @@ String methodName = null; if (basicCardSupportedNetworks != null && basicCardSupportedNetworks.contains(card.getBasicCardIssuerNetwork())) { - methodName = BASIC_CARD_METHOD_NAME; + methodName = BasicCardUtils.BASIC_CARD_METHOD_NAME; } else if (methodDataMap.containsKey(card.getBasicCardIssuerNetwork())) { methodName = card.getBasicCardIssuerNetwork(); } @@ -90,7 +88,7 @@ // of card. Cards that don't match the card type exactly cannot be pre-selected in // the UI. boolean matchesMerchantCardTypeExactly = card.getCardType() != CardType.UNKNOWN - || mBasicCardTypes.size() == TOTAL_NUMBER_OF_CARD_TYPES; + || mBasicCardTypes.size() == BasicCardUtils.TOTAL_NUMBER_OF_CARD_TYPES; instruments.add(new AutofillPaymentInstrument(mWebContents, card, billingAddress, methodName, matchesMerchantCardTypeExactly)); @@ -100,79 +98,10 @@ new Handler().post(() -> callback.onInstrumentsReady(AutofillPaymentApp.this, instruments)); } - /** @return A set of card networks (e.g., "visa", "amex") accepted by "basic-card" method. */ - public static Set<String> convertBasicCardToNetworks(PaymentMethodData data) { - // Merchant website does not support any issuer networks. - if (data == null) return null; - - // Merchant website supports all issuer networks. - Map<Integer, String> networks = getNetworks(); - if (data.supportedNetworks == null || data.supportedNetworks.length == 0) { - return new HashSet<>(networks.values()); - } - - // Merchant website supports some issuer networks. - Set<String> result = new HashSet<>(); - for (int i = 0; i < data.supportedNetworks.length; i++) { - String network = networks.get(data.supportedNetworks[i]); - if (network != null) result.add(network); - } - return result; - } - - /** - * @return A set of card types (e.g., CardType.DEBIT, CardType.PREPAID) - * accepted by "basic-card" method. - */ - public static Set<Integer> convertBasicCardToTypes(PaymentMethodData data) { - Set<Integer> result = new HashSet<>(); - result.add(CardType.UNKNOWN); - - Map<Integer, Integer> cardTypes = getCardTypes(); - if (!isBasicCardTypeSpecified(data)) { - // Merchant website supports all card types. - result.addAll(cardTypes.values()); - } else { - // Merchant website supports some card types. - for (int i = 0; i < data.supportedTypes.length; i++) { - Integer cardType = cardTypes.get(data.supportedTypes[i]); - if (cardType != null) result.add(cardType); - } - } - - return result; - } - - /** @return True if supported card type is specified in data for "basic-card" method. */ - public static boolean isBasicCardTypeSpecified(PaymentMethodData data) { - return data != null && data.supportedTypes != null && data.supportedTypes.length != 0; - } - - private static Map<Integer, String> getNetworks() { - Map<Integer, String> networks = new HashMap<>(); - networks.put(BasicCardNetwork.AMEX, "amex"); - networks.put(BasicCardNetwork.DINERS, "diners"); - networks.put(BasicCardNetwork.DISCOVER, "discover"); - networks.put(BasicCardNetwork.JCB, "jcb"); - networks.put(BasicCardNetwork.MASTERCARD, "mastercard"); - networks.put(BasicCardNetwork.MIR, "mir"); - networks.put(BasicCardNetwork.UNIONPAY, "unionpay"); - networks.put(BasicCardNetwork.VISA, "visa"); - return networks; - } - - private static Map<Integer, Integer> getCardTypes() { - Map<Integer, Integer> cardTypes = new HashMap<>(); - cardTypes.put(BasicCardType.CREDIT, CardType.CREDIT); - cardTypes.put(BasicCardType.DEBIT, CardType.DEBIT); - cardTypes.put(BasicCardType.PREPAID, CardType.PREPAID); - return cardTypes; - } - @Override public Set<String> getAppMethodNames() { - Set<String> methods = new HashSet<>(getNetworks().values()); - methods.add(BASIC_CARD_METHOD_NAME); + Set<String> methods = new HashSet<>(BasicCardUtils.getNetworks().values()); + methods.add(BasicCardUtils.BASIC_CARD_METHOD_NAME); return methods; } @@ -185,14 +114,15 @@ public static boolean merchantSupportsAutofillPaymentInstruments( Map<String, PaymentMethodData> methodDataMap) { assert methodDataMap != null; - PaymentMethodData basicCardData = methodDataMap.get(BASIC_CARD_METHOD_NAME); + PaymentMethodData basicCardData = methodDataMap.get(BasicCardUtils.BASIC_CARD_METHOD_NAME); if (basicCardData != null) { - Set<String> basicCardNetworks = convertBasicCardToNetworks(basicCardData); + Set<String> basicCardNetworks = + BasicCardUtils.convertBasicCardToNetworks(basicCardData); if (basicCardNetworks != null && !basicCardNetworks.isEmpty()) return true; } Set<String> methodNames = new HashSet<>(methodDataMap.keySet()); - methodNames.retainAll(getNetworks().values()); + methodNames.retainAll(BasicCardUtils.getNetworks().values()); return !methodNames.isEmpty(); } @@ -206,7 +136,8 @@ // If the merchant has restricted the accepted card types (credit, debit, prepaid), then the // list of payment instruments should include a message describing the accepted card types, // e.g., "Debit cards are accepted" or "Debit and prepaid cards are accepted." - if (mBasicCardTypes == null || mBasicCardTypes.size() == TOTAL_NUMBER_OF_CARD_TYPES) { + if (mBasicCardTypes == null + || mBasicCardTypes.size() == BasicCardUtils.TOTAL_NUMBER_OF_CARD_TYPES) { return 0; }
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/payments/AutofillPaymentInstrument.java b/chrome/android/java/src/org/chromium/chrome/browser/payments/AutofillPaymentInstrument.java index 94465d53..03389b71 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/payments/AutofillPaymentInstrument.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/payments/AutofillPaymentInstrument.java
@@ -11,6 +11,7 @@ import org.chromium.chrome.R; import org.chromium.chrome.browser.ChromeActivity; +import org.chromium.chrome.browser.autofill.CardType; import org.chromium.chrome.browser.autofill.PersonalDataManager; import org.chromium.chrome.browser.autofill.PersonalDataManager.AutofillProfile; import org.chromium.chrome.browser.autofill.PersonalDataManager.CreditCard; @@ -104,6 +105,28 @@ } @Override + public boolean isValidForPaymentMethodData(String method, PaymentMethodData data) { + boolean isSupportedMethod = super.isValidForPaymentMethodData(method, data); + if (!isSupportedMethod) return false; + + int cardType = getCard().getCardType(); + String cardIssuerNetwork = getCard().getBasicCardIssuerNetwork(); + if (BasicCardUtils.isBasicCardTypeSpecified(data)) { + Set<Integer> targetCardTypes = BasicCardUtils.convertBasicCardToTypes(data); + targetCardTypes.remove(CardType.UNKNOWN); + assert targetCardTypes.size() > 0; + if (!targetCardTypes.contains(cardType)) return false; + } + + if (BasicCardUtils.isBasicCardNetworkSpecified(data)) { + Set<String> targetCardNetworks = BasicCardUtils.convertBasicCardToNetworks(data); + assert targetCardNetworks.size() > 0; + if (!targetCardNetworks.contains(cardIssuerNetwork)) return false; + } + return true; + } + + @Override @Nullable public String getCountryCode() { return AutofillAddress.getCountryCode(mBillingAddress);
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/payments/BasicCardUtils.java b/chrome/android/java/src/org/chromium/chrome/browser/payments/BasicCardUtils.java new file mode 100644 index 0000000..73d33889 --- /dev/null +++ b/chrome/android/java/src/org/chromium/chrome/browser/payments/BasicCardUtils.java
@@ -0,0 +1,118 @@ +// Copyright 2017 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +package org.chromium.chrome.browser.payments; + +import org.chromium.chrome.browser.autofill.CardType; +import org.chromium.payments.mojom.BasicCardNetwork; +import org.chromium.payments.mojom.BasicCardType; +import org.chromium.payments.mojom.PaymentMethodData; + +import java.util.HashMap; +import java.util.HashSet; +import java.util.Map; +import java.util.Set; + +/** Basic-card utils */ +public class BasicCardUtils { + /** The 'basic-card' method name. */ + public static final String BASIC_CARD_METHOD_NAME = "basic-card"; + + /** The total number of all possible card types (i.e., credit, debit, prepaid, unknown). */ + public static final int TOTAL_NUMBER_OF_CARD_TYPES = 4; + + /** + * @return A set of card networks (e.g., "visa", "amex") accepted by the "basic-card" payment + * method data. + */ + public static Set<String> convertBasicCardToNetworks(PaymentMethodData data) { + assert data != null; + + Map<Integer, String> networks = getNetworks(); + if (!isBasicCardNetworkSpecified(data)) { + // Not specified indicates support of all issuer networks. + return new HashSet<>(networks.values()); + } + + // Supports some issuer networks. + Set<String> result = new HashSet<>(); + for (int i = 0; i < data.supportedNetworks.length; i++) { + String network = networks.get(data.supportedNetworks[i]); + if (network != null) result.add(network); + } + return result; + } + + /** + * @return A set of card types (e.g., CardType.DEBIT, CardType.PREPAID) + * accepted by the "basic-card" payment method data. + */ + public static Set<Integer> convertBasicCardToTypes(PaymentMethodData data) { + assert data != null; + + Set<Integer> result = new HashSet<>(); + result.add(CardType.UNKNOWN); + + Map<Integer, Integer> cardTypes = getCardTypes(); + if (!isBasicCardTypeSpecified(data)) { + // Not specified indicates support of all card types. + result.addAll(cardTypes.values()); + } else { + // Supports some card types. + for (int i = 0; i < data.supportedTypes.length; i++) { + Integer cardType = cardTypes.get(data.supportedTypes[i]); + if (cardType != null) result.add(cardType); + } + } + + return result; + } + + /** + * @return True if supported card type is specified for the "basic-card" payment method data. + */ + public static boolean isBasicCardTypeSpecified(PaymentMethodData data) { + assert data != null; + + return data.supportedTypes != null && data.supportedTypes.length != 0; + } + + /** + * @return True if supported card network is specified for "basic-card" payment method data. + */ + public static boolean isBasicCardNetworkSpecified(PaymentMethodData data) { + assert data != null; + + return data.supportedNetworks != null && data.supportedNetworks.length != 0; + } + + /** + * @return a complete map of BasicCardNetworks to strings. + */ + public static Map<Integer, String> getNetworks() { + Map<Integer, String> networks = new HashMap<>(); + networks.put(BasicCardNetwork.AMEX, "amex"); + networks.put(BasicCardNetwork.DINERS, "diners"); + networks.put(BasicCardNetwork.DISCOVER, "discover"); + networks.put(BasicCardNetwork.JCB, "jcb"); + networks.put(BasicCardNetwork.MASTERCARD, "mastercard"); + networks.put(BasicCardNetwork.MIR, "mir"); + networks.put(BasicCardNetwork.UNIONPAY, "unionpay"); + networks.put(BasicCardNetwork.VISA, "visa"); + return networks; + } + + /** + * @return a complete map of BasicCardType to CardType. + */ + public static Map<Integer, Integer> getCardTypes() { + Map<Integer, Integer> cardTypes = new HashMap<>(); + cardTypes.put(BasicCardType.CREDIT, CardType.CREDIT); + cardTypes.put(BasicCardType.DEBIT, CardType.DEBIT); + cardTypes.put(BasicCardType.PREPAID, CardType.PREPAID); + return cardTypes; + } + + private BasicCardUtils() {} +} \ No newline at end of file
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/payments/CardEditor.java b/chrome/android/java/src/org/chromium/chrome/browser/payments/CardEditor.java index b22c5d8..3bd44e2 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/payments/CardEditor.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/payments/CardEditor.java
@@ -305,16 +305,13 @@ String method = data.supportedMethods[i]; if (mCardIssuerNetworks.containsKey(method)) { addAcceptedNetwork(method); - } else if (AutofillPaymentApp.BASIC_CARD_METHOD_NAME.equals(method)) { - Set<String> basicCardNetworks = AutofillPaymentApp.convertBasicCardToNetworks(data); - if (basicCardNetworks != null) { - mAcceptedBasicCardIssuerNetworks.addAll(basicCardNetworks); - for (String network : basicCardNetworks) { - addAcceptedNetwork(network); - } + } else if (BasicCardUtils.BASIC_CARD_METHOD_NAME.equals(method)) { + Set<String> basicCardNetworks = BasicCardUtils.convertBasicCardToNetworks(data); + mAcceptedBasicCardIssuerNetworks.addAll(basicCardNetworks); + for (String network : basicCardNetworks) { + addAcceptedNetwork(network); } - - mAcceptedBasicCardTypes.addAll(AutofillPaymentApp.convertBasicCardToTypes(data)); + mAcceptedBasicCardTypes.addAll(BasicCardUtils.convertBasicCardToTypes(data)); } } } @@ -403,7 +400,7 @@ String methodName = card.getBasicCardIssuerNetwork(); if (mAcceptedBasicCardIssuerNetworks.contains(methodName)) { - methodName = AutofillPaymentApp.BASIC_CARD_METHOD_NAME; + methodName = BasicCardUtils.BASIC_CARD_METHOD_NAME; } assert methodName != null;
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/payments/PaymentInstrument.java b/chrome/android/java/src/org/chromium/chrome/browser/payments/PaymentInstrument.java index 40253f3a..84d3c0b 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/payments/PaymentInstrument.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/payments/PaymentInstrument.java
@@ -86,7 +86,7 @@ /** * @return Whether this is an autofill instrument. All autofill instruments are sorted below all - * non-autofill instruments. + * non-autofill instruments. */ public boolean isAutofillInstrument() { return false; @@ -108,13 +108,22 @@ /** * @return Whether the instrument is exactly matching all filters provided by the merchant. For - * example, this can return false for unknown card types, if the merchant requested only debit - * cards. + * example, this can return false for unknown card types, if the merchant requested only + * debit cards. */ public boolean isExactlyMatchingMerchantRequest() { return true; } + /** + * @return Whether the instrument supports the payment method with the method data. For example, + * supported card types and networks in the data should be verified for 'basic-card' + * payment method. + */ + public boolean isValidForPaymentMethodData(String method, PaymentMethodData data) { + return getInstrumentMethodNames().contains(method); + } + /** @return The country code (or null if none) associated with this payment instrument. */ @Nullable public String getCountryCode() { @@ -123,7 +132,7 @@ /** * @return Whether presence of this payment instrument should cause the - * PaymentRequest.canMakePayment() to return true. + * PaymentRequest.canMakePayment() to return true. */ public boolean canMakePayment() { return true;
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/payments/PaymentRequestImpl.java b/chrome/android/java/src/org/chromium/chrome/browser/payments/PaymentRequestImpl.java index d86ba347..114d355 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/payments/PaymentRequestImpl.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/payments/PaymentRequestImpl.java
@@ -18,7 +18,6 @@ import org.chromium.chrome.browser.ChromeActivity; import org.chromium.chrome.browser.ChromeFeatureList; import org.chromium.chrome.browser.UrlConstants; -import org.chromium.chrome.browser.autofill.CardType; import org.chromium.chrome.browser.autofill.PersonalDataManager; import org.chromium.chrome.browser.autofill.PersonalDataManager.AutofillProfile; import org.chromium.chrome.browser.autofill.PersonalDataManager.NormalizedAddressRequestDelegate; @@ -951,33 +950,11 @@ methodNames.retainAll(mModifiers.keySet()); if (methodNames.isEmpty()) return null; - // Non-AutofillPaymentInstrument has no extra data to check. - if (!instrument.isAutofillInstrument()) { - return mModifiers.get(methodNames.iterator().next()); - } - - // Checks extra data to match card type and issuer network. - int cardType = ((AutofillPaymentInstrument) instrument).getCard().getCardType(); - String cardIssuerNetwork = - ((AutofillPaymentInstrument) instrument).getCard().getBasicCardIssuerNetwork(); for (String methodName : methodNames) { PaymentDetailsModifier modifier = mModifiers.get(methodName); - - if (AutofillPaymentApp.isBasicCardTypeSpecified(modifier.methodData)) { - Set<Integer> targetCardTypes = - AutofillPaymentApp.convertBasicCardToTypes(modifier.methodData); - targetCardTypes.remove(CardType.UNKNOWN); - assert targetCardTypes.size() > 0; - if (!targetCardTypes.contains(cardType)) continue; + if (instrument.isValidForPaymentMethodData(methodName, modifier.methodData)) { + return modifier; } - - Set<String> targetCardNetworks = - AutofillPaymentApp.convertBasicCardToNetworks(modifier.methodData); - if (targetCardNetworks != null && !targetCardNetworks.contains(cardIssuerNetwork)) { - continue; - } - - return modifier; } return null;
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/payments/ServiceWorkerPaymentApp.java b/chrome/android/java/src/org/chromium/chrome/browser/payments/ServiceWorkerPaymentApp.java index 9687132..e8caf79 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/payments/ServiceWorkerPaymentApp.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/payments/ServiceWorkerPaymentApp.java
@@ -34,8 +34,6 @@ * @see https://w3c.github.io/webpayments-payment-handler/ */ public class ServiceWorkerPaymentApp extends PaymentInstrument implements PaymentApp { - private final static String BASIC_CARD_PAYMENT_METHOD = "basic-card"; - private final WebContents mWebContents; private final long mRegistrationId; private final Drawable mIcon; @@ -142,7 +140,8 @@ String iframeOrigin, byte[][] unusedCertificateChain, Map<String, PaymentDetailsModifier> modifiers, final InstrumentsCallback callback) { if (isOnlySupportBasiccard(methodDataMap) - && !matchBasiccardCapabilities(methodDataMap.get(BASIC_CARD_PAYMENT_METHOD))) { + && !matchBasiccardCapabilities( + methodDataMap.get(BasicCardUtils.BASIC_CARD_METHOD_NAME))) { // Do not list this app if 'basic-card' is the only supported payment method with // unmatched capabilities. new Handler().post(() -> { @@ -177,7 +176,8 @@ private boolean isOnlySupportBasiccard(Map<String, PaymentMethodData> methodDataMap) { Set<String> requestMethods = new HashSet<>(methodDataMap.keySet()); requestMethods.retainAll(mMethodNames); - return requestMethods.size() == 1 && requestMethods.contains(BASIC_CARD_PAYMENT_METHOD); + return requestMethods.size() == 1 + && requestMethods.contains(BasicCardUtils.BASIC_CARD_METHOD_NAME); } // Matches |requestMethodData|.supportedTypes and |requestMethodData|.supportedNetwokrs for @@ -266,6 +266,15 @@ } @Override + public boolean isValidForPaymentMethodData(String method, PaymentMethodData data) { + boolean isSupportedMethod = super.isValidForPaymentMethodData(method, data); + if (isSupportedMethod && BasicCardUtils.BASIC_CARD_METHOD_NAME.equals(method)) { + return matchBasiccardCapabilities(data); + } + return isSupportedMethod; + } + + @Override public void invokePaymentApp(String id, String merchantName, String origin, String iframeOrigin, byte[][] unusedCertificateChain, Map<String, PaymentMethodData> methodData, PaymentItem total, List<PaymentItem> displayItems,
diff --git a/chrome/android/java_sources.gni b/chrome/android/java_sources.gni index 3a9f6d2..9c021ea1 100644 --- a/chrome/android/java_sources.gni +++ b/chrome/android/java_sources.gni
@@ -796,6 +796,7 @@ "java/src/org/chromium/chrome/browser/payments/AutofillContact.java", "java/src/org/chromium/chrome/browser/payments/AutofillPaymentApp.java", "java/src/org/chromium/chrome/browser/payments/AutofillPaymentInstrument.java", + "java/src/org/chromium/chrome/browser/payments/BasicCardUtils.java", "java/src/org/chromium/chrome/browser/payments/CardEditor.java", "java/src/org/chromium/chrome/browser/payments/ContactEditor.java", "java/src/org/chromium/chrome/browser/payments/EditorBase.java",
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/payments/PaymentRequestPaymentAppAndBasicCardWithModifiersTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/payments/PaymentRequestPaymentAppAndBasicCardWithModifiersTest.java index 2634375c..41bd227 100644 --- a/chrome/android/javatests/src/org/chromium/chrome/browser/payments/PaymentRequestPaymentAppAndBasicCardWithModifiersTest.java +++ b/chrome/android/javatests/src/org/chromium/chrome/browser/payments/PaymentRequestPaymentAppAndBasicCardWithModifiersTest.java
@@ -14,6 +14,7 @@ import static org.chromium.chrome.browser.payments.PaymentRequestTestRule.HAVE_INSTRUMENTS; import static org.chromium.chrome.browser.payments.PaymentRequestTestRule.IMMEDIATE_RESPONSE; +import android.graphics.drawable.ColorDrawable; import android.support.test.filters.MediumTest; import org.junit.Before; @@ -31,6 +32,8 @@ import org.chromium.chrome.browser.autofill.PersonalDataManager.CreditCard; import org.chromium.chrome.test.ChromeActivityTestRule; import org.chromium.chrome.test.ChromeJUnit4ClassRunner; +import org.chromium.payments.mojom.BasicCardNetwork; +import org.chromium.payments.mojom.BasicCardType; import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeoutException; @@ -299,4 +302,64 @@ mPaymentRequestTestRule.expectResultContains( new String[] {"https://bobpay.com", "\"transaction\"", "1337"}); } + + /** + * Verify modifier for credit visa card is only applied for service worker payment app with + * credit visa card capabilities. + */ + @Test + @MediumTest + @Feature({"Payments"}) + public void testUpdateTotalWithCreditVisaModifiersForServiceWorkerPaymentApp() + throws InterruptedException, ExecutionException, TimeoutException { + String[] bobpayMethodNames = {"https://bobpay.com", "basic-card"}; + int[] bobpayNetworks = {BasicCardNetwork.VISA}; + int[] bobPayTypes = {BasicCardType.CREDIT}; + ServiceWorkerPaymentApp.Capabilities[] bobpayCapabilities = { + new ServiceWorkerPaymentApp.Capabilities(bobpayNetworks, bobPayTypes)}; + + String[] alicepayMethodNames = {"https://alicepay.com", "basic-card"}; + int[] alicepayNetworks = {BasicCardNetwork.MASTERCARD}; + int[] alicepayTypes = {BasicCardType.CREDIT}; + ServiceWorkerPaymentApp.Capabilities[] alicepayCapabilities = { + new ServiceWorkerPaymentApp.Capabilities(alicepayNetworks, alicepayTypes)}; + + PaymentAppFactory.getInstance().addAdditionalFactory((webContents, methodNames, + callback) -> { + ServiceWorkerPaymentAppBridge.setCanMakePaymentForTesting(true); + callback.onPaymentAppCreated(new ServiceWorkerPaymentApp(webContents, + 0 /* registrationId */, + UriUtils.parseUriFromString("https://bobpay.com") /* scope */, + "BobPay" /* label */, "https://bobpay.com" /* sublabel*/, + "https://bobpay.com" /* tertiarylabel */, new ColorDrawable() /* icon */, + bobpayMethodNames /* methodNames */, bobpayCapabilities /* capabilities */, + new String[0] /* preferredRelatedApplicationIds */)); + callback.onPaymentAppCreated(new ServiceWorkerPaymentApp(webContents, + 0 /* registrationId */, + UriUtils.parseUriFromString("https://alicepay.com") /* scope */, + "AlicePay" /* label */, "https://bobpay.com" /* sublabel*/, + "https://alicepay.com" /* tertiarylabel */, new ColorDrawable() /* icon */, + alicepayMethodNames /* methodNames */, alicepayCapabilities /* capabilities */, + new String[0] /* preferredRelatedApplicationIds */)); + callback.onAllPaymentAppsCreated(); + }); + mPaymentRequestTestRule.triggerUIAndWait( + "visa_supported_network", mPaymentRequestTestRule.getReadyToPay()); + + if (mPaymentRequestTestRule.getSelectedPaymentInstrumentLabel().startsWith("BobPay")) { + assertEquals("USD $4.00", mPaymentRequestTestRule.getOrderSummaryTotal()); + + // select the alice pay and verify modifier is not applied. + mPaymentRequestTestRule.clickOnPaymentMethodSuggestionOptionAndWait( + 1, mPaymentRequestTestRule.getReadyForInput()); + assertEquals("USD $5.00", mPaymentRequestTestRule.getOrderSummaryTotal()); + } else { + assertEquals("USD $5.00", mPaymentRequestTestRule.getOrderSummaryTotal()); + + // select the bob pay and verify modifier is applied. + mPaymentRequestTestRule.clickOnPaymentMethodSuggestionOptionAndWait( + 1, mPaymentRequestTestRule.getReadyForInput()); + assertEquals("USD $4.00", mPaymentRequestTestRule.getOrderSummaryTotal()); + } + } }
diff --git a/chrome/browser/chromeos/arc/intent_helper/arc_external_protocol_dialog.cc b/chrome/browser/chromeos/arc/intent_helper/arc_external_protocol_dialog.cc index 784385e..b051a381 100644 --- a/chrome/browser/chromeos/arc/intent_helper/arc_external_protocol_dialog.cc +++ b/chrome/browser/chromeos/arc/intent_helper/arc_external_protocol_dialog.cc
@@ -55,6 +55,16 @@ web_contents->Close(); } +// Tells whether or not Chrome is an app candidate for the current navigation. +bool IsChromeAnAppCandidate( + const std::vector<mojom::IntentHandlerInfoPtr>& handlers) { + for (const auto& handle : handlers) { + if (ArcIntentHelperBridge::IsIntentHelperPackage(handle->package_name)) + return true; + } + return false; +} + // Shows |url| in the current tab. void OpenUrlInChrome(int render_process_host_id, int routing_id, @@ -352,6 +362,7 @@ WebContents* web_contents = tab_util::GetWebContentsByID(render_process_host_id, routing_id); show_bubble_cb.Run(nullptr /* anchor_view */, web_contents, app_info, + !IsChromeAnAppCandidate(handlers), base::Bind(OnIntentPickerClosed, render_process_host_id, routing_id, url, base::Passed(&handlers))); }
diff --git a/chrome/browser/component_updater/sw_reporter_installer_win.cc b/chrome/browser/component_updater/sw_reporter_installer_win.cc index af786ea7..d6ae5be0 100644 --- a/chrome/browser/component_updater/sw_reporter_installer_win.cc +++ b/chrome/browser/component_updater/sw_reporter_installer_win.cc
@@ -486,7 +486,6 @@ void RegisterPrefsForSwReporter(PrefRegistrySimple* registry) { registry->RegisterInt64Pref(prefs::kSwReporterLastTimeTriggered, 0); registry->RegisterIntegerPref(prefs::kSwReporterLastExitCode, -1); - registry->RegisterBooleanPref(prefs::kSwReporterPendingPrompt, false); registry->RegisterInt64Pref(prefs::kSwReporterLastTimeSentReport, 0); }
diff --git a/chrome/browser/safe_browsing/BUILD.gn b/chrome/browser/safe_browsing/BUILD.gn index 5af800b..2daaaa7 100644 --- a/chrome/browser/safe_browsing/BUILD.gn +++ b/chrome/browser/safe_browsing/BUILD.gn
@@ -37,8 +37,6 @@ "chrome_cleaner/srt_client_info_win.h", "chrome_cleaner/srt_field_trial_win.cc", "chrome_cleaner/srt_field_trial_win.h", - "chrome_cleaner/srt_global_error_win.cc", - "chrome_cleaner/srt_global_error_win.h", "safe_browsing_tab_observer.cc", "safe_browsing_tab_observer.h", "url_checker_delegate_impl.cc",
diff --git a/chrome/browser/safe_browsing/chrome_cleaner/chrome_cleaner_controller_impl_win_unittest.cc b/chrome/browser/safe_browsing/chrome_cleaner/chrome_cleaner_controller_impl_win_unittest.cc index 5cdb6b2..dc238d28 100644 --- a/chrome/browser/safe_browsing/chrome_cleaner/chrome_cleaner_controller_impl_win_unittest.cc +++ b/chrome/browser/safe_browsing/chrome_cleaner/chrome_cleaner_controller_impl_win_unittest.cc
@@ -14,7 +14,6 @@ #include "base/run_loop.h" #include "base/task_scheduler/post_task.h" #include "base/test/multiprocess_test.h" -#include "base/test/scoped_feature_list.h" #include "base/threading/thread_task_runner_handle.h" #include "chrome/browser/metrics/chrome_metrics_service_accessor.h" #include "chrome/browser/profiles/profile.h" @@ -110,7 +109,6 @@ SetChromeCleanerRunnerTestDelegateForTesting(this); ChromeCleanerControllerImpl::ResetInstanceForTesting(); ChromeCleanerControllerImpl::GetInstance()->SetDelegateForTesting(this); - scoped_feature_list_.InitAndEnableFeature(kInBrowserCleanerUIFeature); } void TearDown() override { @@ -162,7 +160,6 @@ // bundle should be the first member of the class so that it will be destroyed // last. content::TestBrowserThreadBundle thread_bundle_; - base::test::ScopedFeatureList scoped_feature_list_; bool metrics_enabled_; base::CommandLine command_line_; @@ -256,7 +253,6 @@ controller_ = ChromeCleanerControllerImpl::GetInstance(); ASSERT_TRUE(controller_); - scoped_feature_list_.InitAndEnableFeature(kInBrowserCleanerUIFeature); SetChromeCleanerRunnerTestDelegateForTesting(this); controller_->SetDelegateForTesting(this); } @@ -420,7 +416,6 @@ // bundle should be the first member of the class so that it will be destroyed // last. content::TestBrowserThreadBundle thread_bundle_; - base::test::ScopedFeatureList scoped_feature_list_; CleanerProcessStatus process_status_; MockChromeCleanerProcess::CrashPoint crash_point_;
diff --git a/chrome/browser/safe_browsing/chrome_cleaner/chrome_cleaner_runner_win.cc b/chrome/browser/safe_browsing/chrome_cleaner/chrome_cleaner_runner_win.cc index 16350b3..86d1da4 100644 --- a/chrome/browser/safe_browsing/chrome_cleaner/chrome_cleaner_runner_win.cc +++ b/chrome/browser/safe_browsing/chrome_cleaner/chrome_cleaner_runner_win.cc
@@ -88,7 +88,6 @@ on_prompt_user_(std::move(on_prompt_user)), on_connection_closed_(std::move(on_connection_closed)), on_process_done_(std::move(on_process_done)) { - DCHECK(base::FeatureList::IsEnabled(kInBrowserCleanerUIFeature)); DCHECK(on_prompt_user_); DCHECK(on_connection_closed_); DCHECK(on_process_done_);
diff --git a/chrome/browser/safe_browsing/chrome_cleaner/chrome_cleaner_runner_win.h b/chrome/browser/safe_browsing/chrome_cleaner/chrome_cleaner_runner_win.h index 86985d1..7bdfe59a 100644 --- a/chrome/browser/safe_browsing/chrome_cleaner/chrome_cleaner_runner_win.h +++ b/chrome/browser/safe_browsing/chrome_cleaner/chrome_cleaner_runner_win.h
@@ -25,9 +25,8 @@ namespace safe_browsing { // Class responsible for launching the cleaner process and waiting for its -// completion when the InBrowserCleanerUI feature is enabled. This object is -// also responsible for starting the ChromePromptImpl object on the IO thread -// and controlling its lifetime. +// completion. This object is also responsible for starting the ChromePromptImpl +// object on the IO thread and controlling its lifetime. // // Expected lifecycle of a ChromeCleanerRunner: //
diff --git a/chrome/browser/safe_browsing/chrome_cleaner/chrome_cleaner_runner_win_unittest.cc b/chrome/browser/safe_browsing/chrome_cleaner/chrome_cleaner_runner_win_unittest.cc index c3427e97..6566e4ae 100644 --- a/chrome/browser/safe_browsing/chrome_cleaner/chrome_cleaner_runner_win_unittest.cc +++ b/chrome/browser/safe_browsing/chrome_cleaner/chrome_cleaner_runner_win_unittest.cc
@@ -15,7 +15,6 @@ #include "base/single_thread_task_runner.h" #include "base/strings/string_number_conversions.h" #include "base/test/multiprocess_test.h" -#include "base/test/scoped_feature_list.h" #include "base/threading/thread.h" #include "base/threading/thread_task_runner_handle.h" #include "chrome/browser/safe_browsing/chrome_cleaner/mock_chrome_cleaner_process_win.h" @@ -69,7 +68,6 @@ std::tie(metrics_status_, reporter_engine_) = GetParam(); SetChromeCleanerRunnerTestDelegateForTesting(this); - scoped_feature_list_.InitAndEnableFeature(kInBrowserCleanerUIFeature); } void CallRunChromeCleaner() { @@ -128,7 +126,6 @@ protected: content::TestBrowserThreadBundle test_browser_thread_bundle_; - base::test::ScopedFeatureList scoped_feature_list_; // Test fixture parameters. ChromeCleanerRunner::ChromeMetricsStatus metrics_status_; @@ -231,7 +228,6 @@ prompt_acceptance_to_send_ = prompt_acceptance_to_send; SetChromeCleanerRunnerTestDelegateForTesting(this); - scoped_feature_list_.InitAndEnableFeature(kInBrowserCleanerUIFeature); } void CallRunChromeCleaner() { @@ -303,7 +299,6 @@ protected: content::TestBrowserThreadBundle test_browser_thread_bundle_; - base::test::ScopedFeatureList scoped_feature_list_; base::RunLoop run_loop_;
diff --git a/chrome/browser/safe_browsing/chrome_cleaner/reporter_runner_browsertest_win.cc b/chrome/browser/safe_browsing/chrome_cleaner/reporter_runner_browsertest_win.cc index 6a95741..1b04009 100644 --- a/chrome/browser/safe_browsing/chrome_cleaner/reporter_runner_browsertest_win.cc +++ b/chrome/browser/safe_browsing/chrome_cleaner/reporter_runner_browsertest_win.cc
@@ -21,7 +21,6 @@ #include "base/message_loop/message_loop.h" #include "base/run_loop.h" #include "base/single_thread_task_runner.h" -#include "base/test/scoped_feature_list.h" #include "base/test/test_mock_time_task_runner.h" #include "base/threading/sequenced_task_runner_handle.h" #include "base/threading/thread_task_runner_handle.h" @@ -51,23 +50,14 @@ constexpr char kSRTPromptGroup[] = "SRTGroup"; // Parameters for this test: -// - bool in_browser_cleaner_ui_: indicates if InBrowserCleanerUI feature -// is enabled; -// -// We expect that the reporter's logic should remain unchanged even when the -// InBrowserCleanerUI feature is enabled with one exception: the reporter is -// not run daily because with the new feature enabled there is no concept of -// a pending prompt. See the RunDaily and InBrowserUINoRunDaily tests. // - const char* old_seed_: The old "Seed" Finch parameter saved in prefs. // - const char* incoming_seed_: The new "Seed" Finch parameter. class ReporterRunnerTest : public InProcessBrowserTest, public SwReporterTestingDelegate, public ::testing::WithParamInterface< - testing::tuple<bool, const char*, const char*>> { + testing::tuple<const char*, const char*>> { public: - ReporterRunnerTest() { - std::tie(in_browser_cleaner_ui_, old_seed_, incoming_seed_) = GetParam(); - } + ReporterRunnerTest() { std::tie(old_seed_, incoming_seed_) = GetParam(); } void SetUpCommandLine(base::CommandLine* command_line) override { variations::testing::VariationParamsManager::AppendVariationParams( @@ -77,11 +67,6 @@ void SetUpInProcessBrowserTestFixture() override { SetSwReporterTestingDelegate(this); - - if (in_browser_cleaner_ui_) - scoped_feature_list_.InitAndEnableFeature(kInBrowserCleanerUIFeature); - else - scoped_feature_list_.InitAndDisableFeature(kInBrowserCleanerUIFeature); } void SetUpOnMainThread() override { @@ -291,7 +276,6 @@ scoped_refptr<base::SingleThreadTaskRunner> saved_task_runner_; // Test parameters. - bool in_browser_cleaner_ui_; std::string old_seed_; std::string incoming_seed_; @@ -305,25 +289,10 @@ // all launch on the same mock clock tick. base::OnceClosure first_launch_callback_; - base::test::ScopedFeatureList scoped_feature_list_; - private: DISALLOW_COPY_AND_ASSIGN(ReporterRunnerTest); }; -class ReporterRunnerPromptTest : public DialogBrowserTest { - public: - void ShowDialog(const std::string& name) override { - if (name == "SRTErrorNoFile") - DisplaySRTPromptForTesting(base::FilePath()); - else if (name == "SRTErrorFile") - DisplaySRTPromptForTesting( - base::FilePath().Append(FILE_PATH_LITERAL("c:\temp\testfile.txt"))); - else - ADD_FAILURE() << "Unknown dialog type."; - } -}; - } // namespace IN_PROC_BROWSER_TEST_P(ReporterRunnerTest, NothingFound) { @@ -397,64 +366,6 @@ ExpectToRunAgain(kDaysBetweenSuccessfulSwReporterRuns); } -IN_PROC_BROWSER_TEST_P(ReporterRunnerTest, RunDaily) { - // When the kInBrowserCleanerUIFeature feature is enabled, the reporter should - // never run daily. Test that case separately. - if (in_browser_cleaner_ui_) - return; - - PrefService* local_state = g_browser_process->local_state(); - local_state->SetBoolean(prefs::kSwReporterPendingPrompt, true); - SetDaysSinceLastTriggered(kDaysBetweenSuccessfulSwReporterRuns - 1); - ASSERT_GT(kDaysBetweenSuccessfulSwReporterRuns - 1, - kDaysBetweenSwReporterRunsForPendingPrompt); - RunReporter(chrome_cleaner::kSwReporterNothingFound); - - // Expect the reporter to run immediately, since a prompt is pending and it - // has been more than kDaysBetweenSwReporterRunsForPendingPrompt days. - ExpectReporterLaunches(0, 1, false); - ExpectToRunAgain(kDaysBetweenSwReporterRunsForPendingPrompt); - - // Move the clock ahead kDaysBetweenSwReporterRunsForPendingPrompt days. The - // expected run should trigger, but not cause the reporter to launch because - // a prompt is no longer pending. - local_state->SetBoolean(prefs::kSwReporterPendingPrompt, false); - ExpectReporterLaunches(kDaysBetweenSwReporterRunsForPendingPrompt, 0, false); - - // Instead it should now run kDaysBetweenSuccessfulSwReporterRuns after the - // first prompt (of which kDaysBetweenSwReporterRunsForPendingPrompt has - // already passed.) - int days_left = kDaysBetweenSuccessfulSwReporterRuns - - kDaysBetweenSwReporterRunsForPendingPrompt; - ExpectToRunAgain(days_left); - ExpectReporterLaunches(days_left, 1, false); - ExpectToRunAgain(kDaysBetweenSuccessfulSwReporterRuns); -} - -IN_PROC_BROWSER_TEST_P(ReporterRunnerTest, InBrowserUINoRunDaily) { - // Ensure that the reporter always runs every - // kDaysBetweenSuccessfulSwReporterRuns days when kInBrowserCleanerUIFeature - // is enabled. The case when kInBrowserCleanerUIFeature is disabled is tested - // separately. - if (!in_browser_cleaner_ui_) - return; - - // Users can have the pending prompt set to true when migrating to the new UI, - // but it should be disregarded and the reporter should only be run every - // kDaysBetweenSuccessfulSwReporterRuns days. - PrefService* local_state = g_browser_process->local_state(); - local_state->SetBoolean(prefs::kSwReporterPendingPrompt, true); - SetDaysSinceLastTriggered(kDaysBetweenSuccessfulSwReporterRuns - 1); - ASSERT_GT(kDaysBetweenSuccessfulSwReporterRuns - 1, - kDaysBetweenSwReporterRunsForPendingPrompt); - RunReporter(chrome_cleaner::kSwReporterNothingFound); - - // Pending prompt is set, but we should not run the reporter since it hasn't - // been kDaysBetweenSuccessfulSwReporterRuns days since the last run. - ExpectReporterLaunches(0, 0, false); - ExpectToRunAgain(1); -} - IN_PROC_BROWSER_TEST_P(ReporterRunnerTest, ParameterChange) { // If the reporter is run several times with different parameters, it should // only be launched once, with the last parameter set. @@ -666,23 +577,10 @@ } INSTANTIATE_TEST_CASE_P( - WithInBrowserCleanerUIParam, + Default, ReporterRunnerTest, ::testing::Combine( - ::testing::Bool(), // in_browser_cleaner_ui_ ::testing::Values("", "Seed1"), // old_seed_ ::testing::Values("", "Seed1", "Seed2"))); // incoming_seed -// This provide tests which allows explicit invocation of the SRT Prompt -// useful for checking dialog layout or any other interactive functionality -// tests. See docs/testing/test_browser_dialog.md for description of the -// testing framework. -IN_PROC_BROWSER_TEST_F(ReporterRunnerPromptTest, InvokeDialog_SRTErrorNoFile) { - RunDialog(); -} - -IN_PROC_BROWSER_TEST_F(ReporterRunnerPromptTest, InvokeDialog_SRTErrorFile) { - RunDialog(); -} - } // namespace safe_browsing
diff --git a/chrome/browser/safe_browsing/chrome_cleaner/reporter_runner_win.cc b/chrome/browser/safe_browsing/chrome_cleaner/reporter_runner_win.cc index 431a9f72..3af6a4e82 100644 --- a/chrome/browser/safe_browsing/chrome_cleaner/reporter_runner_win.cc +++ b/chrome/browser/safe_browsing/chrome_cleaner/reporter_runner_win.cc
@@ -40,12 +40,7 @@ #include "chrome/browser/safe_browsing/chrome_cleaner/chrome_cleaner_fetcher_win.h" #include "chrome/browser/safe_browsing/chrome_cleaner/srt_client_info_win.h" #include "chrome/browser/safe_browsing/chrome_cleaner/srt_field_trial_win.h" -#include "chrome/browser/safe_browsing/chrome_cleaner/srt_global_error_win.h" #include "chrome/browser/ui/browser_finder.h" -#include "chrome/browser/ui/browser_list.h" -#include "chrome/browser/ui/browser_list_observer.h" -#include "chrome/browser/ui/global_error/global_error_service.h" -#include "chrome/browser/ui/global_error/global_error_service_factory.h" #include "chrome/common/pref_names.h" #include "components/chrome_cleaner/public/constants/constants.h" #include "components/component_updater/pref_names.h" @@ -76,26 +71,21 @@ // prompt sequence. Replicated in the histograms.xml file, so the order MUST // NOT CHANGE. enum SwReporterUmaValue { - // Deprecated. - SW_REPORTER_EXPLICIT_REQUEST = 0, - // Deprecated. - SW_REPORTER_STARTUP_RETRY = 1, - // Deprecated. - SW_REPORTER_RETRIED_TOO_MANY_TIMES = 2, + DEPRECATED_SW_REPORTER_EXPLICIT_REQUEST = 0, + DEPRECATED_SW_REPORTER_STARTUP_RETRY = 1, + DEPRECATED_SW_REPORTER_RETRIED_TOO_MANY_TIMES = 2, SW_REPORTER_START_EXECUTION = 3, SW_REPORTER_FAILED_TO_START = 4, - // Deprecated. - SW_REPORTER_REGISTRY_EXIT_CODE = 5, - // Deprecated. - SW_REPORTER_RESET_RETRIES = 6, - SW_REPORTER_DOWNLOAD_START = 7, + DEPRECATED_SW_REPORTER_REGISTRY_EXIT_CODE = 5, + DEPRECATED_SW_REPORTER_RESET_RETRIES = 6, + DEPRECATED_SW_REPORTER_DOWNLOAD_START = 7, SW_REPORTER_NO_BROWSER = 8, - SW_REPORTER_NO_LOCAL_STATE = 9, + DEPRECATED_SW_REPORTER_NO_LOCAL_STATE = 9, SW_REPORTER_NO_PROMPT_NEEDED = 10, SW_REPORTER_NO_PROMPT_FIELD_TRIAL = 11, SW_REPORTER_ALREADY_PROMPTED = 12, - SW_REPORTER_RAN_DAILY = 13, - SW_REPORTER_ADDED_TO_MENU = 14, + DEPRECATED_SW_REPORTER_RAN_DAILY = 13, + DEPRECATED_SW_REPORTER_ADDED_TO_MENU = 14, SW_REPORTER_MAX, }; @@ -485,73 +475,6 @@ uma.RecordReporterStep(value); } -void DisplaySRTPrompt(base::FilePath download_path, - ChromeCleanerFetchStatus fetch_status) { - // As long as the fetch didn't fail due to HTTP_NOT_FOUND, show a prompt - // (either offering the tool directly or pointing to the download page). - // If the fetch failed to find the file, don't prompt the user since the - // tool is not currently available. - // TODO(csharp): In the event the browser is closed before the prompt - // displays, we will wait until the next scanner run to - // re-display it. Improve this. http://crbug.com/460295 - if (fetch_status == ChromeCleanerFetchStatus::kNotFoundOnServer) { - RecordSRTPromptHistogram(SRT_PROMPT_DOWNLOAD_UNAVAILABLE); - RecordPromptNotShownWithReasonHistogram( - NO_PROMPT_REASON_CLEANER_DOWNLOAD_FAILED); - return; - } - - // Find the last active browser, which may be NULL, in which case we won't - // show the prompt this time and will wait until the next run of the - // reporter. We can't use other ways of finding a browser because we don't - // have a profile. - Browser* browser = chrome::FindLastActive(); - if (!browser) { - RecordPromptNotShownWithReasonHistogram( - NO_PROMPT_REASON_BROWSER_NOT_AVAILABLE); - return; - } - - Profile* profile = browser->profile(); - DCHECK(profile); - - // Make sure we have a tabbed browser since we need to anchor the bubble to - // the toolbar's wrench menu. Create one if none exist already. - if (browser->type() != Browser::TYPE_TABBED) { - browser = chrome::FindTabbedBrowser(profile, false); - if (!browser) - browser = new Browser(Browser::CreateParams(profile, false)); - } - GlobalErrorService* global_error_service = - GlobalErrorServiceFactory::GetForProfile(profile); - SRTGlobalError* global_error = - new SRTGlobalError(global_error_service, download_path); - - // Ownership of |global_error| is passed to the service. The error removes - // itself from the service and self-destructs when done. - global_error_service->AddGlobalError(base::WrapUnique(global_error)); - - bool show_bubble = true; - PrefService* local_state = g_browser_process->local_state(); - if (local_state && local_state->GetBoolean(prefs::kSwReporterPendingPrompt)) { - // Don't show the bubble if there's already a pending prompt to only be - // sown in the Chrome menu. - RecordReporterStepHistogram(SW_REPORTER_ADDED_TO_MENU); - show_bubble = false; - } else { - // Do not try to show bubble if another GlobalError is already showing - // one. The bubble will be shown once the others have been dismissed. - for (GlobalError* error : global_error_service->errors()) { - if (error->GetBubbleView()) { - show_bubble = false; - break; - } - } - } - if (show_bubble) - global_error->ShowBubbleView(browser); -} - // This function is called from a worker thread to launch the SwReporter and // wait for termination to collect its exit code. This task could be // interrupted by a shutdown at any time, so it shouldn't depend on anything @@ -578,10 +501,6 @@ } // namespace -void DisplaySRTPromptForTesting(const base::FilePath& download_path) { - DisplaySRTPrompt(download_path, ChromeCleanerFetchStatus::kSuccess); -} - namespace { // Scans and shows the Chrome Cleaner UI if the user has not already been @@ -632,48 +551,6 @@ new ChromeCleanerDialogControllerImpl(cleaner_controller); } -// Try to fetch the SRT, and on success, show the prompt to run it. -void MaybeFetchSRT(Browser* browser, const base::Version& reporter_version) { - DCHECK_CURRENTLY_ON(BrowserThread::UI); - - Profile* profile = browser->profile(); - DCHECK(profile); - PrefService* prefs = profile->GetPrefs(); - DCHECK(prefs); - - // Don't show the prompt again if it's been shown before for this profile - // and for the current variations seed, unless there's a pending prompt to - // show in the Chrome menu. - std::string incoming_seed = GetIncomingSRTSeed(); - std::string old_seed = prefs->GetString(prefs::kSwReporterPromptSeed); - PrefService* local_state = g_browser_process->local_state(); - bool pending_prompt = - local_state && local_state->GetBoolean(prefs::kSwReporterPendingPrompt); - if (!incoming_seed.empty() && incoming_seed == old_seed && !pending_prompt) { - RecordReporterStepHistogram(SW_REPORTER_ALREADY_PROMPTED); - RecordPromptNotShownWithReasonHistogram(NO_PROMPT_REASON_ALREADY_PROMPTED); - return; - } - - if (!incoming_seed.empty() && incoming_seed != old_seed) { - prefs->SetString(prefs::kSwReporterPromptSeed, incoming_seed); - // Forget about pending prompts if prompt seed has changed. - if (local_state) - local_state->SetBoolean(prefs::kSwReporterPendingPrompt, false); - } - prefs->SetString(prefs::kSwReporterPromptVersion, - reporter_version.GetString()); - - if (g_testing_delegate_) { - g_testing_delegate_->TriggerPrompt(); - return; - } - - // Download the SRT. - RecordReporterStepHistogram(SW_REPORTER_DOWNLOAD_START); - FetchChromeCleaner(base::Bind(DisplaySRTPrompt)); -} - base::Time Now() { return g_testing_delegate_ ? g_testing_delegate_->Now() : base::Time::Now(); } @@ -683,7 +560,7 @@ // This class tries to run a queue of reporters and react to their exit codes. // It schedules subsequent runs of the queue as needed, or retries as soon as a // browser is available when none is on first try. -class ReporterRunner : public chrome::BrowserListObserver { +class ReporterRunner { public: // Registers |invocations| to run next time |TryToRun| is scheduled. (And if // it's not already scheduled, call it now.) @@ -714,17 +591,7 @@ private: ReporterRunner() {} - ~ReporterRunner() override {} - - // BrowserListObserver. - void OnBrowserSetLastActive(Browser* browser) override {} - void OnBrowserRemoved(Browser* browser) override {} - void OnBrowserAdded(Browser* browser) override { - DCHECK_CURRENTLY_ON(BrowserThread::UI); - DCHECK(browser); - MaybeFetchSRT(browser, version_); - BrowserList::RemoveObserver(this); - } + virtual ~ReporterRunner() {} // Launches the command line at the head of the queue. void ScheduleNextInvocation() { @@ -771,7 +638,7 @@ base::ThreadTaskRunnerHandle::Get()->PostDelayedTask( FROM_HERE, base::Bind(&ReporterRunner::TryToRun, base::Unretained(this)), - base::TimeDelta::FromDays(days_between_reporter_runs_)); + base::TimeDelta::FromDays(kDaysBetweenSuccessfulSwReporterRuns)); } else { ScheduleNextInvocation(); } @@ -811,8 +678,7 @@ return; } - if (!base::FeatureList::IsEnabled(kInBrowserCleanerUIFeature) && - !IsInSRTPromptFieldTrialGroups()) { + if (!IsInSRTPromptFieldTrialGroups()) { // Knowing about disabled field trial is more important than reporter not // finding anything to remove, so check this case first. RecordReporterStepHistogram(SW_REPORTER_NO_PROMPT_FIELD_TRIAL); @@ -828,27 +694,7 @@ return; } - // The kInBrowserCleanerUI feature takes precedence over the - // SRTPromptFieldTrial. If it is enabled, no attempt will be made to show - // the old SRT prompt. - if (base::FeatureList::IsEnabled(kInBrowserCleanerUIFeature)) { - MaybeScanAndPrompt(finished_invocation); - return; - } - - // Find the last active browser, which may be NULL, in which case we need - // to wait for one to be available. We can't use other ways of finding a - // browser because we don't have a profile. And we need a browser to get to - // a profile, which we need, to tell whether we should prompt or not. - // TODO(mad): crbug.com/503269, investigate whether we should change how we - // decide when it's time to download the SRT and when to display the prompt. - Browser* browser = chrome::FindLastActive(); - if (!browser) { - RecordReporterStepHistogram(SW_REPORTER_NO_BROWSER); - BrowserList::AddObserver(this); - } else { - MaybeFetchSRT(browser, version_); - } + MaybeScanAndPrompt(finished_invocation); } void TryToRun() { @@ -865,24 +711,13 @@ } // Run a queue of reporters if none have been triggered in the last - // |days_between_reporter_runs_| days, which depends if there is a pending - // prompt to be added to Chrome's menu. - // - // There is no concept of a pending prompt if the kInBrowserCleanerUIFeature - // feature is enabled, so always use kDaysBetweenSuccessfulSwReporterRuns in - // that case. - days_between_reporter_runs_ = kDaysBetweenSuccessfulSwReporterRuns; - if (!base::FeatureList::IsEnabled(kInBrowserCleanerUIFeature) && - local_state->GetBoolean(prefs::kSwReporterPendingPrompt)) { - days_between_reporter_runs_ = kDaysBetweenSwReporterRunsForPendingPrompt; - RecordReporterStepHistogram(SW_REPORTER_RAN_DAILY); - } + // |kDaysBetweenSuccessfulSwReporterRuns| days. const base::Time now = Now(); const base::Time last_time_triggered = base::Time::FromInternalValue( local_state->GetInt64(prefs::kSwReporterLastTimeTriggered)); const base::Time next_trigger( last_time_triggered + - base::TimeDelta::FromDays(days_between_reporter_runs_)); + base::TimeDelta::FromDays(kDaysBetweenSuccessfulSwReporterRuns)); if (!pending_invocations_.empty() && (next_trigger <= now || // Also make sure the kSwReporterLastTimeTriggered value is not set in @@ -997,12 +832,6 @@ base::TaskPriority::BACKGROUND, base::TaskShutdownBehavior::CONTINUE_ON_SHUTDOWN}); - // This value is used to identify how long to wait before starting a new run - // of the reporter queue. It's initialized with the default value and may be - // changed to a different value when a prompt is pending and the reporter - // should be run before adding the global error to the Chrome menu. - int days_between_reporter_runs_ = kDaysBetweenSuccessfulSwReporterRuns; - // This will be true if the current queue of invocations started at a time // when logs should be uploaded. bool in_logs_upload_period_ = false;
diff --git a/chrome/browser/safe_browsing/chrome_cleaner/reporter_runner_win.h b/chrome/browser/safe_browsing/chrome_cleaner/reporter_runner_win.h index 6716bb7..2ecb457 100644 --- a/chrome/browser/safe_browsing/chrome_cleaner/reporter_runner_win.h +++ b/chrome/browser/safe_browsing/chrome_cleaner/reporter_runner_win.h
@@ -28,7 +28,6 @@ // The number of days to wait before triggering another reporter run. const int kDaysBetweenSuccessfulSwReporterRuns = 7; -const int kDaysBetweenSwReporterRunsForPendingPrompt = 1; // The number of days to wait before sending out reporter logs. const int kDaysBetweenReporterLogsSent = 7; @@ -71,9 +70,8 @@ // Tries to run the sw_reporter component, and then schedule the next try. If // called multiple times, then multiple sequences of trying to run will happen, -// yet only one SwReporterQueue will actually run per specified period (either -// |kDaysBetweenSuccessfulSwReporterRuns| or -// |kDaysBetweenSwReporterRunsForPendingPrompt|). +// yet only one SwReporterQueue will actually run in the period of +// |kDaysBetweenSuccessfulSwReporterRuns| days. // // Each "run" of the sw_reporter component may aggregate the results of several // executions of the tool with different command lines. |invocations| is the @@ -123,8 +121,6 @@ // cleared. void SetSwReporterTestingDelegate(SwReporterTestingDelegate* delegate); -void DisplaySRTPromptForTesting(const base::FilePath& download_path); - } // namespace safe_browsing #endif // CHROME_BROWSER_SAFE_BROWSING_CHROME_CLEANER_REPORTER_RUNNER_WIN_H_
diff --git a/chrome/browser/safe_browsing/chrome_cleaner/settings_resetter_browsertest_win.cc b/chrome/browser/safe_browsing/chrome_cleaner/settings_resetter_browsertest_win.cc index 2954f7b..32d45b02 100644 --- a/chrome/browser/safe_browsing/chrome_cleaner/settings_resetter_browsertest_win.cc +++ b/chrome/browser/safe_browsing/chrome_cleaner/settings_resetter_browsertest_win.cc
@@ -7,7 +7,6 @@ #include <memory> #include "base/run_loop.h" -#include "base/test/scoped_feature_list.h" #include "base/test/test_reg_util_win.h" #include "base/win/registry.h" #include "chrome/browser/browser_process.h" @@ -76,15 +75,7 @@ ASSERT_EQ(ERROR_SUCCESS, result); } -class ChromeCleanerTagForResettingTest : public InProcessBrowserTest { - public: - void SetUpInProcessBrowserTestFixture() override { - scoped_feature_list_.InitAndEnableFeature(kInBrowserCleanerUIFeature); - } - - protected: - base::test::ScopedFeatureList scoped_feature_list_; -}; +using ChromeCleanerTagForResettingTest = InProcessBrowserTest; IN_PROC_BROWSER_TEST_F(ChromeCleanerTagForResettingTest, Run) { Browser* browser = chrome::FindLastActive(); @@ -153,13 +144,11 @@ completion_state_ = GetParam(); ASSERT_TRUE(completion_state_ >= CleanupCompletionState::kNotAvailable && completion_state_ <= CleanupCompletionState::kInvalidValue); - scoped_feature_list_.InitAndEnableFeature(kInBrowserCleanerUIFeature); } protected: CleanupCompletionState completion_state_; - base::test::ScopedFeatureList scoped_feature_list_; registry_util::RegistryOverrideManager registry_override_manager_; };
diff --git a/chrome/browser/safe_browsing/chrome_cleaner/settings_resetter_win.cc b/chrome/browser/safe_browsing/chrome_cleaner/settings_resetter_win.cc index 2806f4e..1227b4b 100644 --- a/chrome/browser/safe_browsing/chrome_cleaner/settings_resetter_win.cc +++ b/chrome/browser/safe_browsing/chrome_cleaner/settings_resetter_win.cc
@@ -203,8 +203,7 @@ // static bool PostCleanupSettingsResetter::IsEnabled() { #if defined(OS_WIN) - return base::FeatureList::IsEnabled( - safe_browsing::kInBrowserCleanerUIFeature); + return true; #else return false; #endif
diff --git a/chrome/browser/safe_browsing/chrome_cleaner/srt_field_trial_win.cc b/chrome/browser/safe_browsing/chrome_cleaner/srt_field_trial_win.cc index 2332a3a..234e0433 100644 --- a/chrome/browser/safe_browsing/chrome_cleaner/srt_field_trial_win.cc +++ b/chrome/browser/safe_browsing/chrome_cleaner/srt_field_trial_win.cc
@@ -42,11 +42,6 @@ const char kSRTPromptTrial[] = "SRTPromptFieldTrial"; -// TODO(crbug.com/774623): Delete the code from the old prompt and remove this -// feature. -const base::Feature kInBrowserCleanerUIFeature{ - "InBrowserCleanerUI", base::FEATURE_ENABLED_BY_DEFAULT}; - const base::Feature kRebootPromptDialogFeature{ "RebootPromptDialog", base::FEATURE_DISABLED_BY_DEFAULT}; @@ -131,11 +126,6 @@ /*default_value=*/false); } -void RecordSRTPromptHistogram(SRTPromptHistogramValue value) { - UMA_HISTOGRAM_ENUMERATION("SoftwareReporter.PromptUsage", value, - SRT_PROMPT_MAX); -} - void RecordPromptShownWithTypeHistogram(PromptTypeHistogramValue value) { UMA_HISTOGRAM_ENUMERATION("SoftwareReporter.PromptShownWithType", value, PROMPT_TYPE_MAX);
diff --git a/chrome/browser/safe_browsing/chrome_cleaner/srt_field_trial_win.h b/chrome/browser/safe_browsing/chrome_cleaner/srt_field_trial_win.h index 735f6dc..5155c074 100644 --- a/chrome/browser/safe_browsing/chrome_cleaner/srt_field_trial_win.h +++ b/chrome/browser/safe_browsing/chrome_cleaner/srt_field_trial_win.h
@@ -52,10 +52,6 @@ PROMPT_TYPE_MAX, }; -// When enabled, all user interaction with the Chrome Cleaner will happen from -// within Chrome. -extern const base::Feature kInBrowserCleanerUIFeature; - // When enabled, shows a prompt dialog if a cleanup requires a reboot and the // Settings page is not the current active tab. extern const base::Feature kRebootPromptDialogFeature;
diff --git a/chrome/browser/safe_browsing/chrome_cleaner/srt_global_error_win.cc b/chrome/browser/safe_browsing/chrome_cleaner/srt_global_error_win.cc deleted file mode 100644 index a46d7015..0000000 --- a/chrome/browser/safe_browsing/chrome_cleaner/srt_global_error_win.cc +++ /dev/null
@@ -1,270 +0,0 @@ -// Copyright 2014 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#include "chrome/browser/safe_browsing/chrome_cleaner/srt_global_error_win.h" - -#include "base/base_paths.h" -#include "base/bind.h" -#include "base/bind_helpers.h" -#include "base/callback.h" -#include "base/command_line.h" -#include "base/files/file_path.h" -#include "base/files/file_util.h" -#include "base/path_service.h" -#include "base/process/launch.h" -#include "base/strings/string_number_conversions.h" -#include "base/task_scheduler/post_task.h" -#include "chrome/app/chrome_command_ids.h" -#include "chrome/browser/browser_process.h" -#include "chrome/browser/metrics/chrome_metrics_service_accessor.h" -#include "chrome/browser/safe_browsing/chrome_cleaner/srt_client_info_win.h" -#include "chrome/browser/safe_browsing/chrome_cleaner/srt_field_trial_win.h" -#include "chrome/browser/ui/browser.h" -#include "chrome/browser/ui/browser_finder.h" -#include "chrome/browser/ui/global_error/global_error_service.h" -#include "chrome/common/channel_info.h" -#include "chrome/grit/chromium_strings.h" -#include "chrome/grit/generated_resources.h" -#include "chrome/installer/util/install_util.h" -#include "components/chrome_cleaner/public/constants/constants.h" -#include "components/component_updater/pref_names.h" -#include "components/prefs/pref_service.h" -#include "components/version_info/version_info.h" -#include "ui/base/l10n/l10n_util.h" - -namespace safe_browsing { - -namespace { - -// Used as a backup plan in case the SRT executable was not successfully -// downloaded or run. -const char kSRTDownloadURL[] = - "https://www.google.com/chrome/srt/?chrome-prompt=1"; - -// The extension to use to replace the temporary one created when the SRT was -// downloaded. -const base::FilePath::CharType kExecutableExtension[] = L"exe"; - -bool MaybeExecuteSRTFromBlockingPool( - const base::FilePath& downloaded_path, - bool metrics_enabled, - bool sber_enabled, - chrome_cleaner::ChromePromptValue prompt_value) { - DCHECK(!downloaded_path.empty()); - - if (base::PathExists(downloaded_path)) { - base::FilePath executable_path( - downloaded_path.ReplaceExtension(kExecutableExtension)); - if (base::ReplaceFile(downloaded_path, executable_path, nullptr)) { - base::CommandLine srt_command_line(executable_path); - srt_command_line.AppendSwitchASCII( - chrome_cleaner::kChromePromptSwitch, - base::IntToString(static_cast<int>(prompt_value))); - srt_command_line.AppendSwitchASCII(chrome_cleaner::kChromeVersionSwitch, - version_info::GetVersionNumber()); - srt_command_line.AppendSwitchASCII(chrome_cleaner::kChromeChannelSwitch, - base::IntToString(ChannelAsInt())); - - base::FilePath chrome_exe_path; - PathService::Get(base::FILE_EXE, &chrome_exe_path); - srt_command_line.AppendSwitchPath(chrome_cleaner::kChromeExePathSwitch, - chrome_exe_path); - if (!InstallUtil::IsPerUserInstall()) - srt_command_line.AppendSwitch( - chrome_cleaner::kChromeSystemInstallSwitch); - - if (metrics_enabled) { - srt_command_line.AppendSwitch(chrome_cleaner::kUmaUserSwitch); - srt_command_line.AppendSwitch( - chrome_cleaner::kEnableCrashReportingSwitch); - } - - if (sber_enabled) - srt_command_line.AppendSwitch( - chrome_cleaner::kExtendedSafeBrowsingEnabledSwitch); - - base::Process srt_process( - base::LaunchProcess(srt_command_line, base::LaunchOptions())); - return srt_process.IsValid(); - } - } - return false; -} - -void DeleteFilesFromBlockingPool(const base::FilePath& downloaded_path) { - base::DeleteFile(downloaded_path, false); - base::DeleteFile(downloaded_path.ReplaceExtension(kExecutableExtension), - false); -} - -} // namespace - -// SRTGlobalError ------------------------------------------------------------ - -SRTGlobalError::SRTGlobalError(GlobalErrorService* global_error_service, - const base::FilePath& downloaded_path) - : global_error_service_(global_error_service), - downloaded_path_(downloaded_path) { - DCHECK(global_error_service_); -} - -SRTGlobalError::~SRTGlobalError() { - if (!interacted_) { - base::PostTaskWithTraits( - FROM_HERE, {base::MayBlock(), base::TaskPriority::BACKGROUND}, - base::Bind(&DeleteFilesFromBlockingPool, downloaded_path_)); - } -} - -bool SRTGlobalError::HasMenuItem() { - return true; -} - -int SRTGlobalError::MenuItemCommandID() { - return IDC_SHOW_SRT_BUBBLE; -} - -base::string16 SRTGlobalError::MenuItemLabel() { - return l10n_util::GetStringUTF16(IDS_SRT_MENU_ITEM); -} - -void SRTGlobalError::ExecuteMenuItem(Browser* browser) { - RecordSRTPromptHistogram(SRT_PROMPT_SHOWN_FROM_MENU); - bubble_shown_from_menu_ = true; - ShowBubbleView(browser); -} - -void SRTGlobalError::ShowBubbleView(Browser* browser) { - RecordSRTPromptHistogram(SRT_PROMPT_SHOWN); - RecordPromptShownWithTypeHistogram( - PromptTypeHistogramValue::PROMPT_TYPE_LEGACY_PROMPT_SHOWN); - GlobalErrorWithStandardBubble::ShowBubbleView(browser); -} - -bool SRTGlobalError::ShouldShowCloseButton() const { - return true; -} - -base::string16 SRTGlobalError::GetBubbleViewTitle() { - return l10n_util::GetStringUTF16(IDS_SRT_BUBBLE_TITLE); -} - -std::vector<base::string16> SRTGlobalError::GetBubbleViewMessages() { - std::vector<base::string16> messages; - messages.push_back(l10n_util::GetStringUTF16(IDS_SRT_BUBBLE_TEXT)); - return messages; -} - -base::string16 SRTGlobalError::GetBubbleViewAcceptButtonLabel() { - return downloaded_path_.empty() - ? l10n_util::GetStringUTF16(IDS_SRT_BUBBLE_DOWNLOAD_BUTTON_TEXT) - : l10n_util::GetStringUTF16(IDS_SRT_BUBBLE_RUN_BUTTON_TEXT); -} - -bool SRTGlobalError::ShouldAddElevationIconToAcceptButton() { - return !downloaded_path_.empty() && SRTPromptNeedsElevationIcon(); -} - -base::string16 SRTGlobalError::GetBubbleViewCancelButtonLabel() { - // Show the dismiss button only if the bubble was shown from the menu. - return bubble_shown_from_menu_ - ? l10n_util::GetStringUTF16(IDS_SRT_BUBBLE_DISMISS) - : base::string16(); -} - -void SRTGlobalError::OnBubbleViewDidClose(Browser* browser) { - if (!interacted_) { - // If user didn't interact with the bubble, it means they used the generic - // close bubble button. - RecordSRTPromptHistogram(SRT_PROMPT_CLOSED); - g_browser_process->local_state()->SetBoolean( - prefs::kSwReporterPendingPrompt, true); - } -} - -void SRTGlobalError::BubbleViewAcceptButtonPressed(Browser* browser) { - OnUserinteractionStarted(SRT_PROMPT_ACCEPTED); - MaybeExecuteSRT(); -} - -void SRTGlobalError::BubbleViewCancelButtonPressed(Browser* browser) { - OnUserinteractionStarted(SRT_PROMPT_DENIED); - base::PostTaskWithTraits( - FROM_HERE, {base::MayBlock(), base::TaskPriority::BACKGROUND}, - base::Bind(&DeleteFilesFromBlockingPool, downloaded_path_)); - OnUserinteractionDone(); -} - -bool SRTGlobalError::ShouldCloseOnDeactivate() const { - return false; -} - -void SRTGlobalError::MaybeExecuteSRT() { - if (downloaded_path_.empty()) { - FallbackToDownloadPage(); - return; - } - // At this point, this object owns itself, since ownership has been taken back - // from the global_error_service_ in the call to OnUserInteractionStarted. - // This means that it is safe to use base::Unretained here. - base::PostTaskWithTraitsAndReplyWithResult( - FROM_HERE, {base::MayBlock(), base::TaskPriority::BACKGROUND}, - base::Bind( - &MaybeExecuteSRTFromBlockingPool, downloaded_path_, - ChromeMetricsServiceAccessor::IsMetricsAndCrashReportingEnabled(), - SafeBrowsingExtendedReportingEnabled(), - bubble_shown_from_menu_ - ? chrome_cleaner::ChromePromptValue::kShownFromMenu - : chrome_cleaner::ChromePromptValue::kPrompted), - base::Bind( - [](SRTGlobalError* self, bool success) { - if (success) - self->OnUserinteractionDone(); - else - self->FallbackToDownloadPage(); - }, - base::Unretained(this))); -} - -void SRTGlobalError::FallbackToDownloadPage() { - RecordSRTPromptHistogram(SRT_PROMPT_FALLBACK); - - Browser* browser = chrome::FindLastActive(); - if (browser) { - browser->OpenURL( - content::OpenURLParams(GURL(kSRTDownloadURL), content::Referrer(), - WindowOpenDisposition::NEW_FOREGROUND_TAB, - ui::PAGE_TRANSITION_LINK, false)); - } - - base::PostTaskWithTraits( - FROM_HERE, {base::MayBlock(), base::TaskPriority::BACKGROUND}, - base::Bind(&DeleteFilesFromBlockingPool, downloaded_path_)); - OnUserinteractionDone(); -} - -void SRTGlobalError::OnUserinteractionStarted( - SRTPromptHistogramValue histogram_value) { - // This is for cases where the UI doesn't go away quickly enough and user - // might click on the button more than once, or more than one button. - if (interacted_) - return; - RecordSRTPromptHistogram(histogram_value); - interacted_ = true; - if (global_error_service_) { - global_error_service_->RemoveGlobalError(this).release(); - global_error_service_ = nullptr; - } -} - -void SRTGlobalError::OnUserinteractionDone() { - DCHECK(interacted_); - // Once the user interacted with the bubble, we can forget about any pending - // prompt. - g_browser_process->local_state()->SetBoolean(prefs::kSwReporterPendingPrompt, - false); - delete this; -} - -} // namespace safe_browsing
diff --git a/chrome/browser/safe_browsing/chrome_cleaner/srt_global_error_win.h b/chrome/browser/safe_browsing/chrome_cleaner/srt_global_error_win.h deleted file mode 100644 index aa6c13c..0000000 --- a/chrome/browser/safe_browsing/chrome_cleaner/srt_global_error_win.h +++ /dev/null
@@ -1,86 +0,0 @@ -// Copyright 2014 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef CHROME_BROWSER_SAFE_BROWSING_CHROME_CLEANER_SRT_GLOBAL_ERROR_WIN_H_ -#define CHROME_BROWSER_SAFE_BROWSING_CHROME_CLEANER_SRT_GLOBAL_ERROR_WIN_H_ - -#include <vector> - -#include "base/files/file_path.h" -#include "base/macros.h" -#include "chrome/browser/safe_browsing/chrome_cleaner/srt_field_trial_win.h" -#include "chrome/browser/ui/global_error/global_error.h" - -class GlobalErrorService; - -namespace safe_browsing { - -// Encapsulates UI-related functionality for the software removal tool (SRT) -// prompt. The UI consists of two parts: (1.) the profile reset (pop-up) bubble, -// and (2.) a menu item in the wrench menu (provided by being a GlobalError). -class SRTGlobalError : public GlobalErrorWithStandardBubble { - public: - // Creates the new SRTGlobalError to be associated to the given - // |global_error_service|. |download_path| specifies the path the SRT has - // already been downloaded to. If for some reason the SRT cannot be found at - // this path, if the path is empty or if the SRT cannot be launched, the - // bubble will fall back to opening the SRT download page if the user requests - // cleanup. - SRTGlobalError(GlobalErrorService* global_error_service, - const base::FilePath& downloaded_path); - ~SRTGlobalError() override; - - // GlobalError: - bool HasMenuItem() override; - int MenuItemCommandID() override; - base::string16 MenuItemLabel() override; - void ExecuteMenuItem(Browser* browser) override; - void ShowBubbleView(Browser* browser) override; - - // WidgetDelegateView overrides: - bool ShouldShowCloseButton() const override; - - // GlobalErrorWithStandardBubble: - base::string16 GetBubbleViewTitle() override; - std::vector<base::string16> GetBubbleViewMessages() override; - base::string16 GetBubbleViewAcceptButtonLabel() override; - base::string16 GetBubbleViewCancelButtonLabel() override; - void OnBubbleViewDidClose(Browser* browser) override; - void BubbleViewAcceptButtonPressed(Browser* browser) override; - bool ShouldAddElevationIconToAcceptButton() override; - void BubbleViewCancelButtonPressed(Browser* browser) override; - bool ShouldCloseOnDeactivate() const override; - - private: - // Executes the SRT if the executable is present. - void MaybeExecuteSRT(); - - // Falls back to a navigation to the download page when we failed to - // download and execute the SRT. - void FallbackToDownloadPage(); - - // Called when user interaction has started. - void OnUserinteractionStarted(SRTPromptHistogramValue histogram_value); - - // Called when user interaction is done. - void OnUserinteractionDone(); - - // Used to dismiss the GlobalError, then set to NULL. - GlobalErrorService* global_error_service_; - - // The path to the downloaded executable. - base::FilePath downloaded_path_; - - // Identifies whether the bubble was shown from the menu. - bool bubble_shown_from_menu_ = false; - - // Identifies whether the user interacted with the bubble buttons or not. - bool interacted_ = false; - - DISALLOW_COPY_AND_ASSIGN(SRTGlobalError); -}; - -} // namespace safe_browsing - -#endif // CHROME_BROWSER_SAFE_BROWSING_CHROME_CLEANER_SRT_GLOBAL_ERROR_WIN_H_
diff --git a/chrome/browser/safe_browsing/settings_reset_prompt/settings_reset_dependency_browsertest_win.cc b/chrome/browser/safe_browsing/settings_reset_prompt/settings_reset_dependency_browsertest_win.cc index 1af0ea2..dbf6874 100644 --- a/chrome/browser/safe_browsing/settings_reset_prompt/settings_reset_dependency_browsertest_win.cc +++ b/chrome/browser/safe_browsing/settings_reset_prompt/settings_reset_dependency_browsertest_win.cc
@@ -27,38 +27,24 @@ MOCK_CONST_METHOD0(ShowSettingsResetPromptWithDelay, void()); }; -// Test params: in_browser_cleaner_ui_enabled, settings_reset_prompt_enabled, -// representing if each feature is enabled. -class SettingsResetDependencyTest - : public InProcessBrowserTest, - public ::testing::WithParamInterface<std::tuple<bool, bool>> { +// Test params: settings_reset_prompt_enabled_ representing if the corresponding +// feature is enabled. +class SettingsResetDependencyTest : public InProcessBrowserTest, + public ::testing::WithParamInterface<bool> { public: void SetUpInProcessBrowserTestFixture() override { SetSettingsResetPromptDelegate(&delegate_); - std::tie(in_browser_cleaner_ui_enabled_, settings_reset_prompt_enabled_) = - GetParam(); - - std::vector<base::StringPiece> enabled_features; - std::vector<base::StringPiece> disabled_features; - if (in_browser_cleaner_ui_enabled_) { - enabled_features.push_back(kInBrowserCleanerUIFeature.name); - } else { - disabled_features.push_back(kInBrowserCleanerUIFeature.name); - } + settings_reset_prompt_enabled_ = GetParam(); if (settings_reset_prompt_enabled_) { - enabled_features.push_back(kSettingsResetPrompt.name); + scoped_feature_list_.InitAndEnableFeature(kSettingsResetPrompt); EXPECT_CALL(delegate_, ShowSettingsResetPromptWithDelay()) .WillOnce( InvokeWithoutArgs([this] { reset_prompt_checked_ = true; })); } else { - disabled_features.push_back(kSettingsResetPrompt.name); + scoped_feature_list_.InitAndDisableFeature(kSettingsResetPrompt); } - - scoped_feature_list_.InitFromCommandLine( - base::JoinString(enabled_features, ","), - base::JoinString(disabled_features, ",")); } void TearDownInProcessBrowserTestFixture() override { @@ -66,7 +52,6 @@ } protected: - bool in_browser_cleaner_ui_enabled_; bool settings_reset_prompt_enabled_; bool reset_prompt_checked_ = false; @@ -86,8 +71,7 @@ INSTANTIATE_TEST_CASE_P(Default, SettingsResetDependencyTest, - ::testing::Combine(::testing::Bool(), - ::testing::Bool())); + ::testing::Bool()); } // namespace } // namespace safe_browsing
diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn index 25186eb..f8371ecb 100644 --- a/chrome/browser/ui/BUILD.gn +++ b/chrome/browser/ui/BUILD.gn
@@ -17,6 +17,7 @@ import("//printing/features/features.gni") import("//rlz/features/features.gni") import("//ui/base/ui_features.gni") +import("//ui/views/features.gni") config("ui_warnings") { if (is_clang) { @@ -1603,6 +1604,7 @@ "views/profiles/avatar_button.cc", "views/profiles/avatar_button.h", ] + deps += [ "//ui/views:features" ] } if (enable_dice_support) { @@ -3083,6 +3085,15 @@ } } + if (enable_native_window_nav_buttons) { + sources += [ + "views/frame/desktop_linux_browser_frame_view.cc", + "views/frame/desktop_linux_browser_frame_view.h", + "views/frame/desktop_linux_browser_frame_view_layout.cc", + "views/frame/desktop_linux_browser_frame_view_layout.h", + ] + } + if (is_desktop_linux) { sources += [ "views/chrome_views_delegate_linux.cc" ] }
diff --git a/chrome/browser/ui/browser_dialogs.h b/chrome/browser/ui/browser_dialogs.h index 388d8dc..640075d1 100644 --- a/chrome/browser/ui/browser_dialogs.h +++ b/chrome/browser/ui/browser_dialogs.h
@@ -312,6 +312,7 @@ views::Widget* (*)(views::View*, content::WebContents*, const std::vector<arc::ArcNavigationThrottle::AppInfo>&, + bool disable_display_in_chrome, const IntentPickerResponse&); BubbleShowPtr ShowIntentPickerBubble();
diff --git a/chrome/browser/ui/global_error/global_error_browsertest.cc b/chrome/browser/ui/global_error/global_error_browsertest.cc index 66278e3..7f0337d 100644 --- a/chrome/browser/ui/global_error/global_error_browsertest.cc +++ b/chrome/browser/ui/global_error/global_error_browsertest.cc
@@ -29,10 +29,6 @@ #include "extensions/common/extension_builder.h" #include "extensions/common/feature_switch.h" -#if defined(OS_WIN) -#include "chrome/browser/safe_browsing/chrome_cleaner/srt_global_error_win.h" -#endif - #if !defined(OS_CHROMEOS) #include "chrome/browser/signin/signin_global_error.h" #include "chrome/browser/signin/signin_global_error_factory.h" @@ -174,15 +170,6 @@ } else if (name == "SigninGlobalError") { SigninGlobalErrorFactory::GetForProfile(profile)->ShowBubbleView(browser()); #endif -#if defined(OS_WIN) - } else if (name == "SRTGlobalError") { - GlobalErrorService* global_error_service = - GlobalErrorServiceFactory::GetForProfile(profile); - global_error_service->AddGlobalError( - base::MakeUnique<safe_browsing::SRTGlobalError>( - global_error_service, base::FilePath().AppendASCII("nowhere"))); - ShowPendingError(browser()); -#endif // OS_WIN } else { ADD_FAILURE(); } @@ -227,10 +214,3 @@ RunDialog(); } #endif - -// Software Removal Tool only exists for Windows. -#if defined(OS_WIN) -IN_PROC_BROWSER_TEST_F(GlobalErrorBubbleTest, InvokeDialog_SRTGlobalError) { - RunDialog(); -} -#endif
diff --git a/chrome/browser/ui/libgtkui/BUILD.gn b/chrome/browser/ui/libgtkui/BUILD.gn index 884fc42e..7961af0 100644 --- a/chrome/browser/ui/libgtkui/BUILD.gn +++ b/chrome/browser/ui/libgtkui/BUILD.gn
@@ -82,6 +82,7 @@ defines = [ "LIBGTKUI_IMPLEMENTATION" ] deps = invoker.deps + [ + "//chrome/browser/ui/views", "//base", "//base:i18n", "//base/third_party/dynamic_annotations", @@ -126,6 +127,8 @@ if (use_gtk3) { libgtkui("libgtk3ui") { sources = [ + "gtk3_background_painter.cc", + "gtk3_background_painter.h", "native_theme_gtk3.cc", "native_theme_gtk3.h", "nav_button_layout_manager_gtk3.cc",
diff --git a/chrome/browser/ui/libgtkui/DEPS b/chrome/browser/ui/libgtkui/DEPS new file mode 100644 index 0000000..c34c810 --- /dev/null +++ b/chrome/browser/ui/libgtkui/DEPS
@@ -0,0 +1,3 @@ +include_rules = [ + "+chrome/browser/ui/views", +]
diff --git a/chrome/browser/ui/libgtkui/gtk3_background_painter.cc b/chrome/browser/ui/libgtkui/gtk3_background_painter.cc new file mode 100644 index 0000000..f11ade88 --- /dev/null +++ b/chrome/browser/ui/libgtkui/gtk3_background_painter.cc
@@ -0,0 +1,62 @@ +// Copyright 2017 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#include "chrome/browser/ui/libgtkui/gtk3_background_painter.h" + +#include "ui/gfx/canvas.h" +#include "ui/views/controls/button/button.h" +#include "ui/views/view.h" +#include "ui/views/widget/widget.h" + +namespace libgtkui { + +namespace { + +GtkStateFlags ButtonStateToStateFlags(views::Button::ButtonState state) { + switch (state) { + case views::Button::STATE_DISABLED: + return GTK_STATE_FLAG_INSENSITIVE; + case views::Button::STATE_HOVERED: + return GTK_STATE_FLAG_PRELIGHT; + case views::Button::STATE_NORMAL: + return GTK_STATE_FLAG_NORMAL; + case views::Button::STATE_PRESSED: + return static_cast<GtkStateFlags>(GTK_STATE_FLAG_PRELIGHT | + GTK_STATE_FLAG_ACTIVE); + default: + NOTREACHED(); + return GTK_STATE_FLAG_NORMAL; + } +} + +} // namespace + +Gtk3BackgroundPainter::Gtk3BackgroundPainter(const views::Button* button, + ScopedStyleContext context) + : button_(button), context_(std::move(context)) {} + +Gtk3BackgroundPainter::~Gtk3BackgroundPainter() {} + +void Gtk3BackgroundPainter::Paint(gfx::Canvas* canvas, + views::View* view) const { + SkBitmap bitmap; + bitmap.allocN32Pixels(view->width(), view->height()); + bitmap.eraseColor(0); + CairoSurface surface(bitmap); + gtk_style_context_set_state(context_, CalculateStateFlags()); + gtk_render_background(context_, surface.cairo(), 0, 0, view->width(), + view->height()); + gtk_render_frame(context_, surface.cairo(), 0, 0, view->width(), + view->height()); + canvas->DrawImageInt(gfx::ImageSkia::CreateFrom1xBitmap(bitmap), 0, 0); +} + +GtkStateFlags Gtk3BackgroundPainter::CalculateStateFlags() const { + GtkStateFlags state = ButtonStateToStateFlags(button_->state()); + if (!button_->GetWidget()->IsActive()) + state = static_cast<GtkStateFlags>(state | GTK_STATE_FLAG_BACKDROP); + return state; +} + +} // namespace libgtkui
diff --git a/chrome/browser/ui/libgtkui/gtk3_background_painter.h b/chrome/browser/ui/libgtkui/gtk3_background_painter.h new file mode 100644 index 0000000..7af7a51b --- /dev/null +++ b/chrome/browser/ui/libgtkui/gtk3_background_painter.h
@@ -0,0 +1,40 @@ +// Copyright 2017 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#ifndef CHROME_BROWSER_UI_LIBGTKUI_GTK3_BACKGROUND_PAINTER_H_ +#define CHROME_BROWSER_UI_LIBGTKUI_GTK3_BACKGROUND_PAINTER_H_ + +#include "base/macros.h" +#include "chrome/browser/ui/libgtkui/gtk_util.h" +#include "ui/views/background.h" + +namespace views { +class Button; +} + +namespace libgtkui { + +// A background that paints a button using GTK foreign drawing. The +// type and style of widget to be drawn is decided by a +// GtkStyleContext. Always renders a background and a frame. +class Gtk3BackgroundPainter : public views::Background { + public: + Gtk3BackgroundPainter(const views::Button* button, + ScopedStyleContext context); + ~Gtk3BackgroundPainter() override; + + void Paint(gfx::Canvas* canvas, views::View* view) const override; + + private: + GtkStateFlags CalculateStateFlags() const; + + const views::Button* button_; + mutable ScopedStyleContext context_; + + DISALLOW_COPY_AND_ASSIGN(Gtk3BackgroundPainter); +}; + +} // namespace libgtkui + +#endif // CHROME_BROWSER_UI_LIBGTKUI_GTK3_BACKGROUND_PAINTER_H_
diff --git a/chrome/browser/ui/libgtkui/gtk_ui.cc b/chrome/browser/ui/libgtkui/gtk_ui.cc index 3d984097f..34e1b18f 100644 --- a/chrome/browser/ui/libgtkui/gtk_ui.cc +++ b/chrome/browser/ui/libgtkui/gtk_ui.cc
@@ -62,7 +62,6 @@ #include "ui/views/linux_ui/device_scale_factor_observer.h" #include "ui/views/linux_ui/window_button_order_observer.h" #include "ui/views/resources/grit/views_resources.h" -#include "ui/views/window/nav_button_provider.h" #if GTK_MAJOR_VERSION == 2 #include "chrome/browser/ui/libgtkui/native_theme_gtk2.h" // nogncheck @@ -76,6 +75,10 @@ #include "printing/printing_context_linux.h" #endif +#if BUILDFLAG(ENABLE_NATIVE_WINDOW_NAV_BUTTONS) +#include "chrome/browser/ui/views/nav_button_provider.h" +#endif + #if defined(USE_GCONF) #include "chrome/browser/ui/libgtkui/nav_button_layout_manager_gconf.h" #endif @@ -789,13 +792,13 @@ device_scale_factor_observer_list_.RemoveObserver(observer); } +#if BUILDFLAG(ENABLE_NATIVE_WINDOW_NAV_BUTTONS) std::unique_ptr<views::NavButtonProvider> GtkUi::CreateNavButtonProvider() { -#if GTK_MAJOR_VERSION >= 3 if (GtkVersionCheck(3, 14)) return base::MakeUnique<libgtkui::NavButtonProviderGtk3>(); -#endif return nullptr; } +#endif bool GtkUi::MatchEvent(const ui::Event& event, std::vector<ui::TextEditCommandAuraLinux>* commands) {
diff --git a/chrome/browser/ui/libgtkui/gtk_ui.h b/chrome/browser/ui/libgtkui/gtk_ui.h index 80522ee7..dc940052 100644 --- a/chrome/browser/ui/libgtkui/gtk_ui.h +++ b/chrome/browser/ui/libgtkui/gtk_ui.h
@@ -12,6 +12,7 @@ #include "base/compiler_specific.h" #include "base/macros.h" #include "base/observer_list.h" +#include "build/buildflag.h" #include "chrome/browser/ui/libgtkui/gtk_signal.h" #include "chrome/browser/ui/libgtkui/libgtkui_export.h" #include "ui/gfx/color_utils.h" @@ -104,7 +105,9 @@ views::DeviceScaleFactorObserver* observer) override; void RemoveDeviceScaleFactorObserver( views::DeviceScaleFactorObserver* observer) override; +#if BUILDFLAG(ENABLE_NATIVE_WINDOW_NAV_BUTTONS) std::unique_ptr<views::NavButtonProvider> CreateNavButtonProvider() override; +#endif // ui::TextEditKeybindingDelegate: bool MatchEvent(const ui::Event& event,
diff --git a/chrome/browser/ui/libgtkui/native_theme_gtk3.cc b/chrome/browser/ui/libgtkui/native_theme_gtk3.cc index 38773db..4f10ff7 100644 --- a/chrome/browser/ui/libgtkui/native_theme_gtk3.cc +++ b/chrome/browser/ui/libgtkui/native_theme_gtk3.cc
@@ -417,6 +417,7 @@ g_type_class_unref(g_type_class_ref(gtk_separator_get_type())); g_type_class_unref(g_type_class_ref(gtk_spinner_get_type())); g_type_class_unref(g_type_class_ref(gtk_text_view_get_type())); + g_type_class_unref(g_type_class_ref(gtk_toggle_button_get_type())); g_type_class_unref(g_type_class_ref(gtk_tree_view_get_type())); g_type_class_unref(g_type_class_ref(gtk_window_get_type()));
diff --git a/chrome/browser/ui/libgtkui/nav_button_provider_gtk3.cc b/chrome/browser/ui/libgtkui/nav_button_provider_gtk3.cc index f394062c..2fda9a9c 100644 --- a/chrome/browser/ui/libgtkui/nav_button_provider_gtk3.cc +++ b/chrome/browser/ui/libgtkui/nav_button_provider_gtk3.cc
@@ -6,11 +6,13 @@ #include <gtk/gtk.h> +#include "chrome/browser/ui/libgtkui/gtk3_background_painter.h" #include "chrome/browser/ui/libgtkui/gtk_util.h" #include "ui/base/glib/scoped_gobject.h" #include "ui/gfx/image/image_skia.h" #include "ui/gfx/image/image_skia_source.h" #include "ui/views/resources/grit/views_resources.h" +#include "ui/views/widget/widget.h" namespace libgtkui { @@ -156,6 +158,16 @@ MarginFromStyleContext(button_context, GTK_STATE_FLAG_NORMAL); } +ScopedStyleContext CreateHeaderContext() { + return GetStyleContextFromCss("GtkHeaderBar#headerbar.header-bar.titlebar"); +} + +ScopedStyleContext CreateAvatarButtonContext(GtkStyleContext* header_context) { + return AppendCssNodeToStyleContext( + header_context, GtkVersionCheck(3, 20) ? "GtkButton#button.toggle" + : "GtkToggleButton#button"); +} + class NavButtonImageSource : public gfx::ImageSkiaSource { public: NavButtonImageSource(chrome::FrameButtonDisplayType type, @@ -246,8 +258,7 @@ void NavButtonProviderGtk3::RedrawImages(int top_area_height, bool maximized, bool active) { - auto header_context = - GetStyleContextFromCss("GtkHeaderBar#headerbar.header-bar.titlebar"); + auto header_context = CreateHeaderContext(); GtkBorder header_padding; gtk_style_context_get_padding(header_context, GTK_STATE_FLAG_NORMAL, @@ -342,4 +353,84 @@ return inter_button_spacing_; } +std::unique_ptr<views::Background> +NavButtonProviderGtk3::CreateAvatarButtonBackground( + const views::Button* avatar_button) const { + auto header_context = CreateHeaderContext(); + auto button_context = CreateAvatarButtonContext(header_context); + return std::make_unique<Gtk3BackgroundPainter>(avatar_button, + std::move(button_context)); +} + +void NavButtonProviderGtk3::CalculateCaptionButtonLayout( + const gfx::Size& content_size, + int top_area_height, + gfx::Size* caption_button_size, + gfx::Insets* caption_button_spacing) const { + auto header_context = CreateHeaderContext(); + gfx::InsetsF header_padding = + PaddingFromStyleContext(header_context, GTK_STATE_FLAG_NORMAL); + gfx::InsetsF header_border = + BorderFromStyleContext(header_context, GTK_STATE_FLAG_NORMAL); + + auto button_context = CreateAvatarButtonContext(header_context); + gfx::InsetsF button_padding = + PaddingFromStyleContext(button_context, GTK_STATE_FLAG_NORMAL); + gfx::InsetsF button_border = + BorderFromStyleContext(button_context, GTK_STATE_FLAG_NORMAL); + gfx::InsetsF button_margin = + MarginFromStyleContext(button_context, GTK_STATE_FLAG_NORMAL); + + float additional_button_width = 0.0f; + float additional_button_height = 0.0f; + if (GtkVersionCheck(3, 20)) { + int min_width, min_height; + gtk_style_context_get(button_context, GTK_STATE_FLAG_NORMAL, "min-width", + &min_width, "min-height", &min_height, NULL); + additional_button_width = std::max(0, min_width - content_size.width()); + additional_button_height = std::max(0, min_height - content_size.height()); + } + + gfx::InsetsF scalable_insets = header_padding + header_border + + button_padding + button_border + button_margin; + int scalable_height = scalable_insets.top() + scalable_insets.bottom() + + additional_button_height; + + float scale = content_size.height() + scalable_height > top_area_height && + scalable_height != 0 + ? (top_area_height - content_size.height()) / + static_cast<float>(scalable_height) + : 1.0f; + header_padding = header_padding.Scale(scale); + header_border = header_border.Scale(scale); + button_padding = button_padding.Scale(scale); + button_border = button_border.Scale(scale); + button_margin = button_margin.Scale(scale); + additional_button_width *= scale; + additional_button_height *= scale; + + float button_height = content_size.height() + additional_button_height + + button_border.top() + button_border.bottom() + + button_padding.top() + button_padding.bottom(); + float button_height_with_margin = + button_height + button_margin.top() + button_margin.bottom(); + float shiftable_region_start = header_border.top() + header_padding.top(); + float shiftable_region_end = + top_area_height - header_border.bottom() - header_padding.bottom(); + float button_offset_in_shiftable_region = + (shiftable_region_end - shiftable_region_start - + button_height_with_margin) / + 2; + + *caption_button_size = + gfx::Size(content_size.width() + additional_button_width + + button_border.left() + button_border.right() + + button_padding.left() + button_padding.right() + 0.5f, + button_height + 0.5f); + *caption_button_spacing = + gfx::Insets(shiftable_region_start + button_margin.top() + + button_offset_in_shiftable_region + 0.5f, + button_margin.left() + 0.5f, 0, button_margin.right() + 0.5f); +} + } // namespace libgtkui
diff --git a/chrome/browser/ui/libgtkui/nav_button_provider_gtk3.h b/chrome/browser/ui/libgtkui/nav_button_provider_gtk3.h index 3d996dc..a0fc0cd 100644 --- a/chrome/browser/ui/libgtkui/nav_button_provider_gtk3.h +++ b/chrome/browser/ui/libgtkui/nav_button_provider_gtk3.h
@@ -9,9 +9,9 @@ #include "chrome/browser/ui/frame_button_display_types.h" #include "chrome/browser/ui/libgtkui/libgtkui_export.h" +#include "chrome/browser/ui/views/nav_button_provider.h" #include "ui/gfx/image/image_skia.h" #include "ui/views/controls/button/button.h" -#include "ui/views/window/nav_button_provider.h" namespace libgtkui { @@ -28,6 +28,13 @@ chrome::FrameButtonDisplayType type) const override; gfx::Insets GetTopAreaSpacing() const override; int GetInterNavButtonSpacing() const override; + std::unique_ptr<views::Background> CreateAvatarButtonBackground( + const views::Button* avatar_button) const override; + void CalculateCaptionButtonLayout( + const gfx::Size& content_size, + int top_area_height, + gfx::Size* caption_button_size, + gfx::Insets* caption_button_spacing) const override; private: std::map<chrome::FrameButtonDisplayType,
diff --git a/chrome/browser/ui/views/BUILD.gn b/chrome/browser/ui/views/BUILD.gn index 4f3d646..db6b035 100644 --- a/chrome/browser/ui/views/BUILD.gn +++ b/chrome/browser/ui/views/BUILD.gn
@@ -3,6 +3,7 @@ # found in the LICENSE file. import("//build/config/ui.gni") +import("//ui/views/features.gni") assert(toolkit_views) @@ -42,4 +43,12 @@ if (is_chromeos) { deps += [ "//ash" ] } + + if (enable_native_window_nav_buttons) { + sources += [ "nav_button_provider.h" ] + deps += [ + "//ui/views", + "//ui/views:features", + ] + } }
diff --git a/chrome/browser/ui/views/frame/avatar_button_manager.cc b/chrome/browser/ui/views/frame/avatar_button_manager.cc index 442243c..bfa1246 100644 --- a/chrome/browser/ui/views/frame/avatar_button_manager.cc +++ b/chrome/browser/ui/views/frame/avatar_button_manager.cc
@@ -31,7 +31,7 @@ // Desktop guest shows the avatar button. browser_view->IsIncognito()) { if (!view_) { - view_ = new AvatarButton(this, style, profile); + view_ = new AvatarButton(this, style, profile, this); view_->set_id(VIEW_ID_AVATAR_BUTTON); frame_view_->AddChildView(view_); frame->GetRootView()->Layout();
diff --git a/chrome/browser/ui/views/frame/avatar_button_manager.h b/chrome/browser/ui/views/frame/avatar_button_manager.h index 0f618d9..0d50d1b 100644 --- a/chrome/browser/ui/views/frame/avatar_button_manager.h +++ b/chrome/browser/ui/views/frame/avatar_button_manager.h
@@ -7,6 +7,13 @@ #include "chrome/browser/ui/views/profiles/avatar_button_style.h" #include "ui/views/controls/button/button.h" +#include "ui/views/features.h" + +#if BUILDFLAG(ENABLE_NATIVE_WINDOW_NAV_BUTTONS) +namespace views { +class NavButtonProvider; +} +#endif class BrowserNonClientFrameView; @@ -26,6 +33,15 @@ // views::ButtonListener: void ButtonPressed(views::Button* sender, const ui::Event& event) override; +#if BUILDFLAG(ENABLE_NATIVE_WINDOW_NAV_BUTTONS) + views::NavButtonProvider* get_nav_button_provider() { + return nav_button_provider_; + } + void set_nav_button_provider(views::NavButtonProvider* nav_button_provider) { + nav_button_provider_ = nav_button_provider; + } +#endif + private: BrowserNonClientFrameView* frame_view_; // Weak. Owns |this|. @@ -33,6 +49,10 @@ // May be null and will not be displayed for off the record profiles. views::View* view_; // Owned by views hierarchy. +#if BUILDFLAG(ENABLE_NATIVE_WINDOW_NAV_BUTTONS) + views::NavButtonProvider* nav_button_provider_ = nullptr; +#endif + DISALLOW_COPY_AND_ASSIGN(AvatarButtonManager); };
diff --git a/chrome/browser/ui/views/frame/browser_non_client_frame_view_factory_views.cc b/chrome/browser/ui/views/frame/browser_non_client_frame_view_factory_views.cc index 4eb1bb0..ee5b465 100644 --- a/chrome/browser/ui/views/frame/browser_non_client_frame_view_factory_views.cc +++ b/chrome/browser/ui/views/frame/browser_non_client_frame_view_factory_views.cc
@@ -3,8 +3,11 @@ // found in the LICENSE file. #include "build/build_config.h" +#include "chrome/browser/themes/theme_service.h" +#include "chrome/browser/themes/theme_service_factory.h" #include "chrome/browser/ui/views/frame/browser_view.h" #include "chrome/browser/ui/views/frame/opaque_browser_frame_view.h" +#include "chrome/browser/ui/views/frame/opaque_browser_frame_view_layout.h" #if defined(USE_AURA) #include "chrome/browser/ui/views/frame/browser_non_client_frame_view_mus.h" @@ -15,6 +18,16 @@ #include "chrome/browser/ui/views/frame/glass_browser_frame_view.h" #endif +#if defined(OS_LINUX) && !defined(OS_CHROMEOS) +#include "ui/views/linux_ui/linux_ui.h" +#endif + +#if BUILDFLAG(ENABLE_NATIVE_WINDOW_NAV_BUTTONS) +#include "chrome/browser/ui/views/frame/desktop_linux_browser_frame_view.h" +#include "chrome/browser/ui/views/frame/desktop_linux_browser_frame_view_layout.h" +#include "chrome/browser/ui/views/nav_button_provider.h" +#endif + namespace chrome { BrowserNonClientFrameView* CreateBrowserNonClientFrameView( @@ -32,7 +45,24 @@ if (frame->ShouldUseNativeFrame()) return new GlassBrowserFrameView(frame, browser_view); #endif - return new OpaqueBrowserFrameView(frame, browser_view); +#if BUILDFLAG(ENABLE_NATIVE_WINDOW_NAV_BUTTONS) + std::unique_ptr<views::NavButtonProvider> nav_button_provider; +#if defined(OS_LINUX) && !defined(OS_CHROMEOS) + if (ThemeServiceFactory::GetForProfile(browser_view->browser()->profile()) + ->UsingSystemTheme() && + views::LinuxUI::instance()) { + nav_button_provider = views::LinuxUI::instance()->CreateNavButtonProvider(); + } +#endif + if (nav_button_provider) { + return new DesktopLinuxBrowserFrameView( + frame, browser_view, + new DesktopLinuxBrowserFrameViewLayout(nav_button_provider.get()), + std::move(nav_button_provider)); + } +#endif + return new OpaqueBrowserFrameView(frame, browser_view, + new OpaqueBrowserFrameViewLayout()); } } // namespace chrome
diff --git a/chrome/browser/ui/views/frame/desktop_linux_browser_frame_view.cc b/chrome/browser/ui/views/frame/desktop_linux_browser_frame_view.cc new file mode 100644 index 0000000..7a61ab0 --- /dev/null +++ b/chrome/browser/ui/views/frame/desktop_linux_browser_frame_view.cc
@@ -0,0 +1,61 @@ +// Copyright 2017 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#include "chrome/browser/ui/views/frame/desktop_linux_browser_frame_view.h" + +#include "base/command_line.h" +#include "chrome/browser/ui/views/frame/desktop_linux_browser_frame_view_layout.h" +#include "chrome/browser/ui/views/nav_button_provider.h" +#include "chrome/common/chrome_switches.h" +#include "ui/views/controls/button/image_button.h" + +DesktopLinuxBrowserFrameView::DesktopLinuxBrowserFrameView( + BrowserFrame* frame, + BrowserView* browser_view, + OpaqueBrowserFrameViewLayout* layout, + std::unique_ptr<views::NavButtonProvider> nav_button_provider) + : OpaqueBrowserFrameView(frame, browser_view, layout), + nav_button_provider_(std::move(nav_button_provider)) { + if (base::CommandLine::ForCurrentProcess()->HasSwitch( + switches::kEnableNativeAvatarButton)) { + profile_switcher_.set_nav_button_provider(nav_button_provider_.get()); + } +} + +DesktopLinuxBrowserFrameView::~DesktopLinuxBrowserFrameView() {} + +void DesktopLinuxBrowserFrameView::MaybeRedrawFrameButtons() { + nav_button_provider_->RedrawImages(GetTopAreaHeight(), IsMaximized(), + ShouldPaintAsActive()); + for (auto type : { + chrome::FrameButtonDisplayType::kMinimize, + IsMaximized() ? chrome::FrameButtonDisplayType::kRestore + : chrome::FrameButtonDisplayType::kMaximize, + chrome::FrameButtonDisplayType::kClose, + }) { + for (size_t state = 0; state < views::Button::STATE_COUNT; state++) { + views::Button::ButtonState button_state = + static_cast<views::Button::ButtonState>(state); + GetButtonFromDisplayType(type)->SetImage( + button_state, nav_button_provider_->GetImage(type, button_state)); + } + } +} + +views::ImageButton* DesktopLinuxBrowserFrameView::GetButtonFromDisplayType( + chrome::FrameButtonDisplayType type) { + switch (type) { + case chrome::FrameButtonDisplayType::kMinimize: + return minimize_button(); + case chrome::FrameButtonDisplayType::kMaximize: + return maximize_button(); + case chrome::FrameButtonDisplayType::kRestore: + return restore_button(); + case chrome::FrameButtonDisplayType::kClose: + return close_button(); + default: + NOTREACHED(); + return nullptr; + } +}
diff --git a/chrome/browser/ui/views/frame/desktop_linux_browser_frame_view.h b/chrome/browser/ui/views/frame/desktop_linux_browser_frame_view.h new file mode 100644 index 0000000..b89977f4 --- /dev/null +++ b/chrome/browser/ui/views/frame/desktop_linux_browser_frame_view.h
@@ -0,0 +1,36 @@ +// Copyright 2017 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#ifndef CHROME_BROWSER_UI_VIEWS_FRAME_DESKTOP_LINUX_BROWSER_FRAME_VIEW_H_ +#define CHROME_BROWSER_UI_VIEWS_FRAME_DESKTOP_LINUX_BROWSER_FRAME_VIEW_H_ + +#include "chrome/browser/ui/views/frame/opaque_browser_frame_view.h" + +// A specialization of OpaqueBrowserFrameView that is also able to +// render frame buttons using GTK. +class DesktopLinuxBrowserFrameView : public OpaqueBrowserFrameView { + public: + DesktopLinuxBrowserFrameView( + BrowserFrame* frame, + BrowserView* browser_view, + OpaqueBrowserFrameViewLayout* layout, + std::unique_ptr<views::NavButtonProvider> nav_button_provider); + ~DesktopLinuxBrowserFrameView() override; + + protected: + // OpaqueBrowserFrameView: + void MaybeRedrawFrameButtons() override; + + private: + // Returns one of |{minimize,maximize,restore,close}_button_| + // corresponding to |type|. + views::ImageButton* GetButtonFromDisplayType( + chrome::FrameButtonDisplayType type); + + std::unique_ptr<views::NavButtonProvider> nav_button_provider_; + + DISALLOW_COPY_AND_ASSIGN(DesktopLinuxBrowserFrameView); +}; + +#endif // CHROME_BROWSER_UI_VIEWS_FRAME_DESKTOP_LINUX_BROWSER_FRAME_VIEW_H_
diff --git a/chrome/browser/ui/views/frame/desktop_linux_browser_frame_view_layout.cc b/chrome/browser/ui/views/frame/desktop_linux_browser_frame_view_layout.cc new file mode 100644 index 0000000..4fc7ad5 --- /dev/null +++ b/chrome/browser/ui/views/frame/desktop_linux_browser_frame_view_layout.cc
@@ -0,0 +1,74 @@ +// Copyright 2017 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#include "chrome/browser/ui/views/frame/desktop_linux_browser_frame_view_layout.h" + +#include "base/command_line.h" +#include "chrome/browser/ui/views/nav_button_provider.h" +#include "chrome/common/chrome_switches.h" + +DesktopLinuxBrowserFrameViewLayout::DesktopLinuxBrowserFrameViewLayout( + views::NavButtonProvider* nav_button_provider) + : nav_button_provider_(nav_button_provider) {} + +int DesktopLinuxBrowserFrameViewLayout::CaptionButtonY( + chrome::FrameButtonDisplayType button_id, + bool restored) const { + gfx::Insets insets = nav_button_provider_->GetNavButtonMargin(button_id); + return insets.top(); +} + +int DesktopLinuxBrowserFrameViewLayout::TopAreaPadding() const { + return nav_button_provider_->GetTopAreaSpacing().left(); +} + +int DesktopLinuxBrowserFrameViewLayout::GetWindowCaptionSpacing( + views::FrameButton button_id, + bool leading_spacing, + bool is_leading_button) const { + gfx::Insets insets = + nav_button_provider_->GetNavButtonMargin(GetButtonDisplayType(button_id)); + if (!leading_spacing) + return insets.right(); + int spacing = insets.left(); + if (!is_leading_button) + spacing += nav_button_provider_->GetInterNavButtonSpacing(); + return spacing; +} + +void DesktopLinuxBrowserFrameViewLayout::LayoutNewStyleAvatar( + views::View* host) { + if (!new_avatar_button_) + return; + + if (!base::CommandLine::ForCurrentProcess()->HasSwitch( + switches::kEnableNativeAvatarButton)) { + OpaqueBrowserFrameViewLayout::LayoutNewStyleAvatar(host); + return; + } + gfx::Size button_size; + gfx::Insets button_spacing; + nav_button_provider_->CalculateCaptionButtonLayout( + new_avatar_button_->GetPreferredSize(), delegate_->GetTopAreaHeight(), + &button_size, &button_spacing); + int inter_button_spacing = nav_button_provider_->GetInterNavButtonSpacing(); + + int total_width = + button_size.width() + button_spacing.right() + inter_button_spacing; + + int button_x = host->width() - trailing_button_start_ - total_width; + int button_y = button_spacing.top(); + + minimum_size_for_buttons_ += total_width; + trailing_button_start_ += total_width; + + new_avatar_button_->SetBounds(button_x, button_y, button_size.width(), + button_size.height()); +} + +bool DesktopLinuxBrowserFrameViewLayout::ShouldDrawImageMirrored( + views::ImageButton* button, + ButtonAlignment alignment) const { + return false; +}
diff --git a/chrome/browser/ui/views/frame/desktop_linux_browser_frame_view_layout.h b/chrome/browser/ui/views/frame/desktop_linux_browser_frame_view_layout.h new file mode 100644 index 0000000..49f881f --- /dev/null +++ b/chrome/browser/ui/views/frame/desktop_linux_browser_frame_view_layout.h
@@ -0,0 +1,34 @@ +// Copyright 2017 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#ifndef CHROME_BROWSER_UI_VIEWS_FRAME_DESKTOP_LINUX_BROWSER_FRAME_VIEW_LAYOUT_H_ +#define CHROME_BROWSER_UI_VIEWS_FRAME_DESKTOP_LINUX_BROWSER_FRAME_VIEW_LAYOUT_H_ + +#include "chrome/browser/ui/views/frame/opaque_browser_frame_view_layout.h" + +// A specialization of OpaqueBrowserFrameViewLayout that is also able +// to layout frame buttons that were rendered by GTK. +class DesktopLinuxBrowserFrameViewLayout : public OpaqueBrowserFrameViewLayout { + public: + DesktopLinuxBrowserFrameViewLayout( + views::NavButtonProvider* nav_button_provider); + + // OpaqueBrowserFrameViewLayout: + int CaptionButtonY(chrome::FrameButtonDisplayType button_id, + bool restored) const override; + int TopAreaPadding() const override; + int GetWindowCaptionSpacing(views::FrameButton button_id, + bool leading_spacing, + bool is_leading_button) const override; + void LayoutNewStyleAvatar(views::View* host) override; + bool ShouldDrawImageMirrored(views::ImageButton* button, + ButtonAlignment alignment) const override; + + private: + views::NavButtonProvider* nav_button_provider_; + + DISALLOW_COPY_AND_ASSIGN(DesktopLinuxBrowserFrameViewLayout); +}; + +#endif // CHROME_BROWSER_UI_VIEWS_FRAME_DESKTOP_LINUX_BROWSER_FRAME_VIEW_LAYOUT_H_
diff --git a/chrome/browser/ui/views/frame/desktop_linux_browser_frame_view_layout_unittest.cc b/chrome/browser/ui/views/frame/desktop_linux_browser_frame_view_layout_unittest.cc new file mode 100644 index 0000000..4a55546 --- /dev/null +++ b/chrome/browser/ui/views/frame/desktop_linux_browser_frame_view_layout_unittest.cc
@@ -0,0 +1,238 @@ +// Copyright 2017 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#include "chrome/browser/ui/views/frame/desktop_linux_browser_frame_view_layout.h" + +#include "base/macros.h" +#include "chrome/browser/ui/views/nav_button_provider.h" +#include "chrome/browser/ui/views/tabs/tab.h" +#include "ui/views/background.h" +#include "ui/views/controls/button/image_button.h" +#include "ui/views/test/views_test_base.h" + +using NNBFVL = DesktopLinuxBrowserFrameViewLayout; + +namespace { + +constexpr int kWindowWidth = 500; + +constexpr gfx::Size kCloseButtonSize = gfx::Size(2, 3); +constexpr gfx::Size kMaximizeButtonSize = gfx::Size(5, 7); +constexpr gfx::Size kMinimizeButtonSize = gfx::Size(11, 13); + +constexpr gfx::Insets kCloseButtonMargin = gfx::Insets(17, 19, 23, 29); +constexpr gfx::Insets kMaximizeButtonMargin = gfx::Insets(31, 37, 41, 43); +constexpr gfx::Insets kMinimizeButtonMargin = gfx::Insets(47, 53, 59, 61); + +constexpr gfx::Insets kTopAreaSpacing = gfx::Insets(67, 71, 73, 79); + +constexpr int kInterNavButtonSpacing = 83; + +static gfx::ImageSkia GetTestImageForSize(gfx::Size size) { + SkBitmap bitmap; + bitmap.allocN32Pixels(size.width(), size.height()); + return gfx::ImageSkia::CreateFrom1xBitmap(bitmap); +} + +class TestLayoutDelegate : public OpaqueBrowserFrameViewLayoutDelegate { + public: + TestLayoutDelegate() {} + ~TestLayoutDelegate() override {} + + // OpaqueBrowserFrameViewLayoutDelegate: + bool ShouldShowWindowIcon() const override { return false; } + bool ShouldShowWindowTitle() const override { return false; } + base::string16 GetWindowTitle() const override { return base::string16(); } + int GetIconSize() const override { return 17; } + gfx::Size GetBrowserViewMinimumSize() const override { + return gfx::Size(168, 64); + } + bool ShouldShowCaptionButtons() const override { return true; } + bool IsRegularOrGuestSession() const override { return true; } + gfx::ImageSkia GetIncognitoAvatarIcon() const override { + return gfx::ImageSkia(); + } + bool IsMaximized() const override { return false; } + bool IsMinimized() const override { return false; } + bool IsFullscreen() const override { return false; } + bool IsTabStripVisible() const override { return true; } + int GetTabStripHeight() const override { + return Tab::GetMinimumInactiveSize().height(); + } + bool IsToolbarVisible() const override { return true; } + gfx::Size GetTabstripPreferredSize() const override { + return gfx::Size(78, 29); + } + int GetTopAreaHeight() const override { return 0; } + + private: + DISALLOW_COPY_AND_ASSIGN(TestLayoutDelegate); +}; + +class TestNavButtonProvider : public views::NavButtonProvider { + public: + TestNavButtonProvider() {} + + ~TestNavButtonProvider() override {} + + void RedrawImages(int top_area_height, bool maximized, bool active) override { + ASSERT_EQ(false, maximized); // This only tests the restored state. + } + + gfx::ImageSkia GetImage(chrome::FrameButtonDisplayType type, + views::Button::ButtonState state) const override { + switch (type) { + case chrome::FrameButtonDisplayType::kClose: + return GetTestImageForSize(kCloseButtonSize); + case chrome::FrameButtonDisplayType::kMaximize: + return GetTestImageForSize(kMaximizeButtonSize); + case chrome::FrameButtonDisplayType::kMinimize: + return GetTestImageForSize(kMinimizeButtonSize); + default: + NOTREACHED(); + return gfx::ImageSkia(); + } + } + + gfx::Insets GetNavButtonMargin( + chrome::FrameButtonDisplayType type) const override { + switch (type) { + case chrome::FrameButtonDisplayType::kClose: + return kCloseButtonMargin; + case chrome::FrameButtonDisplayType::kMaximize: + return kMaximizeButtonMargin; + case chrome::FrameButtonDisplayType::kMinimize: + return kMinimizeButtonMargin; + default: + NOTREACHED(); + return gfx::Insets(); + } + } + + gfx::Insets GetTopAreaSpacing() const override { return kTopAreaSpacing; } + + int GetInterNavButtonSpacing() const override { + return kInterNavButtonSpacing; + } + + std::unique_ptr<views::Background> CreateAvatarButtonBackground( + const views::Button* avatar_button) const override { + return nullptr; + } + + void CalculateCaptionButtonLayout( + const gfx::Size& content_size, + int top_area_height, + gfx::Size* caption_button_size, + gfx::Insets* caption_button_spacing) const override {} +}; + +} // namespace + +class DesktopLinuxBrowserFrameViewLayoutTest : public views::ViewsTestBase { + public: + DesktopLinuxBrowserFrameViewLayoutTest() {} + ~DesktopLinuxBrowserFrameViewLayoutTest() override {} + + void SetUp() override { + views::ViewsTestBase::SetUp(); + + delegate_.reset(new TestLayoutDelegate); + nav_button_provider_ = base::MakeUnique<::TestNavButtonProvider>(); + layout_manager_ = new NNBFVL(nav_button_provider_.get()); + layout_manager_->set_delegate(delegate_.get()); + layout_manager_->set_extra_caption_y(0); + layout_manager_->set_forced_window_caption_spacing_for_test(0); + widget_ = new views::Widget; + widget_->Init(CreateParams(views::Widget::InitParams::TYPE_POPUP)); + root_view_ = widget_->GetRootView(); + root_view_->SetSize(gfx::Size(kWindowWidth, kWindowWidth)); + root_view_->SetLayoutManager(layout_manager_); + + minimize_button_ = InitWindowCaptionButton(VIEW_ID_MINIMIZE_BUTTON); + maximize_button_ = InitWindowCaptionButton(VIEW_ID_MAXIMIZE_BUTTON); + restore_button_ = InitWindowCaptionButton(VIEW_ID_RESTORE_BUTTON); + close_button_ = InitWindowCaptionButton(VIEW_ID_CLOSE_BUTTON); + } + + void TearDown() override { + widget_->CloseNow(); + + views::ViewsTestBase::TearDown(); + } + + protected: + views::ImageButton* InitWindowCaptionButton(ViewID view_id) { + views::ImageButton* button = new views::ImageButton(nullptr); + button->set_id(view_id); + root_view_->AddChildView(button); + return button; + } + + void ResetNativeNavButtonImagesFromButtonProvider() { + std::vector<views::ImageButton*> buttons{close_button_, maximize_button_, + minimize_button_}; + std::vector<chrome::FrameButtonDisplayType> button_types{ + chrome::FrameButtonDisplayType::kClose, + chrome::FrameButtonDisplayType::kMaximize, + chrome::FrameButtonDisplayType::kMinimize}; + for (size_t i = 0; i < buttons.size(); i++) { + for (views::Button::ButtonState state : + {views::Button::STATE_NORMAL, views ::Button::STATE_HOVERED, + views::Button::STATE_PRESSED}) { + buttons[i]->SetImage( + state, nav_button_provider_->GetImage(button_types[i], state)); + } + } + } + + views::Widget* widget_ = nullptr; + views::View* root_view_ = nullptr; + NNBFVL* layout_manager_ = nullptr; + std::unique_ptr<TestLayoutDelegate> delegate_; + std::unique_ptr<views::NavButtonProvider> nav_button_provider_; + + // Widgets: + views::ImageButton* minimize_button_ = nullptr; + views::ImageButton* maximize_button_ = nullptr; + views::ImageButton* restore_button_ = nullptr; + views::ImageButton* close_button_ = nullptr; + + DISALLOW_COPY_AND_ASSIGN(DesktopLinuxBrowserFrameViewLayoutTest); +}; + +// Tests layout of native navigation buttons. +TEST_F(DesktopLinuxBrowserFrameViewLayoutTest, NativeNavButtons) { + std::vector<views::FrameButton> leading_buttons; + std::vector<views::FrameButton> trailing_buttons; + leading_buttons.push_back(views::FRAME_BUTTON_CLOSE); + leading_buttons.push_back(views::FRAME_BUTTON_MAXIMIZE); + leading_buttons.push_back(views::FRAME_BUTTON_MINIMIZE); + layout_manager_->SetButtonOrdering(leading_buttons, trailing_buttons); + ResetNativeNavButtonImagesFromButtonProvider(); + + root_view_->Layout(); + + int x = 0; + + // Close button. + EXPECT_EQ(kCloseButtonSize, close_button_->size()); + x += kTopAreaSpacing.left() + kCloseButtonMargin.left(); + EXPECT_EQ(x, close_button_->x()); + EXPECT_EQ(kCloseButtonMargin.top(), close_button_->y()); + + // Maximize button. + EXPECT_EQ(kMaximizeButtonSize, maximize_button_->size()); + x += kCloseButtonSize.width() + kCloseButtonMargin.right() + + kInterNavButtonSpacing + kMaximizeButtonMargin.left(); + EXPECT_EQ(x, maximize_button_->x()); + EXPECT_EQ(kMaximizeButtonMargin.top(), maximize_button_->y()); + + // Minimize button. + EXPECT_EQ(kMinimizeButtonSize, minimize_button_->size()); + x += kMaximizeButtonSize.width() + kMaximizeButtonMargin.right() + + kInterNavButtonSpacing + kMinimizeButtonMargin.left(); + EXPECT_EQ(x, minimize_button_->x()); + EXPECT_EQ(kMinimizeButtonMargin.top(), minimize_button_->y()); +}
diff --git a/chrome/browser/ui/views/frame/opaque_browser_frame_view.cc b/chrome/browser/ui/views/frame/opaque_browser_frame_view.cc index 545f18f..b019aad 100644 --- a/chrome/browser/ui/views/frame/opaque_browser_frame_view.cc +++ b/chrome/browser/ui/views/frame/opaque_browser_frame_view.cc
@@ -37,7 +37,6 @@ #include "ui/views/resources/grit/views_resources.h" #include "ui/views/views_delegate.h" #include "ui/views/window/frame_background.h" -#include "ui/views/window/nav_button_provider.h" #include "ui/views/window/window_shape.h" #if defined(OS_LINUX) @@ -61,18 +60,21 @@ /////////////////////////////////////////////////////////////////////////////// // OpaqueBrowserFrameView, public: -OpaqueBrowserFrameView::OpaqueBrowserFrameView(BrowserFrame* frame, - BrowserView* browser_view) +OpaqueBrowserFrameView::OpaqueBrowserFrameView( + BrowserFrame* frame, + BrowserView* browser_view, + OpaqueBrowserFrameViewLayout* layout) : BrowserNonClientFrameView(frame, browser_view), - layout_(new OpaqueBrowserFrameViewLayout(this)), + profile_switcher_(this), + layout_(layout), minimize_button_(nullptr), maximize_button_(nullptr), restore_button_(nullptr), close_button_(nullptr), window_icon_(nullptr), window_title_(nullptr), - profile_switcher_(this), frame_background_(new views::FrameBackground()) { + layout_->set_delegate(this); SetLayoutManager(layout_); minimize_button_ = InitWindowCaptionButton(IDR_MINIMIZE, @@ -122,13 +124,6 @@ platform_observer_.reset(OpaqueBrowserFrameViewPlatformSpecific::Create( this, layout_, ThemeServiceFactory::GetForProfile(browser_view->browser()->profile()))); - -#if BUILDFLAG(ENABLE_NATIVE_WINDOW_NAV_BUTTONS) - if (views::LinuxUI::instance()) { - nav_button_provider_ = - views::LinuxUI::instance()->CreateNavButtonProvider(); - } -#endif } OpaqueBrowserFrameView::~OpaqueBrowserFrameView() {} @@ -430,18 +425,6 @@ return s; } -bool OpaqueBrowserFrameView::ShouldRenderNativeNavButtons() const { -#if BUILDFLAG(ENABLE_NATIVE_WINDOW_NAV_BUTTONS) - if (!nav_button_provider_) - return false; - return ThemeServiceFactory::GetForProfile( - browser_view()->browser()->profile()) - ->UsingSystemTheme(); -#else - return false; -#endif -} - int OpaqueBrowserFrameView::GetTopAreaHeight() const { const gfx::ImageSkia frame_image = GetFrameImage(); int top_area_height = @@ -454,11 +437,6 @@ return top_area_height; } -const views::NavButtonProvider* OpaqueBrowserFrameView::GetNavButtonProvider() - const { - return nav_button_provider_.get(); -} - /////////////////////////////////////////////////////////////////////////////// // OpaqueBrowserFrameView, protected: @@ -507,6 +485,8 @@ UpdateProfileIndicatorIcon(); } +void OpaqueBrowserFrameView::MaybeRedrawFrameButtons() {} + /////////////////////////////////////////////////////////////////////////////// // OpaqueBrowserFrameView, private: @@ -673,40 +653,3 @@ side.Offset(w + kClientEdgeThickness, 0); canvas->FillRect(side, color); } - -views::ImageButton* OpaqueBrowserFrameView::GetButtonFromDisplayType( - chrome::FrameButtonDisplayType type) { - switch (type) { - case chrome::FrameButtonDisplayType::kMinimize: - return minimize_button_; - case chrome::FrameButtonDisplayType::kMaximize: - return maximize_button_; - case chrome::FrameButtonDisplayType::kRestore: - return restore_button_; - case chrome::FrameButtonDisplayType::kClose: - return close_button_; - default: - NOTREACHED(); - return nullptr; - } -} - -void OpaqueBrowserFrameView::MaybeRedrawFrameButtons() { - if (ShouldRenderNativeNavButtons()) { - nav_button_provider_->RedrawImages(GetTopAreaHeight(), IsMaximized(), - ShouldPaintAsActive()); - for (auto type : { - chrome::FrameButtonDisplayType::kMinimize, - IsMaximized() ? chrome::FrameButtonDisplayType::kRestore - : chrome::FrameButtonDisplayType::kMaximize, - chrome::FrameButtonDisplayType::kClose, - }) { - for (size_t state = 0; state < views::Button::STATE_COUNT; state++) { - views::Button::ButtonState button_state = - static_cast<views::Button::ButtonState>(state); - GetButtonFromDisplayType(type)->SetImage( - button_state, nav_button_provider_->GetImage(type, button_state)); - } - } - } -}
diff --git a/chrome/browser/ui/views/frame/opaque_browser_frame_view.h b/chrome/browser/ui/views/frame/opaque_browser_frame_view.h index 24baf46..c2e84640 100644 --- a/chrome/browser/ui/views/frame/opaque_browser_frame_view.h +++ b/chrome/browser/ui/views/frame/opaque_browser_frame_view.h
@@ -41,7 +41,9 @@ public OpaqueBrowserFrameViewLayoutDelegate { public: // Constructs a non-client view for an BrowserFrame. - OpaqueBrowserFrameView(BrowserFrame* frame, BrowserView* browser_view); + OpaqueBrowserFrameView(BrowserFrame* frame, + BrowserView* browser_view, + OpaqueBrowserFrameViewLayout* layout); ~OpaqueBrowserFrameView() override; // BrowserNonClientFrameView: @@ -98,9 +100,7 @@ int GetTabStripHeight() const override; bool IsToolbarVisible() const override; gfx::Size GetTabstripPreferredSize() const override; - bool ShouldRenderNativeNavButtons() const override; int GetTopAreaHeight() const override; - const views::NavButtonProvider* GetNavButtonProvider() const override; protected: views::ImageButton* minimize_button() const { return minimize_button_; } @@ -115,6 +115,13 @@ bool ShouldPaintAsThemed() const override; void UpdateProfileIcons() override; + // If native window frame buttons are enabled, redraws the image resources + // associated with |{minimize,maximize,restore,close}_button_|. + virtual void MaybeRedrawFrameButtons(); + + // Wrapper around the in-frame avatar switcher. + AvatarButtonManager profile_switcher_; + private: // Creates, adds and returns a new image button with |this| as its listener. // Memory is owned by the caller. @@ -159,15 +166,6 @@ SkColor color, gfx::Canvas* canvas) const; - // Returns one of |{minimize,maximize,restore,close}_button_| - // corresponding to |type|. - views::ImageButton* GetButtonFromDisplayType( - chrome::FrameButtonDisplayType type); - - // If native window frame buttons are enabled, redraws the image resources - // associated with |{minimize,maximize,restore,close}_button_|. - void MaybeRedrawFrameButtons(); - // Our layout manager also calculates various bounds. OpaqueBrowserFrameViewLayout* layout_; @@ -181,17 +179,12 @@ TabIconView* window_icon_; views::Label* window_title_; - // Wrapper around the in-frame avatar switcher. - AvatarButtonManager profile_switcher_; - // Background painter for the window frame. std::unique_ptr<views::FrameBackground> frame_background_; // Observer that handles platform dependent configuration. std::unique_ptr<OpaqueBrowserFrameViewPlatformSpecific> platform_observer_; - std::unique_ptr<views::NavButtonProvider> nav_button_provider_; - DISALLOW_COPY_AND_ASSIGN(OpaqueBrowserFrameView); };
diff --git a/chrome/browser/ui/views/frame/opaque_browser_frame_view_layout.cc b/chrome/browser/ui/views/frame/opaque_browser_frame_view_layout.cc index 21f4a63..e23f013 100644 --- a/chrome/browser/ui/views/frame/opaque_browser_frame_view_layout.cc +++ b/chrome/browser/ui/views/frame/opaque_browser_frame_view_layout.cc
@@ -15,7 +15,6 @@ #include "ui/gfx/font.h" #include "ui/views/controls/button/image_button.h" #include "ui/views/controls/label.h" -#include "ui/views/window/nav_button_provider.h" namespace { @@ -73,9 +72,8 @@ // need to reserve a larger, 16 px gap to avoid looking too cluttered. const int OpaqueBrowserFrameViewLayout::kNewTabCaptionCondensedSpacing = 16; -OpaqueBrowserFrameViewLayout::OpaqueBrowserFrameViewLayout( - OpaqueBrowserFrameViewLayoutDelegate* delegate) - : delegate_(delegate), +OpaqueBrowserFrameViewLayout::OpaqueBrowserFrameViewLayout() + : new_avatar_button_(nullptr), leading_button_start_(0), trailing_button_start_(0), minimum_size_for_buttons_(0), @@ -90,11 +88,9 @@ window_icon_(nullptr), window_title_(nullptr), incognito_icon_(nullptr), - new_avatar_button_(nullptr) { - trailing_buttons_.push_back(views::FRAME_BUTTON_MINIMIZE); - trailing_buttons_.push_back(views::FRAME_BUTTON_MAXIMIZE); - trailing_buttons_.push_back(views::FRAME_BUTTON_CLOSE); -} + trailing_buttons_{views::FRAME_BUTTON_MINIMIZE, + views::FRAME_BUTTON_MAXIMIZE, + views::FRAME_BUTTON_CLOSE} {} OpaqueBrowserFrameViewLayout::~OpaqueBrowserFrameViewLayout() {} @@ -204,19 +200,10 @@ int OpaqueBrowserFrameViewLayout::CaptionButtonY( chrome::FrameButtonDisplayType button_id, bool restored) const { - if (delegate_->ShouldRenderNativeNavButtons()) { - auto* button_provider = delegate_->GetNavButtonProvider(); - gfx::Insets insets = button_provider->GetNavButtonMargin(button_id); - return insets.top(); - } return DefaultCaptionButtonY(restored); } int OpaqueBrowserFrameViewLayout::TopAreaPadding() const { - if (delegate_->ShouldRenderNativeNavButtons()) { - auto* button_provider = delegate_->GetNavButtonProvider(); - return button_provider->GetTopAreaSpacing().left(); - } return FrameBorderThickness(false); } @@ -256,17 +243,6 @@ views::FrameButton button_id, bool leading_spacing, bool is_leading_button) const { - if (delegate_->ShouldRenderNativeNavButtons()) { - auto* button_provider = delegate_->GetNavButtonProvider(); - gfx::Insets insets = - button_provider->GetNavButtonMargin(GetButtonDisplayType(button_id)); - if (!leading_spacing) - return insets.right(); - int spacing = insets.left(); - if (!is_leading_button) - spacing += button_provider->GetInterNavButtonSpacing(); - return spacing; - } if (leading_spacing) { if (is_leading_button) { // If we're the first button and maximized, add width to the right @@ -291,6 +267,41 @@ } /////////////////////////////////////////////////////////////////////////////// +// OpaqueBrowserFrameViewLayout, protected: + +void OpaqueBrowserFrameViewLayout::LayoutNewStyleAvatar(views::View* host) { + if (!new_avatar_button_) + return; + + int button_width = new_avatar_button_->GetPreferredSize().width(); + int button_width_with_offset = button_width + kCaptionSpacing; + + int button_x = + host->width() - trailing_button_start_ - button_width_with_offset; + int button_y = DefaultCaptionButtonY(!IsTitleBarCondensed()); + + minimum_size_for_buttons_ += button_width_with_offset; + trailing_button_start_ += button_width_with_offset; + + // In non-tablet mode, allow the new tab button to completely slide under + // the avatar button. + if (!IsTitleBarCondensed()) { + trailing_button_start_ -= + GetLayoutSize(NEW_TAB_BUTTON).width() + kCaptionSpacing; + } + + new_avatar_button_->SetBounds(button_x, button_y, button_width, + kCaptionButtonHeight); +} + +bool OpaqueBrowserFrameViewLayout::ShouldDrawImageMirrored( + views::ImageButton* button, + ButtonAlignment alignment) const { + return alignment == ALIGN_LEADING && !has_leading_buttons_ && + button == close_button_; +} + +/////////////////////////////////////////////////////////////////////////////// // OpaqueBrowserFrameViewLayout, private: bool OpaqueBrowserFrameViewLayout::ShouldIncognitoIconBeOnRight() const { @@ -400,31 +411,6 @@ } } -void OpaqueBrowserFrameViewLayout::LayoutNewStyleAvatar(views::View* host) { - if (!new_avatar_button_) - return; - - int button_width = new_avatar_button_->GetPreferredSize().width(); - int button_width_with_offset = button_width + kCaptionSpacing; - - int button_x = - host->width() - trailing_button_start_ - button_width_with_offset; - int button_y = DefaultCaptionButtonY(!IsTitleBarCondensed()); - - minimum_size_for_buttons_ += button_width_with_offset; - trailing_button_start_ += button_width_with_offset; - - // In non-tablet mode, allow the new tab button to completely slide under - // the avatar button. - if (!IsTitleBarCondensed()) { - trailing_button_start_ -= - GetLayoutSize(NEW_TAB_BUTTON).width() + kCaptionSpacing; - } - - new_avatar_button_->SetBounds(button_x, button_y, button_width, - kCaptionButtonHeight); -} - void OpaqueBrowserFrameViewLayout::LayoutIncognitoIcon(views::View* host) { const int old_button_size = leading_button_start_ + trailing_button_start_; @@ -524,14 +510,10 @@ // to the screen left, for left-aligned buttons) to obey Fitts' Law. bool title_bar_condensed = IsTitleBarCondensed(); - if (!delegate_->ShouldRenderNativeNavButtons()) { - // When we are the first button on the leading side and are the close - // button, we must flip ourselves, because the close button assets have - // a little notch to fit in the rounded frame. - button->SetDrawImageMirrored(alignment == ALIGN_LEADING && - !has_leading_buttons_ && - button == close_button_); - } + // When we are the first button on the leading side and are the close + // button, we must flip ourselves, because the close button assets have + // a little notch to fit in the rounded frame. + button->SetDrawImageMirrored(ShouldDrawImageMirrored(button, alignment)); int extra_width = TopAreaPadding();
diff --git a/chrome/browser/ui/views/frame/opaque_browser_frame_view_layout.h b/chrome/browser/ui/views/frame/opaque_browser_frame_view_layout.h index d1492a5..a6587e76 100644 --- a/chrome/browser/ui/views/frame/opaque_browser_frame_view_layout.h +++ b/chrome/browser/ui/views/frame/opaque_browser_frame_view_layout.h
@@ -37,10 +37,13 @@ static const int kCaptionButtonBottomPadding; static const int kNewTabCaptionCondensedSpacing; - explicit OpaqueBrowserFrameViewLayout( - OpaqueBrowserFrameViewLayoutDelegate* delegate); + OpaqueBrowserFrameViewLayout(); ~OpaqueBrowserFrameViewLayout() override; + void set_delegate(OpaqueBrowserFrameViewLayoutDelegate* delegate) { + delegate_ = delegate; + } + // Configures the button ordering in the frame. void SetButtonOrdering( const std::vector<views::FrameButton>& leading_buttons, @@ -81,12 +84,12 @@ // Returns the y-coordinate of button |button_id|. If |restored| is true, // acts as if the window is restored regardless of the real mode. - int CaptionButtonY(chrome::FrameButtonDisplayType button_id, - bool restored) const; + virtual int CaptionButtonY(chrome::FrameButtonDisplayType button_id, + bool restored) const; // Returns the initial spacing between the edge of the browser window and the // first button. - int TopAreaPadding() const; + virtual int TopAreaPadding() const; // Returns the thickness of the 3D edge along the top of the titlebar. If // |restored| is true, acts as if the window is restored regardless of the @@ -108,9 +111,9 @@ // Returns the margin around button |button_id|. If |leading_spacing| is // true, returns the left margin (in RTL), otherwise returns the right margin // (in RTL). Extra margin may be added if |is_leading_button| is true. - int GetWindowCaptionSpacing(views::FrameButton button_id, - bool leading_spacing, - bool is_leading_button) const; + virtual int GetWindowCaptionSpacing(views::FrameButton button_id, + bool leading_spacing, + bool is_leading_button) const; void set_extra_caption_y(int extra_caption_y) { extra_caption_y_ = extra_caption_y; @@ -129,7 +132,7 @@ // the thick frame border and rounded corners. bool IsTitleBarCondensed() const; - private: + protected: // Whether a specific button should be inserted on the leading or trailing // side. enum ButtonAlignment { @@ -137,6 +140,26 @@ ALIGN_TRAILING }; + virtual void LayoutNewStyleAvatar(views::View* host); + + virtual bool ShouldDrawImageMirrored(views::ImageButton* button, + ButtonAlignment alignment) const; + + OpaqueBrowserFrameViewLayoutDelegate* delegate_; + + views::View* new_avatar_button_; + + // How far from the leading/trailing edge of the view the next window control + // should be placed. + int leading_button_start_; + int trailing_button_start_; + + // The size of the window buttons, and the avatar menu item (if any). This + // does not count labels or other elements that should be counted in a + // minimal frame. + int minimum_size_for_buttons_; + + private: // Determines whether the incognito icon should be shown on the right side of // the tab strip (instead of the usual left). bool ShouldIncognitoIconBeOnRight() const; @@ -149,7 +172,6 @@ void LayoutWindowControls(views::View* host); void LayoutTitleBar(views::View* host); void LayoutIncognitoIcon(views::View* host); - void LayoutNewStyleAvatar(views::View* host); void ConfigureButton(views::View* host, views::FrameButton button_id, @@ -173,24 +195,12 @@ void ViewAdded(views::View* host, views::View* view) override; void ViewRemoved(views::View* host, views::View* view) override; - OpaqueBrowserFrameViewLayoutDelegate* delegate_; - // The bounds of the ClientView. gfx::Rect client_view_bounds_; // The layout of the window icon, if visible. gfx::Rect window_icon_bounds_; - // How far from the leading/trailing edge of the view the next window control - // should be placed. - int leading_button_start_; - int trailing_button_start_; - - // The size of the window buttons, and the avatar menu item (if any). This - // does not count labels or other elements that should be counted in a - // minimal frame. - int minimum_size_for_buttons_; - // Whether any of the window control buttons were packed on the leading. bool has_leading_buttons_; bool has_trailing_buttons_; @@ -213,7 +223,6 @@ views::Label* window_title_; views::View* incognito_icon_; - views::View* new_avatar_button_; std::vector<views::FrameButton> leading_buttons_; std::vector<views::FrameButton> trailing_buttons_;
diff --git a/chrome/browser/ui/views/frame/opaque_browser_frame_view_layout_delegate.h b/chrome/browser/ui/views/frame/opaque_browser_frame_view_layout_delegate.h index 138773d..bbc1baa2 100644 --- a/chrome/browser/ui/views/frame/opaque_browser_frame_view_layout_delegate.h +++ b/chrome/browser/ui/views/frame/opaque_browser_frame_view_layout_delegate.h
@@ -10,10 +10,6 @@ class Size; } -namespace views { -class NavButtonProvider; -} - // Delegate interface to control layout decisions without having to depend on // Browser{,Frame,View}. class OpaqueBrowserFrameViewLayoutDelegate { @@ -56,15 +52,9 @@ // it. virtual gfx::Size GetTabstripPreferredSize() const = 0; - // Used on desktop Linux to determine if we should use GTK to draw - // native-looking window navigation buttons. - virtual bool ShouldRenderNativeNavButtons() const = 0; - // Computes the height of the top area of the frame. virtual int GetTopAreaHeight() const = 0; - virtual const views::NavButtonProvider* GetNavButtonProvider() const = 0; - protected: virtual ~OpaqueBrowserFrameViewLayoutDelegate() {} };
diff --git a/chrome/browser/ui/views/frame/opaque_browser_frame_view_layout_unittest.cc b/chrome/browser/ui/views/frame/opaque_browser_frame_view_layout_unittest.cc index c714943..3393d9ed 100644 --- a/chrome/browser/ui/views/frame/opaque_browser_frame_view_layout_unittest.cc +++ b/chrome/browser/ui/views/frame/opaque_browser_frame_view_layout_unittest.cc
@@ -20,7 +20,6 @@ #include "ui/views/controls/button/menu_button.h" #include "ui/views/controls/label.h" #include "ui/views/test/views_test_base.h" -#include "ui/views/window/nav_button_provider.h" using OBFVL = OpaqueBrowserFrameViewLayout; @@ -40,10 +39,7 @@ class TestLayoutDelegate : public OpaqueBrowserFrameViewLayoutDelegate { public: - TestLayoutDelegate() - : show_caption_buttons_(true), - maximized_(false), - should_render_native_nav_buttons_(false) {} + TestLayoutDelegate() : show_caption_buttons_(true), maximized_(false) {} ~TestLayoutDelegate() override {} void set_window_title(const base::string16& title) { window_title_ = title; } @@ -51,14 +47,6 @@ show_caption_buttons_ = show_caption_buttons; } void set_maximized(bool maximized) { maximized_ = maximized; } - void set_should_render_native_nav_buttons( - bool should_render_native_nav_buttons) { - should_render_native_nav_buttons_ = should_render_native_nav_buttons; - } - void set_nav_button_provider( - std::unique_ptr<views::NavButtonProvider> nav_button_provider) { - nav_button_provider_ = std::move(nav_button_provider); - } // OpaqueBrowserFrameViewLayoutDelegate: bool ShouldShowWindowIcon() const override { return !window_title_.empty(); } @@ -86,93 +74,16 @@ gfx::Size GetTabstripPreferredSize() const override { return IsTabStripVisible() ? gfx::Size(78, 29) : gfx::Size(); } - bool ShouldRenderNativeNavButtons() const override { - return should_render_native_nav_buttons_; - } int GetTopAreaHeight() const override { return 0; } - const views::NavButtonProvider* GetNavButtonProvider() const override { - return nav_button_provider_.get(); - } private: base::string16 window_title_; bool show_caption_buttons_; bool maximized_; - bool should_render_native_nav_buttons_; - std::unique_ptr<views::NavButtonProvider> nav_button_provider_; DISALLOW_COPY_AND_ASSIGN(TestLayoutDelegate); }; -namespace test_nav_button_provider { - -constexpr gfx::Size kCloseButtonSize = gfx::Size(2, 3); -constexpr gfx::Size kMaximizeButtonSize = gfx::Size(5, 7); -constexpr gfx::Size kMinimizeButtonSize = gfx::Size(11, 13); - -constexpr gfx::Insets kCloseButtonMargin = gfx::Insets(17, 19, 23, 29); -constexpr gfx::Insets kMaximizeButtonMargin = gfx::Insets(31, 37, 41, 43); -constexpr gfx::Insets kMinimizeButtonMargin = gfx::Insets(47, 53, 59, 61); - -constexpr gfx::Insets kTopAreaSpacing = gfx::Insets(67, 71, 73, 79); - -constexpr int kInterNavButtonSpacing = 83; - -static gfx::ImageSkia GetTestImageForSize(gfx::Size size) { - SkBitmap bitmap; - bitmap.allocN32Pixels(size.width(), size.height()); - return gfx::ImageSkia::CreateFrom1xBitmap(bitmap); -} - -class TestNavButtonProvider : public views::NavButtonProvider { - public: - TestNavButtonProvider() {} - - ~TestNavButtonProvider() override {} - - void RedrawImages(int top_area_height, bool maximized, bool active) override { - ASSERT_EQ(false, maximized); // This only tests the restored state. - } - - gfx::ImageSkia GetImage(chrome::FrameButtonDisplayType type, - views::Button::ButtonState state) const override { - switch (type) { - case chrome::FrameButtonDisplayType::kClose: - return GetTestImageForSize(kCloseButtonSize); - case chrome::FrameButtonDisplayType::kMaximize: - return GetTestImageForSize(kMaximizeButtonSize); - case chrome::FrameButtonDisplayType::kMinimize: - return GetTestImageForSize(kMinimizeButtonSize); - default: - NOTREACHED(); - return gfx::ImageSkia(); - } - } - - gfx::Insets GetNavButtonMargin( - chrome::FrameButtonDisplayType type) const override { - switch (type) { - case chrome::FrameButtonDisplayType::kClose: - return kCloseButtonMargin; - case chrome::FrameButtonDisplayType::kMaximize: - return kMaximizeButtonMargin; - case chrome::FrameButtonDisplayType::kMinimize: - return kMinimizeButtonMargin; - default: - NOTREACHED(); - return gfx::Insets(); - } - } - - gfx::Insets GetTopAreaSpacing() const override { return kTopAreaSpacing; } - - int GetInterNavButtonSpacing() const override { - return kInterNavButtonSpacing; - } -}; - -} // namespace test_nav_button_provider - } // namespace class OpaqueBrowserFrameViewLayoutTest : public views::ViewsTestBase { @@ -184,7 +95,8 @@ views::ViewsTestBase::SetUp(); delegate_.reset(new TestLayoutDelegate); - layout_manager_ = new OBFVL(delegate_.get()); + layout_manager_ = new OBFVL(); + layout_manager_->set_delegate(delegate_.get()); layout_manager_->set_extra_caption_y(0); layout_manager_->set_forced_window_caption_spacing_for_test(0); widget_ = new views::Widget; @@ -273,23 +185,6 @@ OBFVL::kCaptionButtonBottomPadding - delegate_->GetIconSize()) / 2; } - void ResetNativeNavButtonImagesFromButtonProvider() { - std::vector<views::ImageButton*> buttons{close_button_, maximize_button_, - minimize_button_}; - std::vector<chrome::FrameButtonDisplayType> button_types{ - chrome::FrameButtonDisplayType::kClose, - chrome::FrameButtonDisplayType::kMaximize, - chrome::FrameButtonDisplayType::kMinimize}; - for (size_t i = 0; i < buttons.size(); i++) { - for (views::Button::ButtonState state : - {views::Button::STATE_NORMAL, views ::Button::STATE_HOVERED, - views::Button::STATE_PRESSED}) { - buttons[i]->SetImage(state, delegate_->GetNavButtonProvider()->GetImage( - button_types[i], state)); - } - } - } - void ExpectCaptionButtons(bool caption_buttons_on_left, int extra_height) { if (!delegate_->ShouldShowCaptionButtons()) { EXPECT_FALSE(maximize_button_->visible()); @@ -333,31 +228,6 @@ EXPECT_FALSE(hidden_button->visible()); } - void ExpectNativeNavButtons() { - using namespace test_nav_button_provider; - int x = 0; - - // Close button. - EXPECT_EQ(kCloseButtonSize, close_button_->size()); - x += kTopAreaSpacing.left() + kCloseButtonMargin.left(); - EXPECT_EQ(x, close_button_->x()); - EXPECT_EQ(kCloseButtonMargin.top(), close_button_->y()); - - // Maximize button. - EXPECT_EQ(kMaximizeButtonSize, maximize_button_->size()); - x += kCloseButtonSize.width() + kCloseButtonMargin.right() + - kInterNavButtonSpacing + kMaximizeButtonMargin.left(); - EXPECT_EQ(x, maximize_button_->x()); - EXPECT_EQ(kMaximizeButtonMargin.top(), maximize_button_->y()); - - // Minimize button. - EXPECT_EQ(kMinimizeButtonSize, minimize_button_->size()); - x += kMaximizeButtonSize.width() + kMaximizeButtonMargin.right() + - kInterNavButtonSpacing + kMinimizeButtonMargin.left(); - EXPECT_EQ(x, minimize_button_->x()); - EXPECT_EQ(kMinimizeButtonMargin.top(), minimize_button_->y()); - } - void ExpectTabStripAndMinimumSize(bool caption_buttons_on_left) { int caption_buttons_width = kCaptionButtonsWidth; bool show_caption_buttons = delegate_->ShouldShowCaptionButtons(); @@ -564,22 +434,3 @@ delegate_->set_maximized(true); } } - -TEST_F(OpaqueBrowserFrameViewLayoutTest, NativeNavButtons) { - // Tests layout of native navigation buttons. - delegate_->set_should_render_native_nav_buttons(true); - delegate_->set_nav_button_provider( - base::MakeUnique<test_nav_button_provider::TestNavButtonProvider>()); - - std::vector<views::FrameButton> leading_buttons; - std::vector<views::FrameButton> trailing_buttons; - leading_buttons.push_back(views::FRAME_BUTTON_CLOSE); - leading_buttons.push_back(views::FRAME_BUTTON_MAXIMIZE); - leading_buttons.push_back(views::FRAME_BUTTON_MINIMIZE); - layout_manager_->SetButtonOrdering(leading_buttons, trailing_buttons); - ResetNativeNavButtonImagesFromButtonProvider(); - - root_view_->Layout(); - - ExpectNativeNavButtons(); -}
diff --git a/chrome/browser/ui/views/intent_picker_bubble_view.cc b/chrome/browser/ui/views/intent_picker_bubble_view.cc index 3d993ade..c372554 100644 --- a/chrome/browser/ui/views/intent_picker_bubble_view.cc +++ b/chrome/browser/ui/views/intent_picker_bubble_view.cc
@@ -102,6 +102,7 @@ views::View* anchor_view, content::WebContents* web_contents, const std::vector<AppInfo>& app_info, + bool disable_stay_in_chrome, const IntentPickerResponse& intent_picker_cb) { if (intent_picker_bubble_) { views::Widget* widget = @@ -116,8 +117,8 @@ return nullptr; } BrowserView* browser_view = BrowserView::GetBrowserViewForBrowser(browser); - intent_picker_bubble_ = - new IntentPickerBubbleView(app_info, intent_picker_cb, web_contents); + intent_picker_bubble_ = new IntentPickerBubbleView( + app_info, intent_picker_cb, web_contents, disable_stay_in_chrome); intent_picker_bubble_->set_margins(gfx::Insets()); if (anchor_view) { @@ -149,10 +150,11 @@ std::unique_ptr<IntentPickerBubbleView> IntentPickerBubbleView::CreateBubbleView( const std::vector<AppInfo>& app_info, + bool disable_stay_in_chrome, const IntentPickerResponse& intent_picker_cb, content::WebContents* web_contents) { - std::unique_ptr<IntentPickerBubbleView> bubble( - new IntentPickerBubbleView(app_info, intent_picker_cb, web_contents)); + std::unique_ptr<IntentPickerBubbleView> bubble(new IntentPickerBubbleView( + app_info, intent_picker_cb, web_contents, disable_stay_in_chrome)); bubble->Init(); return bubble; } @@ -268,6 +270,13 @@ return l10n_util::GetStringUTF16(IDS_INTENT_PICKER_BUBBLE_VIEW_OPEN_WITH); } +bool IntentPickerBubbleView::IsDialogButtonEnabled( + ui::DialogButton button) const { + if (disable_stay_in_chrome_ && button == ui::DIALOG_BUTTON_CANCEL) + return false; + return true; +} + base::string16 IntentPickerBubbleView::GetDialogButtonLabel( ui::DialogButton button) const { return l10n_util::GetStringUTF16( @@ -279,13 +288,15 @@ IntentPickerBubbleView::IntentPickerBubbleView( const std::vector<AppInfo>& app_info, IntentPickerResponse intent_picker_cb, - content::WebContents* web_contents) + content::WebContents* web_contents, + bool disable_stay_in_chrome) : LocationBarBubbleDelegateView(nullptr /* anchor_view */, web_contents), intent_picker_cb_(intent_picker_cb), selected_app_tag_(0), scroll_view_(nullptr), app_info_(app_info), - remember_selection_checkbox_(nullptr) { + remember_selection_checkbox_(nullptr), + disable_stay_in_chrome_(disable_stay_in_chrome) { chrome::RecordDialogCreation(chrome::DialogIdentifier::INTENT_PICKER); } @@ -418,3 +429,7 @@ size_t index) const { return app_info_[index].package_name; } + +bool IntentPickerBubbleView::GetStayInChromeEnabledForTesting() { + return IsDialogButtonEnabled(ui::DIALOG_BUTTON_CANCEL); +}
diff --git a/chrome/browser/ui/views/intent_picker_bubble_view.h b/chrome/browser/ui/views/intent_picker_bubble_view.h index 4ce4f52..f71d4693 100644 --- a/chrome/browser/ui/views/intent_picker_bubble_view.h +++ b/chrome/browser/ui/views/intent_picker_bubble_view.h
@@ -67,9 +67,11 @@ views::View* anchor_view, content::WebContents* web_contents, const std::vector<AppInfo>& app_info, + bool disable_stay_in_chrome, const IntentPickerResponse& intent_picker_cb); static std::unique_ptr<IntentPickerBubbleView> CreateBubbleView( const std::vector<AppInfo>& app_info, + bool disable_stay_in_chrome, const IntentPickerResponse& intent_picker_cb, content::WebContents* web_contents); static IntentPickerBubbleView* intent_picker_bubble() { @@ -87,6 +89,7 @@ // LocationBarBubbleDelegateView overrides: void Init() override; base::string16 GetWindowTitle() const override; + bool IsDialogButtonEnabled(ui::DialogButton button) const override; base::string16 GetDialogButtonLabel(ui::DialogButton button) const override; void CloseBubble() override; @@ -99,9 +102,11 @@ FRIEND_TEST_ALL_PREFIXES(IntentPickerBubbleViewTest, InkDropStateTransition); FRIEND_TEST_ALL_PREFIXES(IntentPickerBubbleViewTest, PressButtonTwice); FRIEND_TEST_ALL_PREFIXES(IntentPickerBubbleViewTest, ChromeNotInCandidates); + FRIEND_TEST_ALL_PREFIXES(IntentPickerBubbleViewTest, StayInChromeTest); IntentPickerBubbleView(const std::vector<AppInfo>& app_info, IntentPickerResponse intent_picker_cb, - content::WebContents* web_contents); + content::WebContents* web_contents, + bool disable_display_in_chrome); // views::BubbleDialogDelegateView overrides: void OnWidgetDestroying(views::Widget* widget) override; @@ -143,6 +148,7 @@ void PressButtonForTesting(size_t index, const ui::Event& event); size_t GetScrollViewSizeForTesting() const; std::string GetPackageNameForTesting(size_t index) const; + bool GetStayInChromeEnabledForTesting(); static IntentPickerBubbleView* intent_picker_bubble_; @@ -158,6 +164,9 @@ views::Checkbox* remember_selection_checkbox_; + // Tells whether or not 'Stay in Chrome' should be enabled as an option. + const bool disable_stay_in_chrome_; + DISALLOW_COPY_AND_ASSIGN(IntentPickerBubbleView); };
diff --git a/chrome/browser/ui/views/intent_picker_bubble_view_unittest.cc b/chrome/browser/ui/views/intent_picker_bubble_view_unittest.cc index 86e17d6..7034fe4 100644 --- a/chrome/browser/ui/views/intent_picker_bubble_view_unittest.cc +++ b/chrome/browser/ui/views/intent_picker_bubble_view_unittest.cc
@@ -39,7 +39,7 @@ } protected: - void CreateBubbleView(bool use_icons) { + void CreateBubbleView(bool use_icons, bool disable_stay_in_chrome) { // Pushing a couple of fake apps just to check they are created on the UI. app_info_.emplace_back(gfx::Image(), "package_1", "dank app 1"); app_info_.emplace_back(gfx::Image(), "package_2", "dank_app_2"); @@ -60,8 +60,9 @@ ui::PAGE_TRANSITION_TYPED, false)); bubble_ = IntentPickerBubbleView::CreateBubbleView( - app_info_, base::Bind(&IntentPickerBubbleViewTest::OnBubbleClosed, - base::Unretained(this)), + app_info_, disable_stay_in_chrome, + base::Bind(&IntentPickerBubbleViewTest::OnBubbleClosed, + base::Unretained(this)), web_contents); } @@ -85,7 +86,7 @@ // Verifies that we didn't set up an image for any LabelButton. TEST_F(IntentPickerBubbleViewTest, NullIcons) { - CreateBubbleView(false); + CreateBubbleView(false, false); size_t size = bubble_->GetScrollViewSizeForTesting(); for (size_t i = 0; i < size; ++i) { gfx::ImageSkia image = bubble_->GetAppImageForTesting(i); @@ -95,7 +96,7 @@ // Verifies that all the icons contain a non-null icon. TEST_F(IntentPickerBubbleViewTest, NonNullIcons) { - CreateBubbleView(true); + CreateBubbleView(true, false); size_t size = bubble_->GetScrollViewSizeForTesting(); for (size_t i = 0; i < size; ++i) { gfx::ImageSkia image = bubble_->GetAppImageForTesting(i); @@ -108,7 +109,7 @@ // shown to the user on the picker UI, so there could be a difference // represented by |chrome_package_repetitions|. TEST_F(IntentPickerBubbleViewTest, LabelsPtrVectorSize) { - CreateBubbleView(true); + CreateBubbleView(true, false); size_t size = app_info_.size(); size_t chrome_package_repetitions = 0; for (AppInfo app_info : app_info_) { @@ -123,7 +124,7 @@ // Verifies the InkDrop state when creating a new bubble. TEST_F(IntentPickerBubbleViewTest, VerifyStartingInkDrop) { - CreateBubbleView(true); + CreateBubbleView(true, false); size_t size = bubble_->GetScrollViewSizeForTesting(); for (size_t i = 0; i < size; ++i) { EXPECT_EQ(bubble_->GetInkDropStateForTesting(i), @@ -134,7 +135,7 @@ // Press each button at a time and make sure it goes to ACTIVATED state, // followed by HIDDEN state after selecting other button. TEST_F(IntentPickerBubbleViewTest, InkDropStateTransition) { - CreateBubbleView(true); + CreateBubbleView(true, false); const ui::MouseEvent event(ui::ET_MOUSE_PRESSED, gfx::Point(), gfx::Point(), ui::EventTimeForNow(), 0, 0); size_t size = bubble_->GetScrollViewSizeForTesting(); @@ -150,7 +151,7 @@ // Arbitrary press the first button twice, check that the InkDropState remains // the same. TEST_F(IntentPickerBubbleViewTest, PressButtonTwice) { - CreateBubbleView(true); + CreateBubbleView(true, false); const ui::MouseEvent event(ui::ET_MOUSE_PRESSED, gfx::Point(), gfx::Point(), ui::EventTimeForNow(), 0, 0); EXPECT_EQ(bubble_->GetInkDropStateForTesting(0), views::InkDropState::HIDDEN); @@ -165,10 +166,19 @@ // Check that none of the app candidates within the picker corresponds to the // Chrome browser. TEST_F(IntentPickerBubbleViewTest, ChromeNotInCandidates) { - CreateBubbleView(false); + CreateBubbleView(false, false); size_t size = bubble_->GetScrollViewSizeForTesting(); for (size_t i = 0; i < size; ++i) { EXPECT_FALSE(arc::ArcIntentHelperBridge::IsIntentHelperPackage( bubble_->GetPackageNameForTesting(i))); } } + +// Check that 'Stay in Chrome' remains enabled/disabled accordingly. +TEST_F(IntentPickerBubbleViewTest, StayInChromeTest) { + CreateBubbleView(false, true); + EXPECT_EQ(bubble_->GetStayInChromeEnabledForTesting(), false); + + CreateBubbleView(false, false); + EXPECT_EQ(bubble_->GetStayInChromeEnabledForTesting(), true); +}
diff --git a/ui/views/window/nav_button_provider.h b/chrome/browser/ui/views/nav_button_provider.h similarity index 68% rename from ui/views/window/nav_button_provider.h rename to chrome/browser/ui/views/nav_button_provider.h index 4995633..6cbe9324 100644 --- a/ui/views/window/nav_button_provider.h +++ b/chrome/browser/ui/views/nav_button_provider.h
@@ -2,10 +2,16 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef UI_VIEWS_NAV_BUTTON_PROVIDER_H_ -#define UI_VIEWS_NAV_BUTTON_PROVIDER_H_ +#ifndef CHROME_BROWSER_UI_VIEWS_NAV_BUTTON_PROVIDER_H_ +#define CHROME_BROWSER_UI_VIEWS_NAV_BUTTON_PROVIDER_H_ +#include "build/buildflag.h" #include "ui/views/controls/button/button.h" +#include "ui/views/features.h" + +#if !BUILDFLAG(ENABLE_NATIVE_WINDOW_NAV_BUTTONS) +#error "Include not allowed." +#endif namespace chrome { enum class FrameButtonDisplayType; @@ -47,8 +53,19 @@ // Gets the spacing to be used to separate buttons. virtual int GetInterNavButtonSpacing() const = 0; + + // Creates a background for the profile chooser button. + virtual std::unique_ptr<Background> CreateAvatarButtonBackground( + const views::Button* button) const = 0; + + // Calculates the profile chooser button's size and spacing. + virtual void CalculateCaptionButtonLayout( + const gfx::Size& content_size, + int top_area_height, + gfx::Size* caption_button_size, + gfx::Insets* caption_button_spacing) const = 0; }; } // namespace views -#endif // UI_VIEWS_NAV_BUTTON_PROVIDER_H_ +#endif // CHROME_BROWSER_UI_VIEWS_NAV_BUTTON_PROVIDER_H_
diff --git a/chrome/browser/ui/views/profiles/avatar_button.cc b/chrome/browser/ui/views/profiles/avatar_button.cc index bbc0630..b3a00d2 100644 --- a/chrome/browser/ui/views/profiles/avatar_button.cc +++ b/chrome/browser/ui/views/profiles/avatar_button.cc
@@ -15,6 +15,8 @@ #include "chrome/browser/themes/theme_properties.h" #include "chrome/browser/themes/theme_service.h" #include "chrome/browser/themes/theme_service_factory.h" +#include "chrome/browser/ui/views/frame/avatar_button_manager.h" +#include "chrome/browser/ui/views/frame/browser_view.h" #include "chrome/browser/ui/views/profiles/profile_chooser_view.h" #include "chrome/grit/theme_resources.h" #include "components/keyed_service/content/browser_context_keyed_service_shutdown_notifier_factory.h" @@ -35,8 +37,14 @@ #include "chrome/browser/ui/views/frame/minimize_button_metrics_win.h" #endif +#if BUILDFLAG(ENABLE_NATIVE_WINDOW_NAV_BUTTONS) +#include "chrome/browser/ui/views/nav_button_provider.h" +#endif + namespace { +constexpr int kGenericAvatarIconSize = 16; + // TODO(emx): Calculate width based on caption button [http://crbug.com/716365] constexpr int kCondensibleButtonMinWidth = 46; // TODO(emx): Should this be calculated based on average character width? @@ -171,13 +179,19 @@ AvatarButton::AvatarButton(views::ButtonListener* listener, AvatarButtonStyle button_style, - Profile* profile) + Profile* profile, + AvatarButtonManager* manager) : LabelButton(listener, base::string16()), error_controller_(this, profile), profile_(profile), profile_observer_(this), button_style_(button_style), widget_observer_(this) { +#if BUILDFLAG(ENABLE_NATIVE_WINDOW_NAV_BUTTONS) + views::NavButtonProvider* nav_button_provider = + manager->get_nav_button_provider(); + render_native_nav_buttons_ = nav_button_provider != nullptr; +#endif set_notify_action(Button::NOTIFY_ON_PRESS); set_triggerable_event_flags(ui::EF_LEFT_MOUSE_BUTTON | ui::EF_RIGHT_MOUSE_BUTTON); @@ -201,16 +215,26 @@ DCHECK_EQ(AvatarButtonStyle::THEMED, button_style); apply_ink_drop = true; #endif + if (render_native_nav_buttons_) + apply_ink_drop = false; - if (apply_ink_drop) { + if (render_native_nav_buttons_) { +#if BUILDFLAG(ENABLE_NATIVE_WINDOW_NAV_BUTTONS) + SetBackground(nav_button_provider->CreateAvatarButtonBackground(this)); + SetBorder(nullptr); + generic_avatar_ = + gfx::CreateVectorIcon(kProfileSwitcherOutlineIcon, + kGenericAvatarIconSize, gfx::kPlaceholderColor); +#endif + } else if (apply_ink_drop) { SetInkDropMode(InkDropMode::ON); SetFocusPainter(nullptr); #if defined(OS_LINUX) - constexpr int kIconSize = 16; set_ink_drop_base_color(SK_ColorWHITE); SetBorder(base::MakeUnique<AvatarButtonThemedBorder>()); - generic_avatar_ = gfx::CreateVectorIcon(kProfileSwitcherOutlineIcon, - kIconSize, gfx::kPlaceholderColor); + generic_avatar_ = + gfx::CreateVectorIcon(kProfileSwitcherOutlineIcon, + kGenericAvatarIconSize, gfx::kPlaceholderColor); #elif defined(OS_WIN) DCHECK_EQ(AvatarButtonStyle::NATIVE, button_style); SetBorder(views::CreateEmptyBorder(kBorderInsets)); @@ -255,11 +279,10 @@ ? SK_ColorWHITE : SK_ColorBLACK; set_ink_drop_base_color(base_color); - constexpr int kIconSize = 16; const SkColor icon_color = SkColorSetA(base_color, static_cast<SkAlpha>(0.54 * 0xFF)); - generic_avatar_ = - gfx::CreateVectorIcon(kAccountCircleIcon, kIconSize, icon_color); + generic_avatar_ = gfx::CreateVectorIcon(kAccountCircleIcon, + kGenericAvatarIconSize, icon_color); } #endif // defined(OS_WIN) } @@ -292,6 +315,9 @@ } gfx::Size AvatarButton::CalculatePreferredSize() const { + if (render_native_nav_buttons_) + return LabelButton::CalculatePreferredSize(); + // TODO(estade): Calculate the height instead of hardcoding to 20 for the // not-condensible case. gfx::Size size(LabelButton::CalculatePreferredSize().width(), 20); @@ -381,6 +407,8 @@ void AvatarButton::OnWidgetDestroying(views::Widget* widget) { AnimateInkDrop(views::InkDropState::DEACTIVATED, nullptr); + if (render_native_nav_buttons_) + SchedulePaint(); widget_observer_.Remove(widget); }
diff --git a/chrome/browser/ui/views/profiles/avatar_button.h b/chrome/browser/ui/views/profiles/avatar_button.h index a9c599e..8b2d940 100644 --- a/chrome/browser/ui/views/profiles/avatar_button.h +++ b/chrome/browser/ui/views/profiles/avatar_button.h
@@ -15,6 +15,7 @@ #include "ui/views/controls/button/label_button.h" #include "ui/views/widget/widget_observer.h" +class AvatarButtonManager; class Profile; // Base class for avatar buttons that display the active profile's name in the @@ -26,7 +27,8 @@ public: AvatarButton(views::ButtonListener* listener, AvatarButtonStyle button_style, - Profile* profile); + Profile* profile, + AvatarButtonManager* manager); ~AvatarButton() override; void SetupThemeColorButton(); @@ -94,6 +96,10 @@ AvatarButtonStyle button_style_; + // Set on desktop Linux to indicate if the avatar button should be + // drawn using the system theme. + bool render_native_nav_buttons_ = false; + ScopedObserver<views::Widget, views::WidgetObserver> widget_observer_; DISALLOW_COPY_AND_ASSIGN(AvatarButton);
diff --git a/chrome/browser/ui/views/toolbar/toolbar_view.cc b/chrome/browser/ui/views/toolbar/toolbar_view.cc index 9a49cfdb..1d6d10d 100644 --- a/chrome/browser/ui/views/toolbar/toolbar_view.cc +++ b/chrome/browser/ui/views/toolbar/toolbar_view.cc
@@ -275,7 +275,8 @@ } views::Widget* bubble_widget = IntentPickerBubbleView::ShowBubble( - intent_picker_view, GetWebContents(), app_info, callback); + intent_picker_view, GetWebContents(), app_info, + false /* disable_stay_in_chrome */, callback); if (bubble_widget && intent_picker_view) bubble_widget->AddObserver(intent_picker_view); }
diff --git a/chrome/browser/ui/webui/settings/chrome_cleanup_handler.cc b/chrome/browser/ui/webui/settings/chrome_cleanup_handler.cc index 85ba7ba..1769c85 100644 --- a/chrome/browser/ui/webui/settings/chrome_cleanup_handler.cc +++ b/chrome/browser/ui/webui/settings/chrome_cleanup_handler.cc
@@ -180,10 +180,6 @@ void ChromeCleanupHandler::HandleRegisterChromeCleanerObserver( const base::ListValue* args) { DCHECK_EQ(0U, args->GetSize()); - // The Polymer element should never be attached if the feature is - // disabled. - DCHECK( - base::FeatureList::IsEnabled(safe_browsing::kInBrowserCleanerUIFeature)); UMA_HISTOGRAM_BOOLEAN("SoftwareReporter.CleanupCard", true); base::RecordAction(
diff --git a/chrome/browser/ui/webui/settings/md_settings_ui.cc b/chrome/browser/ui/webui/settings/md_settings_ui.cc index 4bbc6b7..6e125f4 100644 --- a/chrome/browser/ui/webui/settings/md_settings_ui.cc +++ b/chrome/browser/ui/webui/settings/md_settings_ui.cc
@@ -194,26 +194,22 @@ bool chromeCleanupEnabled = false; bool userInitiatedCleanupsEnabled = false; - if (base::FeatureList::IsEnabled(safe_browsing::kInBrowserCleanerUIFeature)) { - AddSettingsPageUIHandler(base::MakeUnique<ChromeCleanupHandler>(profile)); + AddSettingsPageUIHandler(base::MakeUnique<ChromeCleanupHandler>(profile)); - safe_browsing::ChromeCleanerController* cleaner_controller = - safe_browsing::ChromeCleanerController::GetInstance(); - chromeCleanupEnabled = cleaner_controller->ShouldShowCleanupInSettingsUI(); - userInitiatedCleanupsEnabled = - safe_browsing::UserInitiatedCleanupsEnabled(); + safe_browsing::ChromeCleanerController* cleaner_controller = + safe_browsing::ChromeCleanerController::GetInstance(); + chromeCleanupEnabled = cleaner_controller->ShouldShowCleanupInSettingsUI(); + userInitiatedCleanupsEnabled = safe_browsing::UserInitiatedCleanupsEnabled(); #if defined(GOOGLE_CHROME_BUILD) - if (cleaner_controller->IsPoweredByPartner()) - html_source->AddBoolean("cleanupPoweredByPartner", true); + if (cleaner_controller->IsPoweredByPartner()) + html_source->AddBoolean("cleanupPoweredByPartner", true); - html_source->AddResourcePath("partner-logo.svg", - IDR_CHROME_CLEANUP_PARTNER); + html_source->AddResourcePath("partner-logo.svg", IDR_CHROME_CLEANUP_PARTNER); #if BUILDFLAG(OPTIMIZE_WEBUI) - exclude_from_gzip.push_back("partner-logo.svg"); + exclude_from_gzip.push_back("partner-logo.svg"); #endif #endif // defined(GOOGLE_CHROME_BUILD) - } html_source->AddBoolean("chromeCleanupEnabled", chromeCleanupEnabled); // Don't need to save this variable in UpdateCleanupDataSource() because it @@ -312,11 +308,9 @@ #if defined(OS_WIN) // This needs to be below content::WebUIDataSource::Add to make sure there // is a WebUIDataSource to update if the observer is immediately notified. - if (base::FeatureList::IsEnabled(safe_browsing::kInBrowserCleanerUIFeature)) { - cleanup_observer_.reset( - new safe_browsing::ChromeCleanerStateChangeObserver(base::Bind( - &MdSettingsUI::UpdateCleanupDataSource, base::Unretained(this)))); - } + cleanup_observer_.reset( + new safe_browsing::ChromeCleanerStateChangeObserver(base::Bind( + &MdSettingsUI::UpdateCleanupDataSource, base::Unretained(this)))); #endif // defined(OS_WIN) }
diff --git a/chrome/common/BUILD.gn b/chrome/common/BUILD.gn index eaf3792c..d2095077 100644 --- a/chrome/common/BUILD.gn +++ b/chrome/common/BUILD.gn
@@ -41,7 +41,6 @@ "ENABLE_HANGOUT_SERVICES_EXTENSION=$enable_hangout_services_extension", "ENABLE_ONE_CLICK_SIGNIN=$enable_one_click_signin", "ENABLE_NATIVE_NOTIFICATIONS=$enable_native_notifications", - "ENABLE_NATIVE_WINDOW_NAV_BUTTONS=$enable_native_window_nav_buttons", "ENABLE_PACKAGE_MASH_SERVICES=$enable_package_mash_services", "ENABLE_SERVICE_DISCOVERY=$enable_service_discovery", "ENABLE_SESSION_SERVICE=$enable_session_service",
diff --git a/chrome/common/chrome_switches.cc b/chrome/common/chrome_switches.cc index 1f2efbe..df0a3a4 100644 --- a/chrome/common/chrome_switches.cc +++ b/chrome/common/chrome_switches.cc
@@ -334,6 +334,10 @@ // (internally adds lEnableGpuPlugin to the command line). const char kEnableNaCl[] = "enable-nacl"; +// Enables styling the profile chooser button using the systme theme. +// Only available on desktop Linux. +const char kEnableNativeAvatarButton[] = "enable-native-avatar-button"; + // Enables tracing for each navigation. It will attempt to trace each navigation // for 10s, until the buffer is full, or until the next navigation. // It only works if a URL was provided by --trace-upload-url.
diff --git a/chrome/common/chrome_switches.h b/chrome/common/chrome_switches.h index a8cbb0f..9a900c5c 100644 --- a/chrome/common/chrome_switches.h +++ b/chrome/common/chrome_switches.h
@@ -109,6 +109,7 @@ extern const char kEnableExtensionActivityLogTesting[]; extern const char kEnableFastUnload[]; extern const char kEnableNaCl[]; +extern const char kEnableNativeAvatarButton[]; extern const char kEnableNavigationTracing[]; extern const char kEnableNetBenchmarking[]; extern const char kEnableOfflineAutoReload[];
diff --git a/chrome/common/features.gni b/chrome/common/features.gni index 8605984..098366d 100644 --- a/chrome/common/features.gni +++ b/chrome/common/features.gni
@@ -46,11 +46,6 @@ enable_native_notifications = is_android || is_mac || is_win || (is_desktop_linux && use_dbus) || is_chromeos - # Whether we should draw the minimize, maximize/restore, and close - # buttons using the system theme. Only used on Linux with GTK3. - enable_native_window_nav_buttons = - use_aura && !use_ozone && is_desktop_linux && use_gtk3 - enable_one_click_signin = is_win || is_mac || (is_linux && !is_chromeos && !is_chromecast)
diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn index 695eb20..aa9ef207 100644 --- a/chrome/test/BUILD.gn +++ b/chrome/test/BUILD.gn
@@ -24,6 +24,7 @@ import("//services/catalog/public/tools/catalog.gni") import("//testing/test.gni") import("//ui/base/ui_features.gni") +import("//ui/views/features.gni") import("//v8/gni/v8.gni") if (is_android) { @@ -2400,9 +2401,8 @@ sources -= [ "../browser/ui/views/select_file_dialog_extension_browsertest.cc" ] } if (is_win || is_linux) { - sources += [ - "../browser/ui/views/ime/input_ime_apitest_nonchromeos.cc", - ] + sources += + [ "../browser/ui/views/ime/input_ime_apitest_nonchromeos.cc" ] } } if (enable_desktop_in_product_help) { @@ -4962,6 +4962,9 @@ "../browser/ui/views/sync/one_click_signin_dialog_view_unittest.cc", ] } + if (enable_native_window_nav_buttons) { + sources += [ "../browser/ui/views/frame/desktop_linux_browser_frame_view_layout_unittest.cc" ] + } if (!is_mac || mac_views_browser) { sources += [ "../browser/ui/views/accelerator_table_unittest.cc",
diff --git a/components/component_updater/pref_names.cc b/components/component_updater/pref_names.cc index 861ee44..ba038fc 100644 --- a/components/component_updater/pref_names.cc +++ b/components/component_updater/pref_names.cc
@@ -27,9 +27,6 @@ const char kSwReporterLastTimeSentReport[] = "software_reporter.last_time_sent_report"; -// Identify whether there is a pending prompt to be added to the Chrome menu. -const char kSwReporterPendingPrompt[] = "software_reporter.pending_prompt"; - // The version string of the reporter that triggered an SRT prompt. An empty // string when the prompt wasn't shown yet. Stored in the protected prefs of the // profile that owns the browser where the prompt was shown.
diff --git a/components/component_updater/pref_names.h b/components/component_updater/pref_names.h index 7ac5147..1d3a2c86 100644 --- a/components/component_updater/pref_names.h +++ b/components/component_updater/pref_names.h
@@ -16,7 +16,6 @@ // Local state prefs. extern const char kSwReporterLastExitCode[]; extern const char kSwReporterLastTimeTriggered[]; -extern const char kSwReporterPendingPrompt[]; extern const char kSwReporterLastTimeSentReport[]; // Profile prefs.
diff --git a/content/browser/renderer_host/render_widget_host_view_aura.cc b/content/browser/renderer_host/render_widget_host_view_aura.cc index e5c1096..22a08bc5 100644 --- a/content/browser/renderer_host/render_widget_host_view_aura.cc +++ b/content/browser/renderer_host/render_widget_host_view_aura.cc
@@ -787,8 +787,9 @@ if (editable && host_->GetView() && host_->delegate()) { keyboard_observer_.reset(new WinScreenKeyboardObserver( this, location_dips_screen, device_scale_factor_, window_)); - virtual_keyboard_requested_ = - osk_display_manager->DisplayVirtualKeyboard(keyboard_observer_.get()); + if (!osk_display_manager->DisplayVirtualKeyboard(keyboard_observer_.get())) + keyboard_observer_.reset(nullptr); + virtual_keyboard_requested_ = keyboard_observer_.get(); } else { virtual_keyboard_requested_ = false; osk_display_manager->DismissVirtualKeyboard();
diff --git a/content/common/BUILD.gn b/content/common/BUILD.gn index ceba883..53f4979 100644 --- a/content/common/BUILD.gn +++ b/content/common/BUILD.gn
@@ -510,7 +510,7 @@ } if (!use_seccomp_bpf) { - if (is_linux) { + if (is_linux && current_cpu != "s390x" && current_cpu != "ppc64") { sources -= [ "sandbox_linux/bpf_cros_amd_gpu_policy_linux.cc", "sandbox_linux/bpf_cros_amd_gpu_policy_linux.h",
diff --git a/device/hid/hid_connection.cc b/device/hid/hid_connection.cc index f1e06a0..5dd863d 100644 --- a/device/hid/hid_connection.cc +++ b/device/hid/hid_connection.cc
@@ -19,7 +19,7 @@ struct CollectionHasReportId { explicit CollectionHasReportId(uint8_t report_id) : report_id_(report_id) {} - bool operator()(const device::mojom::HidCollectionInfoPtr& info) const { + bool operator()(const mojom::HidCollectionInfoPtr& info) const { if (info->report_ids.size() == 0 || report_id_ == HidConnection::kNullReportId) return false; @@ -36,13 +36,13 @@ // Functor returning true if collection has a protected usage. struct CollectionIsProtected { - bool operator()(const device::mojom::HidCollectionInfoPtr& info) const { + bool operator()(const mojom::HidCollectionInfoPtr& info) const { return IsProtected(*info->usage); } }; -const device::mojom::HidCollectionInfo* FindCollectionByReportId( - const std::vector<device::mojom::HidCollectionInfoPtr>& collections, +const mojom::HidCollectionInfo* FindCollectionByReportId( + const std::vector<mojom::HidCollectionInfoPtr>& collections, uint8_t report_id) { auto collection_iter = std::find_if(collections.begin(), collections.end(), CollectionHasReportId(report_id)); @@ -55,7 +55,7 @@ } bool HasProtectedCollection( - const std::vector<device::mojom::HidCollectionInfoPtr>& collections) { + const std::vector<mojom::HidCollectionInfoPtr>& collections) { return std::find_if(collections.begin(), collections.end(), CollectionIsProtected()) != collections.end(); }
diff --git a/device/hid/hid_connection_impl.h b/device/hid/hid_connection_impl.h index 39f3bd4..b8fa622 100644 --- a/device/hid/hid_connection_impl.h +++ b/device/hid/hid_connection_impl.h
@@ -15,12 +15,12 @@ // HidConnectionImpl is reponsible for handling mojo communications from // clients. It delegates to HidConnection the real work of creating // connections in different platforms. -class HidConnectionImpl : public device::mojom::HidConnection { +class HidConnectionImpl : public mojom::HidConnection { public: explicit HidConnectionImpl(scoped_refptr<device::HidConnection> connection); ~HidConnectionImpl() final; - // device::mojom::HidConnection implementation: + // mojom::HidConnection implementation: void Read(ReadCallback callback) override; void Write(uint8_t report_id, const std::vector<uint8_t>& buffer,
diff --git a/device/hid/hid_connection_unittest.cc b/device/hid/hid_connection_unittest.cc index a49c177..03e5350 100644 --- a/device/hid/hid_connection_unittest.cc +++ b/device/hid/hid_connection_unittest.cc
@@ -53,9 +53,8 @@ } private: - void OnEnumerationComplete( - HidService* hid_service, - std::vector<device::mojom::HidDeviceInfoPtr> devices) { + void OnEnumerationComplete(HidService* hid_service, + std::vector<mojom::HidDeviceInfoPtr> devices) { for (auto& device_info : devices) { if (device_info->serial_number == serial_number_) { device_guid_ = device_info->guid; @@ -66,7 +65,7 @@ observer_.Add(hid_service); } - void OnDeviceAdded(device::mojom::HidDeviceInfoPtr device_info) override { + void OnDeviceAdded(mojom::HidDeviceInfoPtr device_info) override { if (device_info->serial_number == serial_number_) { device_guid_ = device_info->guid; run_loop_.Quit(); @@ -74,7 +73,7 @@ } std::string serial_number_; - ScopedObserver<device::HidService, device::HidService::Observer> observer_; + ScopedObserver<HidService, HidService::Observer> observer_; base::RunLoop run_loop_; std::string device_guid_; };
diff --git a/device/hid/hid_device_filter.cc b/device/hid/hid_device_filter.cc index f16915d..596c0fbb 100644 --- a/device/hid/hid_device_filter.cc +++ b/device/hid/hid_device_filter.cc
@@ -38,8 +38,7 @@ usage_ = usage; } -bool HidDeviceFilter::Matches( - const device::mojom::HidDeviceInfo& device_info) const { +bool HidDeviceFilter::Matches(const mojom::HidDeviceInfo& device_info) const { if (vendor_id_set_) { if (device_info.vendor_id != vendor_id_) { return false; @@ -70,9 +69,8 @@ } // static -bool HidDeviceFilter::MatchesAny( - const device::mojom::HidDeviceInfo& device_info, - const std::vector<HidDeviceFilter>& filters) { +bool HidDeviceFilter::MatchesAny(const mojom::HidDeviceInfo& device_info, + const std::vector<HidDeviceFilter>& filters) { for (const HidDeviceFilter& filter : filters) { if (filter.Matches(device_info)) { return true;
diff --git a/device/hid/hid_device_filter.h b/device/hid/hid_device_filter.h index 98ae6fc4..78352c7d 100644 --- a/device/hid/hid_device_filter.h +++ b/device/hid/hid_device_filter.h
@@ -23,9 +23,9 @@ void SetUsagePage(uint16_t usage_page); void SetUsage(uint16_t usage); - bool Matches(const device::mojom::HidDeviceInfo& device_info) const; + bool Matches(const mojom::HidDeviceInfo& device_info) const; - static bool MatchesAny(const device::mojom::HidDeviceInfo& device_info, + static bool MatchesAny(const mojom::HidDeviceInfo& device_info, const std::vector<HidDeviceFilter>& filters); private:
diff --git a/device/hid/hid_device_filter_unittest.cc b/device/hid/hid_device_filter_unittest.cc index d0f8ab3..520171f 100644 --- a/device/hid/hid_device_filter_unittest.cc +++ b/device/hid/hid_device_filter_unittest.cc
@@ -28,7 +28,7 @@ void SetUp() override { device_info_ = new HidDeviceInfo( kTestDeviceId, 0x046d, 0xc31c, "Test Keyboard", "123ABC", - device::mojom::HidBusType::kHIDBusTypeUSB, + mojom::HidBusType::kHIDBusTypeUSB, std::vector<uint8_t>(kKeyboard, kKeyboard + kKeyboardSize)); } @@ -69,33 +69,33 @@ TEST_F(HidFilterTest, MatchUsagePage) { HidDeviceFilter filter; - filter.SetUsagePage(device::mojom::kPageGenericDesktop); + filter.SetUsagePage(mojom::kPageGenericDesktop); ASSERT_TRUE(filter.Matches(*device_info_->device())); } TEST_F(HidFilterTest, MatchUsagePageNegative) { HidDeviceFilter filter; - filter.SetUsagePage(device::mojom::kPageLed); + filter.SetUsagePage(mojom::kPageLed); ASSERT_FALSE(filter.Matches(*device_info_->device())); } TEST_F(HidFilterTest, MatchVendorAndUsagePage) { HidDeviceFilter filter; filter.SetVendorId(0x046d); - filter.SetUsagePage(device::mojom::kPageGenericDesktop); + filter.SetUsagePage(mojom::kPageGenericDesktop); ASSERT_TRUE(filter.Matches(*device_info_->device())); } TEST_F(HidFilterTest, MatchUsageAndPage) { HidDeviceFilter filter; - filter.SetUsagePage(device::mojom::kPageGenericDesktop); - filter.SetUsage(device::mojom::kGenericDesktopKeyboard); + filter.SetUsagePage(mojom::kPageGenericDesktop); + filter.SetUsage(mojom::kGenericDesktopKeyboard); ASSERT_TRUE(filter.Matches(*device_info_->device())); } TEST_F(HidFilterTest, MatchUsageAndPageNegative) { HidDeviceFilter filter; - filter.SetUsagePage(device::mojom::kPageGenericDesktop); + filter.SetUsagePage(mojom::kPageGenericDesktop); filter.SetUsage(0x02); ASSERT_FALSE(filter.Matches(*device_info_->device())); } @@ -108,7 +108,7 @@ TEST_F(HidFilterTest, MatchFilterList) { std::vector<HidDeviceFilter> filters; HidDeviceFilter filter; - filter.SetUsagePage(device::mojom::kPageGenericDesktop); + filter.SetUsagePage(mojom::kPageGenericDesktop); filters.push_back(filter); ASSERT_TRUE(HidDeviceFilter::MatchesAny(*device_info_->device(), filters)); } @@ -116,7 +116,7 @@ TEST_F(HidFilterTest, MatchFilterListNegative) { std::vector<HidDeviceFilter> filters; HidDeviceFilter filter; - filter.SetUsagePage(device::mojom::kPageLed); + filter.SetUsagePage(mojom::kPageLed); filters.push_back(filter); ASSERT_FALSE(HidDeviceFilter::MatchesAny(*device_info_->device(), filters)); }
diff --git a/device/hid/hid_device_info.cc b/device/hid/hid_device_info.cc index 8a63a1c..6e2654c 100644 --- a/device/hid/hid_device_info.cc +++ b/device/hid/hid_device_info.cc
@@ -15,11 +15,11 @@ uint16_t product_id, const std::string& product_name, const std::string& serial_number, - device::mojom::HidBusType bus_type, + mojom::HidBusType bus_type, const std::vector<uint8_t> report_descriptor, std::string device_node) : platform_device_id_(platform_device_id) { - std::vector<device::mojom::HidCollectionInfoPtr> collections; + std::vector<mojom::HidCollectionInfoPtr> collections; bool has_report_id; size_t max_input_report_size; size_t max_output_report_size; @@ -30,7 +30,7 @@ &max_input_report_size, &max_output_report_size, &max_feature_report_size); - device_ = device::mojom::HidDeviceInfo::New( + device_ = mojom::HidDeviceInfo::New( base::GenerateGUID(), vendor_id, product_id, product_name, serial_number, bus_type, report_descriptor, std::move(collections), has_report_id, max_input_report_size, max_output_report_size, max_feature_report_size, @@ -42,18 +42,18 @@ uint16_t product_id, const std::string& product_name, const std::string& serial_number, - device::mojom::HidBusType bus_type, - device::mojom::HidCollectionInfoPtr collection, + mojom::HidBusType bus_type, + mojom::HidCollectionInfoPtr collection, size_t max_input_report_size, size_t max_output_report_size, size_t max_feature_report_size) : platform_device_id_(platform_device_id) { - std::vector<device::mojom::HidCollectionInfoPtr> collections; + std::vector<mojom::HidCollectionInfoPtr> collections; bool has_report_id = !collection->report_ids.empty(); collections.push_back(std::move(collection)); std::vector<uint8_t> report_descriptor; - device_ = device::mojom::HidDeviceInfo::New( + device_ = mojom::HidDeviceInfo::New( base::GenerateGUID(), vendor_id, product_id, product_name, serial_number, bus_type, report_descriptor, std::move(collections), has_report_id, max_input_report_size, max_output_report_size, max_feature_report_size,
diff --git a/device/hid/hid_device_info.h b/device/hid/hid_device_info.h index 3242d1c..7c338cc 100644 --- a/device/hid/hid_device_info.h +++ b/device/hid/hid_device_info.h
@@ -31,7 +31,7 @@ uint16_t product_id, const std::string& product_name, const std::string& serial_number, - device::mojom::HidBusType bus_type, + mojom::HidBusType bus_type, const std::vector<uint8_t> report_descriptor, std::string device_node = ""); @@ -40,13 +40,13 @@ uint16_t product_id, const std::string& product_name, const std::string& serial_number, - device::mojom::HidBusType bus_type, - device::mojom::HidCollectionInfoPtr collection, + mojom::HidBusType bus_type, + mojom::HidCollectionInfoPtr collection, size_t max_input_report_size, size_t max_output_report_size, size_t max_feature_report_size); - const device::mojom::HidDeviceInfoPtr& device() { return device_; } + const mojom::HidDeviceInfoPtr& device() { return device_; } // Device identification. const std::string& device_guid() const { return device_->guid; } @@ -57,10 +57,10 @@ uint16_t product_id() const { return device_->product_id; } const std::string& product_name() const { return device_->product_name; } const std::string& serial_number() const { return device_->serial_number; } - device::mojom::HidBusType bus_type() const { return device_->bus_type; } + mojom::HidBusType bus_type() const { return device_->bus_type; } // Top-Level Collections information. - const std::vector<device::mojom::HidCollectionInfoPtr>& collections() const { + const std::vector<mojom::HidCollectionInfoPtr>& collections() const { return device_->collections; } bool has_report_id() const { return device_->has_report_id; }; @@ -87,7 +87,7 @@ friend class base::RefCountedThreadSafe<HidDeviceInfo>; HidPlatformDeviceId platform_device_id_; - device::mojom::HidDeviceInfoPtr device_; + mojom::HidDeviceInfoPtr device_; DISALLOW_COPY_AND_ASSIGN(HidDeviceInfo); };
diff --git a/device/hid/hid_manager_impl.cc b/device/hid/hid_manager_impl.cc index cfffd5ef..ee09c03 100644 --- a/device/hid/hid_manager_impl.cc +++ b/device/hid/hid_manager_impl.cc
@@ -37,12 +37,12 @@ g_hid_service.Get() = std::move(hid_service); } -void HidManagerImpl::AddBinding(device::mojom::HidManagerRequest request) { +void HidManagerImpl::AddBinding(mojom::HidManagerRequest request) { bindings_.AddBinding(this, std::move(request)); } void HidManagerImpl::GetDevicesAndSetClient( - device::mojom::HidManagerClientAssociatedPtrInfo client, + mojom::HidManagerClientAssociatedPtrInfo client, GetDevicesCallback callback) { hid_service_->GetDevices(base::BindOnce( &HidManagerImpl::CreateDeviceList, weak_factory_.GetWeakPtr(), @@ -57,14 +57,14 @@ void HidManagerImpl::CreateDeviceList( GetDevicesCallback callback, - device::mojom::HidManagerClientAssociatedPtrInfo client, - std::vector<device::mojom::HidDeviceInfoPtr> devices) { + mojom::HidManagerClientAssociatedPtrInfo client, + std::vector<mojom::HidDeviceInfoPtr> devices) { std::move(callback).Run(std::move(devices)); if (!client.is_valid()) return; - device::mojom::HidManagerClientAssociatedPtr client_ptr; + mojom::HidManagerClientAssociatedPtr client_ptr; client_ptr.Bind(std::move(client)); clients_.AddPtr(std::move(client_ptr)); } @@ -77,30 +77,29 @@ base::Passed(&callback))); } -void HidManagerImpl::CreateConnection( - ConnectCallback callback, - scoped_refptr<device::HidConnection> connection) { +void HidManagerImpl::CreateConnection(ConnectCallback callback, + scoped_refptr<HidConnection> connection) { if (!connection) { std::move(callback).Run(nullptr); return; } - device::mojom::HidConnectionPtr client; + mojom::HidConnectionPtr client; mojo::MakeStrongBinding(base::MakeUnique<HidConnectionImpl>(connection), mojo::MakeRequest(&client)); std::move(callback).Run(std::move(client)); } -void HidManagerImpl::OnDeviceAdded(device::mojom::HidDeviceInfoPtr device) { - device::mojom::HidDeviceInfo* device_info = device.get(); - clients_.ForAllPtrs([device_info](device::mojom::HidManagerClient* client) { +void HidManagerImpl::OnDeviceAdded(mojom::HidDeviceInfoPtr device) { + mojom::HidDeviceInfo* device_info = device.get(); + clients_.ForAllPtrs([device_info](mojom::HidManagerClient* client) { client->DeviceAdded(device_info->Clone()); }); } -void HidManagerImpl::OnDeviceRemoved(device::mojom::HidDeviceInfoPtr device) { - device::mojom::HidDeviceInfo* device_info = device.get(); - clients_.ForAllPtrs([device_info](device::mojom::HidManagerClient* client) { +void HidManagerImpl::OnDeviceRemoved(mojom::HidDeviceInfoPtr device) { + mojom::HidDeviceInfo* device_info = device.get(); + clients_.ForAllPtrs([device_info](mojom::HidManagerClient* client) { client->DeviceRemoved(device_info->Clone()); }); }
diff --git a/device/hid/hid_manager_impl.h b/device/hid/hid_manager_impl.h index 83033d1..dbf3577 100644 --- a/device/hid/hid_manager_impl.h +++ b/device/hid/hid_manager_impl.h
@@ -20,8 +20,7 @@ // HidManagerImpl is owned by Device Service. It is reponsible for handling mojo // communications from clients. It delegates to HidService the real work of // talking with different platforms. -class HidManagerImpl : public device::mojom::HidManager, - public device::HidService::Observer { +class HidManagerImpl : public mojom::HidManager, public HidService::Observer { public: HidManagerImpl(); ~HidManagerImpl() override; @@ -31,33 +30,31 @@ // passed |hid_service|. static void SetHidServiceForTesting(std::unique_ptr<HidService> hid_service); - void AddBinding(device::mojom::HidManagerRequest request); + void AddBinding(mojom::HidManagerRequest request); - // device::mojom::HidManager implementation: - void GetDevicesAndSetClient( - device::mojom::HidManagerClientAssociatedPtrInfo client, - GetDevicesCallback callback) override; + // mojom::HidManager implementation: + void GetDevicesAndSetClient(mojom::HidManagerClientAssociatedPtrInfo client, + GetDevicesCallback callback) override; void GetDevices(GetDevicesCallback callback) override; void Connect(const std::string& device_guid, ConnectCallback callback) override; private: void CreateDeviceList(GetDevicesCallback callback, - device::mojom::HidManagerClientAssociatedPtrInfo client, - std::vector<device::mojom::HidDeviceInfoPtr> devices); + mojom::HidManagerClientAssociatedPtrInfo client, + std::vector<mojom::HidDeviceInfoPtr> devices); void CreateConnection(ConnectCallback callback, scoped_refptr<HidConnection> connection); // HidService::Observer: - void OnDeviceAdded(device::mojom::HidDeviceInfoPtr device_info) override; - void OnDeviceRemoved(device::mojom::HidDeviceInfoPtr device_info) override; + void OnDeviceAdded(mojom::HidDeviceInfoPtr device_info) override; + void OnDeviceRemoved(mojom::HidDeviceInfoPtr device_info) override; std::unique_ptr<HidService> hid_service_; - mojo::BindingSet<device::mojom::HidManager> bindings_; - mojo::AssociatedInterfacePtrSet<device::mojom::HidManagerClient> clients_; - ScopedObserver<device::HidService, device::HidService::Observer> - hid_service_observer_; + mojo::BindingSet<mojom::HidManager> bindings_; + mojo::AssociatedInterfacePtrSet<mojom::HidManagerClient> clients_; + ScopedObserver<HidService, HidService::Observer> hid_service_observer_; base::WeakPtrFactory<HidManagerImpl> weak_factory_; DISALLOW_COPY_AND_ASSIGN(HidManagerImpl);
diff --git a/device/hid/hid_report_descriptor.cc b/device/hid/hid_report_descriptor.cc index 4c75077..fd04bf6 100644 --- a/device/hid/hid_report_descriptor.cc +++ b/device/hid/hid_report_descriptor.cc
@@ -29,7 +29,7 @@ HidReportDescriptor::~HidReportDescriptor() {} void HidReportDescriptor::GetDetails( - std::vector<device::mojom::HidCollectionInfoPtr>* top_level_collections, + std::vector<mojom::HidCollectionInfoPtr>* top_level_collections, bool* has_report_id, size_t* max_input_report_size, size_t* max_output_report_size, @@ -46,7 +46,7 @@ *max_feature_report_size = 0; // Global tags data: - auto current_usage_page = device::mojom::kPageUndefined; + auto current_usage_page = mojom::kPageUndefined; size_t current_report_count = 0; size_t cached_report_count = 0; size_t current_report_size = 0; @@ -65,8 +65,8 @@ if (!current_item->parent() && (current_usage <= std::numeric_limits<uint16_t>::max())) { // This is a top-level collection. - auto collection = device::mojom::HidCollectionInfo::New(); - collection->usage = device::mojom::HidUsageAndPage::New( + auto collection = mojom::HidCollectionInfo::New(); + collection->usage = mojom::HidUsageAndPage::New( static_cast<uint16_t>(current_usage), static_cast<uint16_t>(current_usage_page)); top_level_collections->push_back(std::move(collection));
diff --git a/device/hid/hid_report_descriptor.h b/device/hid/hid_report_descriptor.h index f08ea7e..46761a7 100644 --- a/device/hid/hid_report_descriptor.h +++ b/device/hid/hid_report_descriptor.h
@@ -31,7 +31,7 @@ // Returns top-level collections present in the descriptor, // together with max report sizes void GetDetails( - std::vector<device::mojom::HidCollectionInfoPtr>* top_level_collections, + std::vector<mojom::HidCollectionInfoPtr>* top_level_collections, bool* has_report_id, size_t* max_input_report_size, size_t* max_output_report_size,
diff --git a/device/hid/hid_report_descriptor_unittest.cc b/device/hid/hid_report_descriptor_unittest.cc index 470dddb3..a60bee1 100644 --- a/device/hid/hid_report_descriptor_unittest.cc +++ b/device/hid/hid_report_descriptor_unittest.cc
@@ -21,9 +21,9 @@ class HidReportDescriptorTest : public testing::Test { protected: - using HidUsageAndPage = device::mojom::HidUsageAndPage; - using HidCollectionInfo = device::mojom::HidCollectionInfo; - using HidCollectionInfoPtr = device::mojom::HidCollectionInfoPtr; + using HidUsageAndPage = mojom::HidUsageAndPage; + using HidCollectionInfo = mojom::HidCollectionInfo; + using HidCollectionInfoPtr = mojom::HidCollectionInfoPtr; void SetUp() override { descriptor_ = NULL; } @@ -90,7 +90,7 @@ TEST_F(HidReportDescriptorTest, ValidateDetails_Digitizer) { auto digitizer = HidCollectionInfo::New(); - digitizer->usage = HidUsageAndPage::New(0x01, device::mojom::kPageDigitizer); + digitizer->usage = HidUsageAndPage::New(0x01, mojom::kPageDigitizer); digitizer->report_ids.push_back(1); digitizer->report_ids.push_back(2); digitizer->report_ids.push_back(3); @@ -101,8 +101,7 @@ TEST_F(HidReportDescriptorTest, ValidateDetails_Keyboard) { auto keyboard = HidCollectionInfo::New(); - keyboard->usage = - HidUsageAndPage::New(0x06, device::mojom::kPageGenericDesktop); + keyboard->usage = HidUsageAndPage::New(0x06, mojom::kPageGenericDesktop); std::vector<HidCollectionInfoPtr> expected; expected.push_back(std::move(keyboard)); ValidateDetails(expected, false, 8, 1, 0, kKeyboard, kKeyboardSize); @@ -110,7 +109,7 @@ TEST_F(HidReportDescriptorTest, ValidateDetails_Monitor) { auto monitor = HidCollectionInfo::New(); - monitor->usage = HidUsageAndPage::New(0x01, device::mojom::kPageMonitor0); + monitor->usage = HidUsageAndPage::New(0x01, mojom::kPageMonitor0); monitor->report_ids.push_back(1); monitor->report_ids.push_back(2); monitor->report_ids.push_back(3); @@ -123,7 +122,7 @@ TEST_F(HidReportDescriptorTest, ValidateDetails_Mouse) { auto mouse = HidCollectionInfo::New(); - mouse->usage = HidUsageAndPage::New(0x02, device::mojom::kPageGenericDesktop); + mouse->usage = HidUsageAndPage::New(0x02, mojom::kPageGenericDesktop); std::vector<HidCollectionInfoPtr> expected; expected.push_back(std::move(mouse)); ValidateDetails(expected, false, 3, 0, 0, kMouse, kMouseSize); @@ -131,13 +130,13 @@ TEST_F(HidReportDescriptorTest, ValidateDetails_LogitechUnifyingReceiver) { auto hidpp_short = HidCollectionInfo::New(); - hidpp_short->usage = HidUsageAndPage::New(0x01, device::mojom::kPageVendor); + hidpp_short->usage = HidUsageAndPage::New(0x01, mojom::kPageVendor); hidpp_short->report_ids.push_back(0x10); auto hidpp_long = HidCollectionInfo::New(); - hidpp_long->usage = HidUsageAndPage::New(0x02, device::mojom::kPageVendor); + hidpp_long->usage = HidUsageAndPage::New(0x02, mojom::kPageVendor); hidpp_long->report_ids.push_back(0x11); auto hidpp_dj = HidCollectionInfo::New(); - hidpp_dj->usage = HidUsageAndPage::New(0x04, device::mojom::kPageVendor); + hidpp_dj->usage = HidUsageAndPage::New(0x04, mojom::kPageVendor); hidpp_dj->report_ids.push_back(0x20); hidpp_dj->report_ids.push_back(0x21);
diff --git a/device/hid/hid_service.cc b/device/hid/hid_service.cc index 702c4ad..b78cc56 100644 --- a/device/hid/hid_service.cc +++ b/device/hid/hid_service.cc
@@ -24,11 +24,10 @@ namespace device { -void HidService::Observer::OnDeviceAdded( - device::mojom::HidDeviceInfoPtr device_info) {} +void HidService::Observer::OnDeviceAdded(mojom::HidDeviceInfoPtr device_info) {} void HidService::Observer::OnDeviceRemoved( - device::mojom::HidDeviceInfoPtr device_info) {} + mojom::HidDeviceInfoPtr device_info) {} // static constexpr base::TaskTraits HidService::kBlockingTaskTraits; @@ -120,9 +119,9 @@ std::vector<GetDevicesCallback> callbacks; callbacks.swap(pending_enumerations_); - // Clone and pass device::mojom::HidDeviceInfoPtr vector for each clients. + // Clone and pass mojom::HidDeviceInfoPtr vector for each clients. for (auto& callback : callbacks) { - std::vector<device::mojom::HidDeviceInfoPtr> devices; + std::vector<mojom::HidDeviceInfoPtr> devices; for (const auto& map_entry : devices_) devices.push_back(map_entry.second->device()->Clone()); std::move(callback).Run(std::move(devices));
diff --git a/device/hid/hid_service.h b/device/hid/hid_service.h index e0aea91..22b82bd 100644 --- a/device/hid/hid_service.h +++ b/device/hid/hid_service.h
@@ -36,15 +36,15 @@ // might cause missing OnDeviceAdded() and OnDeviceRemoved() notifications. class Observer { public: - virtual void OnDeviceAdded(device::mojom::HidDeviceInfoPtr info); + virtual void OnDeviceAdded(mojom::HidDeviceInfoPtr info); // Notifies all observers that a device is being removed, called before // removing the device from HidService. Observers should not depend on the // order in which they are notified of the OnDeviceRemove event. - virtual void OnDeviceRemoved(device::mojom::HidDeviceInfoPtr info); + virtual void OnDeviceRemoved(mojom::HidDeviceInfoPtr info); }; using GetDevicesCallback = - base::OnceCallback<void(std::vector<device::mojom::HidDeviceInfoPtr>)>; + base::OnceCallback<void(std::vector<mojom::HidDeviceInfoPtr>)>; using ConnectCallback = base::Callback<void(scoped_refptr<HidConnection> connection)>;
diff --git a/device/hid/hid_service_linux.cc b/device/hid/hid_service_linux.cc index 660f6b52..365e2dbe 100644 --- a/device/hid/hid_service_linux.cc +++ b/device/hid/hid_service_linux.cc
@@ -157,7 +157,7 @@ scoped_refptr<HidDeviceInfo> device_info(new HidDeviceInfo( platform_device_id, vendor_id, product_id, product_name, serial_number, // TODO(reillyg): Detect Bluetooth. crbug.com/443335 - device::mojom::HidBusType::kHIDBusTypeUSB, + mojom::HidBusType::kHIDBusTypeUSB, std::vector<uint8_t>(report_descriptor_str.begin(), report_descriptor_str.end()), device_node));
diff --git a/device/hid/hid_service_mac.cc b/device/hid/hid_service_mac.cc index 0d86a18..e899301 100644 --- a/device/hid/hid_service_mac.cc +++ b/device/hid/hid_service_mac.cc
@@ -86,7 +86,7 @@ GetStringProperty(service, CFSTR(kIOHIDProductKey)), GetStringProperty(service, CFSTR(kIOHIDSerialNumberKey)), // TODO(reillyg): Detect Bluetooth. crbug.com/443335 - device::mojom::HidBusType::kHIDBusTypeUSB, report_descriptor); + mojom::HidBusType::kHIDBusTypeUSB, report_descriptor); } } // namespace
diff --git a/device/hid/hid_service_unittest.cc b/device/hid/hid_service_unittest.cc index ff1a7f6a..531fc8e 100644 --- a/device/hid/hid_service_unittest.cc +++ b/device/hid/hid_service_unittest.cc
@@ -25,7 +25,7 @@ }; void OnGetDevices(const base::Closure& quit_closure, - std::vector<device::mojom::HidDeviceInfoPtr> devices) { + std::vector<mojom::HidDeviceInfoPtr> devices) { // Since there's no guarantee that any devices are connected at the moment // this test doesn't assume anything about the result but it at least verifies // that devices can be enumerated without the application crashing.
diff --git a/device/hid/hid_service_win.cc b/device/hid/hid_service_win.cc index a50ddd4..902c5aaa 100644 --- a/device/hid/hid_service_win.cc +++ b/device/hid/hid_service_win.cc
@@ -132,7 +132,7 @@ PHIDP_PREPARSED_DATA preparsed_data, HIDP_REPORT_TYPE report_type, USHORT button_caps_length, - device::mojom::HidCollectionInfo* collection_info) { + mojom::HidCollectionInfo* collection_info) { if (button_caps_length > 0) { std::unique_ptr<HIDP_BUTTON_CAPS[]> button_caps( new HIDP_BUTTON_CAPS[button_caps_length]); @@ -155,7 +155,7 @@ PHIDP_PREPARSED_DATA preparsed_data, HIDP_REPORT_TYPE report_type, USHORT value_caps_length, - device::mojom::HidCollectionInfo* collection_info) { + mojom::HidCollectionInfo* collection_info) { if (value_caps_length > 0) { std::unique_ptr<HIDP_VALUE_CAPS[]> value_caps( new HIDP_VALUE_CAPS[value_caps_length]); @@ -219,9 +219,9 @@ max_feature_report_size = capabilities.FeatureReportByteLength - 1; } - auto collection_info = device::mojom::HidCollectionInfo::New(); - collection_info->usage = device::mojom::HidUsageAndPage::New( - capabilities.Usage, capabilities.UsagePage); + auto collection_info = mojom::HidCollectionInfo::New(); + collection_info->usage = + mojom::HidUsageAndPage::New(capabilities.Usage, capabilities.UsagePage); CollectInfoFromButtonCaps(preparsed_data, HidP_Input, capabilities.NumberInputButtonCaps, collection_info.get()); @@ -263,7 +263,7 @@ device_path, attrib.VendorID, attrib.ProductID, product_name, serial_number, // TODO(reillyg): Detect Bluetooth. crbug.com/443335 - device::mojom::HidBusType::kHIDBusTypeUSB, std::move(collection_info), + mojom::HidBusType::kHIDBusTypeUSB, std::move(collection_info), max_input_report_size, max_output_report_size, max_feature_report_size)); HidD_FreePreparsedData(preparsed_data);
diff --git a/device/hid/hid_service_win.h b/device/hid/hid_service_win.h index 3f5746f91a..e828937 100644 --- a/device/hid/hid_service_win.h +++ b/device/hid/hid_service_win.h
@@ -46,12 +46,12 @@ PHIDP_PREPARSED_DATA preparsed_data, HIDP_REPORT_TYPE report_type, USHORT button_caps_length, - device::mojom::HidCollectionInfo* collection_info); + mojom::HidCollectionInfo* collection_info); static void CollectInfoFromValueCaps( PHIDP_PREPARSED_DATA preparsed_data, HIDP_REPORT_TYPE report_type, USHORT value_caps_length, - device::mojom::HidCollectionInfo* collection_info); + mojom::HidCollectionInfo* collection_info); static void AddDeviceBlocking( base::WeakPtr<HidServiceWin> service, scoped_refptr<base::SequencedTaskRunner> task_runner,
diff --git a/device/hid/input_service_linux_unittest.cc b/device/hid/input_service_linux_unittest.cc index 3f0387c..fcdba40 100644 --- a/device/hid/input_service_linux_unittest.cc +++ b/device/hid/input_service_linux_unittest.cc
@@ -17,7 +17,7 @@ namespace { void OnGetDevices(base::OnceClosure quit_closure, - std::vector<device::mojom::InputDeviceInfoPtr> devices) { + std::vector<mojom::InputDeviceInfoPtr> devices) { for (size_t i = 0; i < devices.size(); ++i) ASSERT_TRUE(!devices[i]->id.empty());
diff --git a/device/hid/public/cpp/hid_usage_and_page.cc b/device/hid/public/cpp/hid_usage_and_page.cc index 12f07782..54798da 100644 --- a/device/hid/public/cpp/hid_usage_and_page.cc +++ b/device/hid/public/cpp/hid_usage_and_page.cc
@@ -6,30 +6,30 @@ namespace device { -bool IsProtected(const device::mojom::HidUsageAndPage& hid_usage_and_page) { +bool IsProtected(const mojom::HidUsageAndPage& hid_usage_and_page) { const uint16_t usage = hid_usage_and_page.usage; const uint16_t usage_page = hid_usage_and_page.usage_page; - if (usage_page == device::mojom::kPageKeyboard) + if (usage_page == mojom::kPageKeyboard) return true; - if (usage_page != device::mojom::kPageGenericDesktop) + if (usage_page != mojom::kPageGenericDesktop) return false; - if (usage == device::mojom::kGenericDesktopPointer || - usage == device::mojom::kGenericDesktopMouse || - usage == device::mojom::kGenericDesktopKeyboard || - usage == device::mojom::kGenericDesktopKeypad) { + if (usage == mojom::kGenericDesktopPointer || + usage == mojom::kGenericDesktopMouse || + usage == mojom::kGenericDesktopKeyboard || + usage == mojom::kGenericDesktopKeypad) { return true; } - if (usage >= device::mojom::kGenericDesktopSystemControl && - usage <= device::mojom::kGenericDesktopSystemWarmRestart) { + if (usage >= mojom::kGenericDesktopSystemControl && + usage <= mojom::kGenericDesktopSystemWarmRestart) { return true; } - if (usage >= device::mojom::kGenericDesktopSystemDock && - usage <= device::mojom::kGenericDesktopSystemDisplaySwap) { + if (usage >= mojom::kGenericDesktopSystemDock && + usage <= mojom::kGenericDesktopSystemDisplaySwap) { return true; }
diff --git a/device/hid/public/cpp/hid_usage_and_page.h b/device/hid/public/cpp/hid_usage_and_page.h index d544c5a..b316c37a 100644 --- a/device/hid/public/cpp/hid_usage_and_page.h +++ b/device/hid/public/cpp/hid_usage_and_page.h
@@ -10,7 +10,7 @@ namespace device { // Indicates whether this usage is protected by Chrome. -bool IsProtected(const device::mojom::HidUsageAndPage& hid_usage_and_page); +bool IsProtected(const mojom::HidUsageAndPage& hid_usage_and_page); } // namespace device
diff --git a/headless/lib/headless_devtools_client_browsertest.cc b/headless/lib/headless_devtools_client_browsertest.cc index de392c8f..41351ee 100644 --- a/headless/lib/headless_devtools_client_browsertest.cc +++ b/headless/lib/headless_devtools_client_browsertest.cc
@@ -1333,8 +1333,8 @@ if (layout_node->HasInlineTextNodes()) { std::unique_ptr<base::ListValue> inline_text_nodes( new base::ListValue()); - for (const std::unique_ptr<css::InlineTextBox>& inline_text_box : - *layout_node->GetInlineTextNodes()) { + for (const std::unique_ptr<dom_snapshot::InlineTextBox>& + inline_text_box : *layout_node->GetInlineTextNodes()) { size_t index = inline_text_nodes->GetSize(); inline_text_nodes->Set(index, inline_text_box->Serialize()); }
diff --git a/infra/config/cq.cfg b/infra/config/cq.cfg index d6dbc1f..e93d430 100644 --- a/infra/config/cq.cfg +++ b/infra/config/cq.cfg
@@ -40,16 +40,16 @@ name: "master.tryserver.chromium.chromiumos" builders { name: "chromeos-amd64-generic-rel" - experiment_percentage: 3 + experiment_percentage: 100 } - builders { - name: "chromeos-daisy-rel" - experiment_percentage: 3 - } - builders { - name: "linux-chromeos-rel" - experiment_percentage: 3 - } + #builders { + # name: "chromeos-daisy-rel" + # experiment_percentage: 3 + #} + #builders { + # name: "linux-chromeos-rel" + # experiment_percentage: 3 + #} } buckets { name: "master.tryserver.chromium.linux"
diff --git a/ios/build/bots/chromium.fyi/EarlGreyiOS.json b/ios/build/bots/chromium.fyi/EarlGreyiOS.json index 9e645476..090acf3 100644 --- a/ios/build/bots/chromium.fyi/EarlGreyiOS.json +++ b/ios/build/bots/chromium.fyi/EarlGreyiOS.json
@@ -20,7 +20,7 @@ "--enable-features=CredentialManager" ], "device type": "iPhone 6s", - "os": "11.0", + "os": "10.0", "xcode version": "9.0", "xctest": true }, @@ -30,7 +30,7 @@ "--enable-features=WebPayments" ], "device type": "iPhone 6s", - "os": "11.0", + "os": "10.0", "xcode version": "9.0", "xctest": true }, @@ -40,49 +40,49 @@ "--enable-reading-list" ], "device type": "iPhone 6s", - "os": "11.0", + "os": "10.0", "xcode version": "9.0", "xctest": true }, { "app": "ios_chrome_settings_egtests", "device type": "iPhone 6s", - "os": "11.0", + "os": "10.0", "xcode version": "9.0", "xctest": true }, { "app": "ios_chrome_smoke_egtests", "device type": "iPhone 6s", - "os": "11.0", + "os": "10.0", "xcode version": "9.0", "xctest": true }, { "app": "ios_chrome_ui_egtests", "device type": "iPhone 6s", - "os": "11.0", + "os": "10.0", "xcode version": "9.0", "xctest": true }, { "app": "ios_chrome_web_egtests", "device type": "iPhone 6s", - "os": "11.0", + "os": "10.0", "xcode version": "9.0", "xctest": true }, { "app": "ios_showcase_egtests", "device type": "iPhone 6s", - "os": "11.0", + "os": "10.0", "xcode version": "9.0", "xctest": true }, { "app": "ios_web_shell_egtests", "device type": "iPhone 6s", - "os": "11.0", + "os": "10.0", "xcode version": "9.0", "xctest": true },
diff --git a/ios/chrome/app/main_controller.mm b/ios/chrome/app/main_controller.mm index 632d935..a9d53f02 100644 --- a/ios/chrome/app/main_controller.mm +++ b/ios/chrome/app/main_controller.mm
@@ -117,7 +117,7 @@ #import "ios/chrome/browser/ui/external_file_remover_impl.h" #import "ios/chrome/browser/ui/first_run/first_run_util.h" #import "ios/chrome/browser/ui/first_run/welcome_to_chrome_view_controller.h" -#import "ios/chrome/browser/ui/fullscreen/fullscreen_controller.h" +#import "ios/chrome/browser/ui/fullscreen/legacy_fullscreen_controller.h" #import "ios/chrome/browser/ui/history/history_panel_view_controller.h" #import "ios/chrome/browser/ui/main/browser_view_wrangler.h" #import "ios/chrome/browser/ui/main/main_coordinator.h"
diff --git a/ios/chrome/browser/snapshots/web_controller_snapshot_helper.mm b/ios/chrome/browser/snapshots/web_controller_snapshot_helper.mm index 33c03a3c..b6ed641f 100644 --- a/ios/chrome/browser/snapshots/web_controller_snapshot_helper.mm +++ b/ios/chrome/browser/snapshots/web_controller_snapshot_helper.mm
@@ -194,7 +194,7 @@ UIImage* snapshotToCache = nil; // TODO(crbug.com/370994): Remove all code that references a Tab's delegates // from this file. - if (visibleFrameOnly || ![_tab fullScreenControllerDelegate]) { + if (visibleFrameOnly || ![_tab legacyFullscreenControllerDelegate]) { snapshotToCache = snapshot; } else { // Crops the bottom of the fullscreen snapshot.
diff --git a/ios/chrome/browser/tabs/tab.h b/ios/chrome/browser/tabs/tab.h index 911e903..9c109f75 100644 --- a/ios/chrome/browser/tabs/tab.h +++ b/ios/chrome/browser/tabs/tab.h
@@ -19,8 +19,8 @@ @class CastController; @class ExternalAppLauncher; @class FormInputAccessoryViewController; -@class FullScreenController; -@protocol FullScreenControllerDelegate; +@class LegacyFullscreenController; +@protocol LegacyFullscreenControllerDelegate; class GURL; @class OpenInController; @class OverscrollActionsController; @@ -116,8 +116,8 @@ // The delegate to use for the legacy fullscreen controller. It should not be // set if the new fullscreen is enabled. // TODO(crbug.com/778823): Remove this property. -@property(nonatomic, weak) id<FullScreenControllerDelegate> - fullScreenControllerDelegate; +@property(nonatomic, weak) id<LegacyFullscreenControllerDelegate> + legacyFullscreenControllerDelegate; @property(nonatomic, readonly) OverscrollActionsController* overscrollActionsController;
diff --git a/ios/chrome/browser/tabs/tab.mm b/ios/chrome/browser/tabs/tab.mm index cb1d0d86..1940541 100644 --- a/ios/chrome/browser/tabs/tab.mm +++ b/ios/chrome/browser/tabs/tab.mm
@@ -78,8 +78,8 @@ #import "ios/chrome/browser/ui/commands/open_url_command.h" #import "ios/chrome/browser/ui/commands/show_signin_command.h" #import "ios/chrome/browser/ui/downloads/download_manager_controller.h" -#import "ios/chrome/browser/ui/fullscreen/fullscreen_controller.h" #import "ios/chrome/browser/ui/fullscreen/fullscreen_features.h" +#import "ios/chrome/browser/ui/fullscreen/legacy_fullscreen_controller.h" #import "ios/chrome/browser/ui/open_in_controller.h" #import "ios/chrome/browser/ui/overscroll_actions/overscroll_actions_controller.h" #include "ios/chrome/browser/ui/ui_util.h" @@ -167,7 +167,7 @@ double _lastVisitedTimestamp; // The Full Screen Controller responsible for hiding/showing the toolbar. - FullScreenController* _fullScreenController; + LegacyFullscreenController* _legacyFullscreenController; // The Overscroll controller responsible for displaying the // overscrollActionsView above the toolbar. @@ -273,7 +273,8 @@ @synthesize snapshotOverlayProvider = snapshotOverlayProvider_; @synthesize tabSnapshottingDelegate = tabSnapshottingDelegate_; @synthesize tabHeadersDelegate = tabHeadersDelegate_; -@synthesize fullScreenControllerDelegate = fullScreenControllerDelegate_; +@synthesize legacyFullscreenControllerDelegate = + legacyFullscreenControllerDelegate_; @synthesize snapshotManager = _snapshotManager; - (instancetype)initWithWebState:(web::WebState*)webState { @@ -423,7 +424,7 @@ return; if (!base::FeatureList::IsEnabled(features::kNewFullscreen)) { - [_fullScreenController moveContentBelowHeader]; + [_legacyFullscreenController moveContentBelowHeader]; } // If the page has finished loading, take a snapshot. If the page is still @@ -438,27 +439,27 @@ [self countMainFrameLoad]; } -- (void)setFullScreenControllerDelegate: - (id<FullScreenControllerDelegate>)fullScreenControllerDelegate { +- (void)setLegacyFullscreenControllerDelegate: + (id<LegacyFullscreenControllerDelegate>)fullScreenControllerDelegate { DCHECK(!base::FeatureList::IsEnabled(features::kNewFullscreen)); - if (fullScreenControllerDelegate == fullScreenControllerDelegate_) + if (fullScreenControllerDelegate == legacyFullscreenControllerDelegate_) return; - // Lazily create a FullScreenController. + // Lazily create a LegacyFullscreenController. // The check for fullScreenControllerDelegate is necessary to avoid recreating - // a FullScreenController during teardown. - if (!_fullScreenController && fullScreenControllerDelegate) { - _fullScreenController = [[FullScreenController alloc] + // a LegacyFullscreenController during teardown. + if (!_legacyFullscreenController && fullScreenControllerDelegate) { + _legacyFullscreenController = [[LegacyFullscreenController alloc] initWithDelegate:fullScreenControllerDelegate navigationManager:self.navigationManager sessionID:self.tabId]; - [self.webController addObserver:_fullScreenController]; + [self.webController addObserver:_legacyFullscreenController]; // If the content of the page was loaded without knowledge of the // toolbar position it will be misplaced under the toolbar instead of // right below. This happens e.g. in the case of preloading. This is to make // sure the content is moved to the right place. - [_fullScreenController moveContentBelowHeader]; + [_legacyFullscreenController moveContentBelowHeader]; } - fullScreenControllerDelegate_ = fullScreenControllerDelegate; + legacyFullscreenControllerDelegate_ = fullScreenControllerDelegate; } - (void)setOverscrollActionsControllerDelegate: @@ -535,11 +536,11 @@ // Clean up legacy fullscreen. if (!base::FeatureList::IsEnabled(features::kNewFullscreen)) { - self.fullScreenControllerDelegate = nil; - if (_fullScreenController) - [self.webController removeObserver:_fullScreenController]; - [_fullScreenController invalidate]; - _fullScreenController = nil; + self.legacyFullscreenControllerDelegate = nil; + if (_legacyFullscreenController) + [self.webController removeObserver:_legacyFullscreenController]; + [_legacyFullscreenController invalidate]; + _legacyFullscreenController = nil; } // Cancel any queued dialogs. @@ -781,7 +782,7 @@ if (!base::FeatureList::IsEnabled(features::kNewFullscreen)) { // Skip the next attempt to correct the scroll offset for the toolbar // height. Used when programatically scrolling down the y offset. - [_fullScreenController shouldSkipNextScrollOffsetForHeader]; + [_legacyFullscreenController shouldSkipNextScrollOffsetForHeader]; } } @@ -790,7 +791,7 @@ - (void)updateFullscreenWithToolbarVisible:(BOOL)visible { DCHECK(!base::FeatureList::IsEnabled(features::kNewFullscreen)); - [_fullScreenController moveHeaderToRestingPosition:visible]; + [_legacyFullscreenController moveHeaderToRestingPosition:visible]; } #pragma mark - @@ -884,7 +885,7 @@ if (!navigation->IsSameDocument() && !base::FeatureList::IsEnabled(features::kNewFullscreen)) { // Move the toolbar to visible during page load. - [_fullScreenController disableFullScreen]; + [_legacyFullscreenController disableFullScreen]; } if ([self shouldRecordPageLoadStartForNavigation:navigation] && @@ -908,7 +909,7 @@ // |webWillAddPendingURL:transition:| is not called for native page loads. // TODO(crbug.com/381201): Move this call there once that bug is fixed so // that |disableFullScreen| is called only from one place. - [_fullScreenController disableFullScreen]; + [_legacyFullscreenController disableFullScreen]; } GURL lastCommittedURL = webState->GetLastCommittedURL(); @@ -967,7 +968,7 @@ } [_webControllerSnapshotHelper setSnapshotCoalescingEnabled:YES]; if (!base::FeatureList::IsEnabled(features::kNewFullscreen) && !loadSuccess) - [_fullScreenController disableFullScreen]; + [_legacyFullscreenController disableFullScreen]; [self recordInterfaceOrientation]; navigation_metrics::RecordMainFrameNavigation( lastCommittedURL, true, self.browserState->IsOffTheRecord()); @@ -1019,7 +1020,7 @@ if (!base::FeatureList::IsEnabled(features::kNewFullscreen)) { // This is the maximum that a page will ever load and it is safe to allow // fullscreen mode. - [_fullScreenController enableFullScreen]; + [_legacyFullscreenController enableFullScreen]; } [_parentTabModel notifyTabChanged:self]; } @@ -1176,7 +1177,7 @@ if (item) { web::SecurityStyle securityStyle = item->GetSSL().security_style; if (securityStyle == web::SECURITY_STYLE_AUTHENTICATION_BROKEN) { - [_fullScreenController disableFullScreen]; + [_legacyFullscreenController disableFullScreen]; } } } @@ -1191,7 +1192,7 @@ UIApplicationState state = [UIApplication sharedApplication].applicationState; if (webState->IsVisible() && state == UIApplicationStateActive) { - [_fullScreenController disableFullScreen]; + [_legacyFullscreenController disableFullScreen]; } } [self.dialogDelegate cancelDialogForTab:self];
diff --git a/ios/chrome/browser/ui/browser_view_controller.mm b/ios/chrome/browser/ui/browser_view_controller.mm index 7b6524d..c57f11d3 100644 --- a/ios/chrome/browser/ui/browser_view_controller.mm +++ b/ios/chrome/browser/ui/browser_view_controller.mm
@@ -136,8 +136,8 @@ #import "ios/chrome/browser/ui/external_search/external_search_coordinator.h" #import "ios/chrome/browser/ui/find_bar/find_bar_controller_ios.h" #import "ios/chrome/browser/ui/first_run/welcome_to_chrome_view_controller.h" -#import "ios/chrome/browser/ui/fullscreen/fullscreen_controller.h" #import "ios/chrome/browser/ui/fullscreen/fullscreen_features.h" +#import "ios/chrome/browser/ui/fullscreen/legacy_fullscreen_controller.h" #import "ios/chrome/browser/ui/history_popup/requirements/tab_history_presentation.h" #import "ios/chrome/browser/ui/history_popup/tab_history_legacy_coordinator.h" #import "ios/chrome/browser/ui/key_commands_provider.h" @@ -281,7 +281,7 @@ } // Duration of the toolbar animation. -const NSTimeInterval kFullScreenControllerToolbarAnimationDuration = 0.3; +const NSTimeInterval kLegacyFullscreenControllerToolbarAnimationDuration = 0.3; const CGFloat kVoiceSearchBarHeight = 59.0; @@ -377,7 +377,7 @@ CRWNativeContentProvider, CRWWebStateDelegate, DialogPresenterDelegate, - FullScreenControllerDelegate, + LegacyFullscreenControllerDelegate, KeyCommandsPlumbing, NetExportTabHelperDelegate, ManageAccountsDelegate, @@ -853,7 +853,7 @@ // |completed| should indicate if the animation finished completely or was // interrupted. |offset| should indicate the header offset after the animation. // |dragged| should indicate if the header moved due to the user dragging. -- (void)fullScreenController:(FullScreenController*)controller +- (void)fullScreenController:(LegacyFullscreenController*)controller headerAnimationCompleted:(BOOL)completed offset:(CGFloat)offset; // Performs a search with the image at the given url. The referrer is used to @@ -1922,7 +1922,7 @@ self.tabStripCoordinator.tabModel = _model; self.tabStripCoordinator.presentationProvider = self; self.tabStripCoordinator.animationWaitDuration = - kFullScreenControllerToolbarAnimationDuration; + kLegacyFullscreenControllerToolbarAnimationDuration; [self.tabStripCoordinator start]; } @@ -2484,7 +2484,7 @@ tab.snapshotOverlayProvider = self; tab.passKitDialogProvider = self; if (!base::FeatureList::IsEnabled(features::kNewFullscreen)) { - tab.fullScreenControllerDelegate = self; + tab.legacyFullscreenControllerDelegate = self; } if (!IsIPadIdiom()) { tab.overscrollActionsControllerDelegate = self; @@ -2528,7 +2528,7 @@ tab.snapshotOverlayProvider = nil; tab.passKitDialogProvider = nil; if (!base::FeatureList::IsEnabled(features::kNewFullscreen)) { - tab.fullScreenControllerDelegate = nil; + tab.legacyFullscreenControllerDelegate = nil; } if (!IsIPadIdiom()) { tab.overscrollActionsControllerDelegate = nil; @@ -3078,7 +3078,7 @@ completionHandler:handler]; } -#pragma mark - FullScreenControllerDelegate methods +#pragma mark - LegacyFullscreenControllerDelegate methods - (CGFloat)headerOffset { if (IsIPadIdiom()) @@ -3184,7 +3184,7 @@ return std::ceil(CGRectGetHeight(self.view.bounds) - footerHeight + offset); } -- (void)fullScreenController:(FullScreenController*)controller +- (void)fullScreenController:(LegacyFullscreenController*)controller headerAnimationCompleted:(BOOL)completed offset:(CGFloat)offset { if (completed) @@ -3203,7 +3203,7 @@ } } -- (void)fullScreenController:(FullScreenController*)fullScreenController +- (void)fullScreenController:(LegacyFullscreenController*)fullScreenController drawHeaderViewFromOffset:(CGFloat)headerOffset animate:(BOOL)animate { if ([_sideSwipeController inSwipe]) @@ -3229,18 +3229,19 @@ offset:headerOffset]; }; if (animate) { - [UIView animateWithDuration:kFullScreenControllerToolbarAnimationDuration - delay:0.0 - options:UIViewAnimationOptionBeginFromCurrentState - animations:block - completion:completion]; + [UIView + animateWithDuration:kLegacyFullscreenControllerToolbarAnimationDuration + delay:0.0 + options:UIViewAnimationOptionBeginFromCurrentState + animations:block + completion:completion]; } else { block(); completion(YES); } } -- (void)fullScreenController:(FullScreenController*)fullScreenController +- (void)fullScreenController:(LegacyFullscreenController*)fullScreenController drawHeaderViewFromOffset:(CGFloat)headerOffset onWebViewProxy:(id<CRWWebViewProxy>)webViewProxy changeTopContentPadding:(BOOL)changeTopContentPadding @@ -3273,11 +3274,12 @@ offset:headerOffset]; }; - [UIView animateWithDuration:kFullScreenControllerToolbarAnimationDuration - delay:0.0 - options:UIViewAnimationOptionBeginFromCurrentState - animations:block - completion:completion]; + [UIView + animateWithDuration:kLegacyFullscreenControllerToolbarAnimationDuration + delay:0.0 + options:UIViewAnimationOptionBeginFromCurrentState + animations:block + completion:completion]; } #pragma mark - VoiceSearchBarOwner
diff --git a/ios/chrome/browser/ui/fullscreen/BUILD.gn b/ios/chrome/browser/ui/fullscreen/BUILD.gn index 6aeee92..3b222a5 100644 --- a/ios/chrome/browser/ui/fullscreen/BUILD.gn +++ b/ios/chrome/browser/ui/fullscreen/BUILD.gn
@@ -17,8 +17,8 @@ source_set("legacy_fullscreen") { sources = [ - "fullscreen_controller.h", - "fullscreen_controller.mm", + "legacy_fullscreen_controller.h", + "legacy_fullscreen_controller.mm", ] configs += [ "//build/config/compiler:enable_arc" ] @@ -40,7 +40,7 @@ source_set("legacy_unit_tests") { testonly = true sources = [ - "fullscreen_controller_unittest.mm", + "legacy_fullscreen_controller_unittest.mm", ] configs += [ "//build/config/compiler:enable_arc" ]
diff --git a/ios/chrome/browser/ui/fullscreen/DEPS b/ios/chrome/browser/ui/fullscreen/DEPS index de3f308..503a3a8 100644 --- a/ios/chrome/browser/ui/fullscreen/DEPS +++ b/ios/chrome/browser/ui/fullscreen/DEPS
@@ -1,17 +1,17 @@ specific_include_rules = { # TODO(crbug.com/620139): Remove this exception. - "^fullscreen_controller\.mm$": [ + "^legacy_fullscreen_controller\.mm$": [ "+ios/web/web_state/ui/crw_web_controller.h", ], # TODO(crbug.com/620143): Remove these exceptions. - "^fullscreen_controller_unittest\.mm$": [ + "^legacy_fullscreen_controller_unittest\.mm$": [ "+ios/web/web_state/ui/crw_web_view_proxy_impl.h", "+ios/web/web_state/ui/crw_web_controller.h", ], # TODO(crbug.com/620139): Remove these exceptions. - "^fullscreen_controller_unittest\.mm$": [ + "^legacy_fullscreen_controller_unittest\.mm$": [ "+ios/web/web_state/ui/crw_web_view_proxy_impl.h", "+ios/web/web_state/ui/crw_web_controller.h", ],
diff --git a/ios/chrome/browser/ui/fullscreen/fullscreen_controller.h b/ios/chrome/browser/ui/fullscreen/legacy_fullscreen_controller.h similarity index 82% rename from ios/chrome/browser/ui/fullscreen/fullscreen_controller.h rename to ios/chrome/browser/ui/fullscreen/legacy_fullscreen_controller.h index b9d94c2..c864fbbd 100644 --- a/ios/chrome/browser/ui/fullscreen/fullscreen_controller.h +++ b/ios/chrome/browser/ui/fullscreen/legacy_fullscreen_controller.h
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef IOS_CHROME_BROWSER_UI_FULLSCREEN_FULLSCREEN_CONTROLLER_H_ -#define IOS_CHROME_BROWSER_UI_FULLSCREEN_FULLSCREEN_CONTROLLER_H_ +#ifndef IOS_CHROME_BROWSER_UI_FULLSCREEN_LEGACY_FULLSCREEN_CONTROLLER_H_ +#define IOS_CHROME_BROWSER_UI_FULLSCREEN_LEGACY_FULLSCREEN_CONTROLLER_H_ #import <UIKit/UIKit.h> @@ -11,7 +11,7 @@ #import "ios/web/public/web_state/ui/crw_web_view_scroll_view_proxy.h" @class CRWWebViewScrollViewProxy; -@class FullScreenController; +@class LegacyFullscreenController; namespace web { class NavigationManager; @@ -20,7 +20,7 @@ // Notification when the application is set up for testing. extern NSString* const kSetupForTestingWillCloseAllTabsNotification; -@protocol FullScreenControllerDelegate<NSObject> +@protocol LegacyFullscreenControllerDelegate<NSObject> @required // Called every time the header view needs to be moved in place according to @@ -29,7 +29,7 @@ // delegate to slide the view in place instead of simply snapping it there. If // animate is NO the view tracks touches on the screen and as such should be // immediate. -- (void)fullScreenController:(FullScreenController*)fullscreenController +- (void)fullScreenController:(LegacyFullscreenController*)fullscreenController drawHeaderViewFromOffset:(CGFloat)headerOffset animate:(BOOL)animate; @@ -38,7 +38,7 @@ // Only happens during a call to -setHeaderHeight:visible:onScrollView:. If // |changeTopContentPadding| is YES, then in addition to scrolling, delegate // should also update webViewProxy's topContentPadding. -- (void)fullScreenController:(FullScreenController*)fullScreenController +- (void)fullScreenController:(LegacyFullscreenController*)fullScreenController drawHeaderViewFromOffset:(CGFloat)headerOffset onWebViewProxy:(id<CRWWebViewProxy>)webViewProxy changeTopContentPadding:(BOOL)changeTopContentPadding @@ -60,13 +60,13 @@ // This class will track a scrollview to make a header disappear on scroll down // and reappear on scroll up. This class expects the scrollview to have the -// FullScreenController instance set as an observer right after the call to -// -initWithDelegate:scrollView: +// LegacyFullscreenController instance set as an observer right after the call +// to -initWithDelegate:scrollView: // // It also assumes the header is a view rendering itself on top of the scroll // view, the delegate will simply move it out of view as needed. The delegate is // called every time the header view needs to be moved. -@interface FullScreenController +@interface LegacyFullscreenController : NSObject<CRWWebControllerObserver, CRWWebViewScrollViewProxyObserver> // If set to YES this slightly alters the behaviour on drag down to pull the @@ -75,7 +75,7 @@ @property(nonatomic, assign) BOOL immediateDragDown; // Designated initializer. -- (id)initWithDelegate:(id<FullScreenControllerDelegate>)delegate +- (id)initWithDelegate:(id<LegacyFullscreenControllerDelegate>)delegate navigationManager:(web::NavigationManager*)navigationManager sessionID:(NSString*)sessionID; @@ -110,11 +110,11 @@ - (void)moveContentBelowHeader; @end -@interface FullScreenController (UsedForTesting) -// Enables/Disables the FullScreenController in tests. The unit tests do not set -// the delegate which is crucial for methods to work on the controller. +@interface LegacyFullscreenController (UsedForTesting) +// Enables/Disables the LegacyFullscreenController in tests. The unit tests do +// not set the delegate which is crucial for methods to work on the controller. // This a temporary solution. + (void)setEnabledForTests:(BOOL)enabled; @end -#endif // IOS_CHROME_BROWSER_UI_FULLSCREEN_FULLSCREEN_CONTROLLER_H_ +#endif // IOS_CHROME_BROWSER_UI_FULLSCREEN_LEGACY_FULLSCREEN_CONTROLLER_H_
diff --git a/ios/chrome/browser/ui/fullscreen/fullscreen_controller.mm b/ios/chrome/browser/ui/fullscreen/legacy_fullscreen_controller.mm similarity index 97% rename from ios/chrome/browser/ui/fullscreen/fullscreen_controller.mm rename to ios/chrome/browser/ui/fullscreen/legacy_fullscreen_controller.mm index 711dab3..311574a 100644 --- a/ios/chrome/browser/ui/fullscreen/fullscreen_controller.mm +++ b/ios/chrome/browser/ui/fullscreen/legacy_fullscreen_controller.mm
@@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#import "ios/chrome/browser/ui/fullscreen/fullscreen_controller.h" +#import "ios/chrome/browser/ui/fullscreen/legacy_fullscreen_controller.h" #include <cmath> @@ -46,7 +46,7 @@ // Duration for the delay before showing the omnibox. const double kShowOmniboxDelaySeconds = 0.5; -// Indicates if the FullScreenController returns nil from |init|. Used for +// Indicates if the LegacyFullscreenController returns nil from |init|. Used for // testing purposes. BOOL gEnabledForTests = YES; @@ -60,14 +60,14 @@ } // anonymous namespace. -@interface FullScreenController ()<UIGestureRecognizerDelegate> { +@interface LegacyFullscreenController ()<UIGestureRecognizerDelegate> { // Used to detect movement in the scrollview produced by this class. int selfTriggered_; // Used to detect if the keyboard is visible. BOOL keyboardIsVisible_; // Used to detect that the OverscrollActionsController is displaying its UI. - // The FullScreenController is disabled when the OverscrollActionsController's - // UI is displayed. + // The LegacyFullscreenController is disabled when the + // OverscrollActionsController's UI is displayed. BOOL overscrollActionsInProgress_; // Counter used to keep track of the number of actions currently disabling // full screen. @@ -86,9 +86,10 @@ UITapGestureRecognizer* userInteractionGestureRecognizer; // The delegate responsible for providing the header height and moving the // header. -@property(weak, nonatomic, readonly) id<FullScreenControllerDelegate> delegate; +@property(weak, nonatomic, readonly) id<LegacyFullscreenControllerDelegate> + delegate; // Current height of the header, in points. This is a pass-through method that -// fetches the header height from the FullScreenControllerDelegate. +// fetches the header height from the LegacyFullscreenControllerDelegate. @property(nonatomic, readonly) CGFloat headerHeight; // |top| field of UIScrollView.contentInset value caused by header. // Always 0 for WKWebView, as it does not support contentInset. @@ -176,7 +177,7 @@ - (void)moveHeaderToRestingPosition:(BOOL)visible animate:(BOOL)animate; @end -@implementation FullScreenController +@implementation LegacyFullscreenController @synthesize delegate = delegate_; @synthesize navigationManager = navigationManager_; @@ -192,7 +193,7 @@ @synthesize userInteractionGestureRecognizer = userInteractionGestureRecognizer_; -- (id)initWithDelegate:(id<FullScreenControllerDelegate>)delegate +- (id)initWithDelegate:(id<LegacyFullscreenControllerDelegate>)delegate navigationManager:(NavigationManager*)navigationManager sessionID:(NSString*)sessionID { if (!gEnabledForTests) @@ -463,7 +464,7 @@ if (self.isFullScreenDisabled) return; - // Another FullScreenController is in control. + // Another LegacyFullscreenController is in control. if (![self isScrollViewForCurrentTab]) return; @@ -483,9 +484,9 @@ - (void)decrementFullScreenLock { // The corresponding notification for incrementing the lock may have been - // posted before the FullScreenController was initialized. This can occur - // when entering a URL or search query from the NTP since the CRWWebController - // begins loading the page before the keyboard is dismissed. + // posted before the LegacyFullscreenController was initialized. This can + // occur when entering a URL or search query from the NTP since the + // CRWWebController begins loading the page before the keyboard is dismissed. if (fullScreenLock_ > 0) fullScreenLock_--; }
diff --git a/ios/chrome/browser/ui/fullscreen/fullscreen_controller_unittest.mm b/ios/chrome/browser/ui/fullscreen/legacy_fullscreen_controller_unittest.mm similarity index 93% rename from ios/chrome/browser/ui/fullscreen/fullscreen_controller_unittest.mm rename to ios/chrome/browser/ui/fullscreen/legacy_fullscreen_controller_unittest.mm index 3d90f88..87ba5ed 100644 --- a/ios/chrome/browser/ui/fullscreen/fullscreen_controller_unittest.mm +++ b/ios/chrome/browser/ui/fullscreen/legacy_fullscreen_controller_unittest.mm
@@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#import "ios/chrome/browser/ui/fullscreen/fullscreen_controller.h" +#import "ios/chrome/browser/ui/fullscreen/legacy_fullscreen_controller.h" #import "ios/web/public/test/fakes/test_web_view_content_view.h" #import "ios/web/public/web_state/ui/crw_web_view_content_view.h" @@ -23,13 +23,13 @@ CGFloat kHeaderHeight = 42.0; } -@interface MockFullScreenControllerDelegate - : NSObject<FullScreenControllerDelegate> +@interface MockLegacyFullscreenControllerDelegate + : NSObject<LegacyFullscreenControllerDelegate> @property(nonatomic, readonly) float currentPosition; @property(nonatomic, assign) BOOL fakeIsTabWithIDCurrentFlag; @end -@implementation MockFullScreenControllerDelegate +@implementation MockLegacyFullscreenControllerDelegate @synthesize currentPosition = currentPosition_; @synthesize fakeIsTabWithIDCurrentFlag = fakeIsTabWithIDCurrentFlag_; @@ -41,13 +41,13 @@ return self; } -- (void)fullScreenController:(FullScreenController*)fullscreenController +- (void)fullScreenController:(LegacyFullscreenController*)fullscreenController drawHeaderViewFromOffset:(CGFloat)headerOffset animate:(BOOL)animate { currentPosition_ = headerOffset; } -- (void)fullScreenController:(FullScreenController*)fullScreenController +- (void)fullScreenController:(LegacyFullscreenController*)fullScreenController drawHeaderViewFromOffset:(CGFloat)headerOffset onWebViewProxy:(id<CRWWebViewProxy>)webViewProxy changeTopContentPadding:(BOOL)changeTopContentPadding @@ -88,7 +88,7 @@ scrollview_.contentSize = contentSize.size; mockWebController_ = [OCMockObject niceMockForClass:[CRWWebController class]]; - mockDelegate_ = [[MockFullScreenControllerDelegate alloc] init]; + mockDelegate_ = [[MockLegacyFullscreenControllerDelegate alloc] init]; mockWebView_ = [[UIView alloc] init]; mockContentView_ = [[TestWebViewContentView alloc] initWithMockWebView:mockWebView_ @@ -98,9 +98,9 @@ [webViewProxy_ setContentView:mockContentView_]; webViewScrollViewProxy_ = [webViewProxy_ scrollViewProxy]; controller_ = - [[FullScreenController alloc] initWithDelegate:mockDelegate_ - navigationManager:NULL - sessionID:kFakeSessionId]; + [[LegacyFullscreenController alloc] initWithDelegate:mockDelegate_ + navigationManager:NULL + sessionID:kFakeSessionId]; DCHECK(controller_); [webViewScrollViewProxy_ addObserver:controller_]; // Simulate a CRWWebControllerObserver callback. @@ -154,8 +154,8 @@ // Adds |view| as a sub view to the underlying |scrollview_|. void AddSubViewToScrollView(UIView* view) { [scrollview_ addSubview:view]; } - FullScreenController* controller_; - MockFullScreenControllerDelegate* mockDelegate_; + LegacyFullscreenController* controller_; + MockLegacyFullscreenControllerDelegate* mockDelegate_; CRWWebViewScrollViewProxy* webViewScrollViewProxy_; id mockWebView_; id mockWebController_;
diff --git a/ios/chrome/browser/ui/stack_view/stack_view_controller_perftest.mm b/ios/chrome/browser/ui/stack_view/stack_view_controller_perftest.mm index fba73b9..f98c218 100644 --- a/ios/chrome/browser/ui/stack_view/stack_view_controller_perftest.mm +++ b/ios/chrome/browser/ui/stack_view/stack_view_controller_perftest.mm
@@ -15,7 +15,7 @@ #import "ios/chrome/browser/tabs/tab_model.h" #include "ios/chrome/browser/test/perf_test_with_bvc_ios.h" #import "ios/chrome/browser/ui/browser_view_controller.h" -#import "ios/chrome/browser/ui/fullscreen/fullscreen_controller.h" +#import "ios/chrome/browser/ui/fullscreen/legacy_fullscreen_controller.h" #import "ios/chrome/browser/ui/stack_view/stack_view_controller.h" #include "ios/chrome/browser/ui/ui_util.h" #include "ios/web/public/referrer.h"
diff --git a/ios/chrome/browser/web/chrome_web_test.mm b/ios/chrome/browser/web/chrome_web_test.mm index c1d1ef1..5eeb444 100644 --- a/ios/chrome/browser/web/chrome_web_test.mm +++ b/ios/chrome/browser/web/chrome_web_test.mm
@@ -8,7 +8,7 @@ #include "components/password_manager/core/browser/password_manager_test_utils.h" #include "ios/chrome/browser/browser_state/test_chrome_browser_state.h" #include "ios/chrome/browser/passwords/ios_chrome_password_store_factory.h" -#import "ios/chrome/browser/ui/fullscreen/fullscreen_controller.h" +#import "ios/chrome/browser/ui/fullscreen/legacy_fullscreen_controller.h" #import "ios/web/public/web_state/web_state.h" #if !defined(__has_feature) || !__has_feature(objc_arc) @@ -28,12 +28,12 @@ chrome_browser_state_.get(), &password_manager::BuildPasswordStore< web::BrowserState, password_manager::MockPasswordStore>); - [FullScreenController setEnabledForTests:NO]; + [LegacyFullscreenController setEnabledForTests:NO]; } void ChromeWebTest::TearDown() { WaitForBackgroundTasks(); - [FullScreenController setEnabledForTests:YES]; + [LegacyFullscreenController setEnabledForTests:YES]; web::WebTestWithWebState::TearDown(); }
diff --git a/net/http/http_network_transaction.cc b/net/http/http_network_transaction.cc index 70bd489..a810d203 100644 --- a/net/http/http_network_transaction.cc +++ b/net/http/http_network_transaction.cc
@@ -316,17 +316,6 @@ // Are we using SPDY or HTTP? next_state_ = STATE_READ_BODY; - // We have reached the end of Start state machine, reset the requestinfo to - // null. - // RequestInfo is a member of the HttpTransaction's consumer and is useful - // only till final response headers are received. A reset will ensure that - // HttpRequestInfo is only used up until final response headers are received. - // Resetting is allowed so that the transaction can be disassociated from its - // creating consumer in cases where it is shared for writing to the cache. - // It is also safe to reset it to null at this point since upload_data_stream - // is also not used in the Read state machine. - request_ = nullptr; - read_buf_ = buf; read_buf_len_ = buf_len; @@ -1333,6 +1322,19 @@ return rv; headers_valid_ = true; + + // We have reached the end of Start state machine, set the RequestInfo to + // null. + // RequestInfo is a member of the HttpTransaction's consumer and is useful + // only until the final response headers are received. Clearing it will ensure + // that HttpRequestInfo is only used up until final response headers are + // received. Clearing is allowed so that the transaction can be disassociated + // from its creating consumer in cases where it is shared for writing to the + // cache. It is also safe to set it to null at this point since + // upload_data_stream is also not used in the Read state machine. + if (pending_auth_target_ == HttpAuth::AUTH_NONE) + request_ = nullptr; + return OK; }
diff --git a/net/http/http_network_transaction_unittest.cc b/net/http/http_network_transaction_unittest.cc index 95919a6..82db9806 100644 --- a/net/http/http_network_transaction_unittest.cc +++ b/net/http/http_network_transaction_unittest.cc
@@ -868,6 +868,35 @@ EXPECT_THAT(callback.GetResult(rv), IsError(ERR_INVALID_HTTP_RESPONSE)); } +// Tests that request info can be destroyed after the headers phase is complete. +TEST_F(HttpNetworkTransactionTest, SimpleGETNoReadDestroyRequestInfo) { + std::unique_ptr<HttpNetworkSession> session(CreateSession(&session_deps_)); + auto trans = + std::make_unique<HttpNetworkTransaction>(DEFAULT_PRIORITY, session.get()); + + MockRead data_reads[] = { + MockRead("HTTP/1.0 200 OK\r\n"), MockRead("Connection: keep-alive\r\n"), + MockRead("Content-Length: 100\r\n\r\n"), MockRead(SYNCHRONOUS, 0), + }; + StaticSocketDataProvider data(data_reads, arraysize(data_reads), NULL, 0); + session_deps_.socket_factory->AddSocketDataProvider(&data); + + TestCompletionCallback callback; + + { + auto request = std::make_unique<HttpRequestInfo>(); + request->method = "GET"; + request->url = GURL("http://www.example.org/"); + + int rv = + trans->Start(request.get(), callback.callback(), NetLogWithSource()); + + EXPECT_THAT(callback.GetResult(rv), IsOk()); + } // Let request info be destroyed. + + trans.reset(); +} + // Response with no status line, and a weird port. Option to allow weird ports // enabled. TEST_F(HttpNetworkTransactionTest, SimpleGETNoHeadersWeirdPortAllowed) {
diff --git a/net/http/transport_security_state_static.json b/net/http/transport_security_state_static.json index 484c7f0..9a1be299 100644 --- a/net/http/transport_security_state_static.json +++ b/net/http/transport_security_state_static.json
@@ -729,7 +729,7 @@ { "name": "platform.twitter.com", "include_subdomains": true, "pins": "twitterCDN" }, { "name": "twimg.com", "include_subdomains": true, "pins": "twitterCDN" }, - // START OF OLD MANUAL CUSTOM ENTRIES + // START OF LEGACY MANUAL CUSTOM ENTRIES { "name": "www.paypal.com", "mode": "force-https" }, { "name": "paypal.com", "mode": "force-https" }, { "name": "www.elanex.biz", "mode": "force-https" }, @@ -891,9 +891,9 @@ { "name": "gpo.gov", "include_subdomains": false, "mode": "force-https" }, { "name": "united.com", "include_subdomains": false, "mode": "force-https" }, { "name": "rememberthemilk.com", "mode": "force-https" }, - // END OF OLD MANUAL CUSTOM ENTRIES + // END OF LEGACY MANUAL CUSTOM ENTRIES - // START OF OLD MANUAL HSTS ENTRIES + // START OF LEGACY MANUAL HSTS ENTRIES { "name": "jottit.com", "include_subdomains": true, "mode": "force-https" }, { "name": "sunshinepress.org", "include_subdomains": true, "mode": "force-https" }, { "name": "riseup.net", "include_subdomains": true, "mode": "force-https" }, @@ -1162,9 +1162,9 @@ { "name": "mobile.united.com", "include_subdomains": true, "mode": "force-https" }, { "name": "smartphone.continental.com", "include_subdomains": true, "mode": "force-https" }, { "name": "www.rememberthemilk.com", "include_subdomains": true, "mode": "force-https" }, - // END OF OLD MANUAL HSTS ENTRIES + // END OF LEGACY MANUAL HSTS ENTRIES - // START OF OLD BULK HSTS ENTRIES + // START OF LEGACY 18-WEEK BULK HSTS ENTRIES { "name": "addvocate.com", "include_subdomains": true, "mode": "force-https" }, { "name": "alexsexton.com", "include_subdomains": true, "mode": "force-https" }, { "name": "azprep.us", "include_subdomains": true, "mode": "force-https" }, @@ -6779,7 +6779,6 @@ { "name": "someshit.xyz", "include_subdomains": true, "mode": "force-https" }, { "name": "soph.us", "include_subdomains": true, "mode": "force-https" }, { "name": "sortaweird.net", "include_subdomains": true, "mode": "force-https" }, - { "name": "soundtalks.com", "include_subdomains": true, "mode": "force-https" }, { "name": "sourcelair.com", "include_subdomains": true, "mode": "force-https" }, { "name": "sown.dyndns.org", "include_subdomains": true, "mode": "force-https" }, { "name": "spacedust.xyz", "include_subdomains": true, "mode": "force-https" }, @@ -8357,7 +8356,6 @@ { "name": "optumrxhealthstore.com", "include_subdomains": true, "mode": "force-https" }, { "name": "orcamoney.com", "include_subdomains": true, "mode": "force-https" }, { "name": "orionfcu.com", "include_subdomains": true, "mode": "force-https" }, - { "name": "orlives.de", "include_subdomains": true, "mode": "force-https" }, { "name": "osmosis.org", "include_subdomains": true, "mode": "force-https" }, { "name": "outdoorproducts.com", "include_subdomains": true, "mode": "force-https" }, { "name": "overthinkingit.com", "include_subdomains": true, "mode": "force-https" }, @@ -8759,12 +8757,12 @@ { "name": "gendrin.com", "include_subdomains": true, "mode": "force-https" }, { "name": "webmail.xalqbank.az", "include_subdomains": true, "mode": "force-https" }, { "name": "winebid.com", "include_subdomains": true, "mode": "force-https" }, - // END OF OLD BULK HSTS ENTRIES + // END OF LEGACY 18-WEEK BULK HSTS ENTRIES // Entries submitted through hstspreload.appspot.com in Chrome 51 or later. // These entries are subject to the continued requirements documented at // https://hstspreload.org/#continued-requirements - // START OF BULK ENTRIES + // START OF 18-WEEK BULK HSTS ENTRIES { "name": "050media.nl", "include_subdomains": true, "mode": "force-https" }, { "name": "0x.sk", "include_subdomains": true, "mode": "force-https" }, { "name": "0x44.net", "include_subdomains": true, "mode": "force-https" }, @@ -12831,7 +12829,6 @@ { "name": "karmaflux.com", "include_subdomains": true, "mode": "force-https" }, { "name": "kayon.cf", "include_subdomains": true, "mode": "force-https" }, { "name": "keepcoalintheground.org", "include_subdomains": true, "mode": "force-https" }, - { "name": "ken.fm", "include_subdomains": true, "mode": "force-https" }, { "name": "kiahoriane.com", "include_subdomains": true, "mode": "force-https" }, { "name": "kialo.com", "include_subdomains": true, "mode": "force-https" }, { "name": "kiapps.ovh", "include_subdomains": true, "mode": "force-https" }, @@ -14640,7 +14637,6 @@ { "name": "sophiakligys.com", "include_subdomains": true, "mode": "force-https" }, { "name": "sor.so", "include_subdomains": true, "mode": "force-https" }, { "name": "soucorneteiro.com.br", "include_subdomains": true, "mode": "force-https" }, - { "name": "soundtalks.be", "include_subdomains": true, "mode": "force-https" }, { "name": "space-it.de", "include_subdomains": true, "mode": "force-https" }, { "name": "spacehost.de", "include_subdomains": true, "mode": "force-https" }, { "name": "spenglerei-shop.de", "include_subdomains": true, "mode": "force-https" }, @@ -18208,7 +18204,6 @@ { "name": "theposhfudgecompany.co.uk", "include_subdomains": true, "mode": "force-https" }, { "name": "unart.info", "include_subdomains": true, "mode": "force-https" }, { "name": "zypgr.com", "include_subdomains": true, "mode": "force-https" }, - { "name": "tianya.tv", "include_subdomains": true, "mode": "force-https" }, { "name": "treker.us", "include_subdomains": true, "mode": "force-https" }, { "name": "xia100.xyz", "include_subdomains": true, "mode": "force-https" }, { "name": "wpruby.com", "include_subdomains": true, "mode": "force-https" }, @@ -23630,7 +23625,6 @@ { "name": "ead-italia.it", "include_subdomains": true, "mode": "force-https" }, { "name": "earlyyearshub.com", "include_subdomains": true, "mode": "force-https" }, { "name": "eattherich.us", "include_subdomains": true, "mode": "force-https" }, - { "name": "ec-hasslau.de", "include_subdomains": true, "mode": "force-https" }, { "name": "edisonnissanparts.com", "include_subdomains": true, "mode": "force-https" }, { "name": "egami.ch", "include_subdomains": true, "mode": "force-https" }, { "name": "einheft.info", "include_subdomains": true, "mode": "force-https" }, @@ -25995,7 +25989,6 @@ { "name": "harrymclaren.co.uk", "include_subdomains": true, "mode": "force-https" }, { "name": "hasabig.wang", "include_subdomains": true, "mode": "force-https" }, { "name": "hasalittle.wang", "include_subdomains": true, "mode": "force-https" }, - { "name": "hash.my", "include_subdomains": true, "mode": "force-https" }, { "name": "hashcat.net", "include_subdomains": true, "mode": "force-https" }, { "name": "hashish.net", "include_subdomains": true, "mode": "force-https" }, { "name": "hauntedhouserecords.co.uk", "include_subdomains": true, "mode": "force-https" }, @@ -38595,11 +38588,1581 @@ { "name": "zskomenskeho.cz", "include_subdomains": true, "mode": "force-https" }, { "name": "zuehlcke.de", "include_subdomains": true, "mode": "force-https" }, { "name": "zzb8899.com", "include_subdomains": true, "mode": "force-https" }, - // END OF BULK ENTRIES + // END OF 18-WEEK BULK HSTS ENTRIES + + // START OF 1-YEAR BULK HSTS ENTRIES + { "name": "0x7d.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "1-2-3bounce.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "100and1.jp", "include_subdomains": true, "mode": "force-https" }, + { "name": "10gb.io", "include_subdomains": true, "mode": "force-https" }, + { "name": "19hundert84.de", "include_subdomains": true, "mode": "force-https" }, + { "name": "1morebounce.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "1st-bounce.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "1st4abounce.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "1stchoicefun.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "1stclassbouncycastles.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "1stforfun.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "1stpeninsulabouncers.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "20denier.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "2bouncy.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "2heartsbookings.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "30hzcollective.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "3countiescastlehire.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "4host.ch", "include_subdomains": true, "mode": "force-https" }, + { "name": "50lakeshore.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "5starbouncycastlehire.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "9500years.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "a-classinflatables.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "a-starbouncycastles.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "a1bouncycastlehire.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "a1jumpandbounce.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "aaapl.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "aandkevents.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "aarkue.eu", "include_subdomains": true, "mode": "force-https" }, + { "name": "aaronroyle.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "abacus-events.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "abacusbouncycastle.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "abbadabbabouncycastles.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "abbotsparties.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "abbottscastles.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "abcbouncycastlessurrey.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "abcbouncyfactory.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "abcdobebe.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "abcpartyhire.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "aberdeencastles.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "abibruce.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "aboces.org", "include_subdomains": true, "mode": "force-https" }, + { "name": "abouncycastleman.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "absolutelyinflatables.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "abuse.fi", "include_subdomains": true, "mode": "force-https" }, + { "name": "abyssgaming.eu", "include_subdomains": true, "mode": "force-https" }, + { "name": "aceinflatables.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "achterblog.de", "include_subdomains": true, "mode": "force-https" }, + { "name": "acorncastles.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "activehire.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "activeleisure.ie", "include_subdomains": true, "mode": "force-https" }, + { "name": "activityeventhire.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "adamsbouncycastles.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "adrianjensen.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "adsbouncycastles.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "adtgroup.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "adventureforest.co.nz", "include_subdomains": true, "mode": "force-https" }, + { "name": "aeon.wiki", "include_subdomains": true, "mode": "force-https" }, + { "name": "aergia.eu", "include_subdomains": true, "mode": "force-https" }, + { "name": "affichagepub3.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "affordablebouncycastle.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "afi-business-consulting.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "aflowershop.ca", "include_subdomains": true, "mode": "force-https" }, + { "name": "agileecommerce.com.br", "include_subdomains": true, "mode": "force-https" }, + { "name": "agrikulturchic.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "agrilinks.org", "include_subdomains": true, "mode": "force-https" }, + { "name": "aid-web.ch", "include_subdomains": true, "mode": "force-https" }, + { "name": "air-we-go.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "airborne-inflatables.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "airetvie.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "airmaxinflatables.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "airmazinginflatables.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "airplay-inflatable-hire.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "airwegobouncycastles.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "ajapaik.ee", "include_subdomains": true, "mode": "force-https" }, + { "name": "ajbouncycastles.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "ajeventhire.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "akkbouncycastles.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "albbounce.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "alchemia.co.il", "include_subdomains": true, "mode": "force-https" }, + { "name": "alexvdveen.nl", "include_subdomains": true, "mode": "force-https" }, + { "name": "alice-noutore.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "allaboutfunuk.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "allactioneventhire.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "allbounceandplay.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "allbouncesurrey.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "allroundpvp.net", "include_subdomains": true, "mode": "force-https" }, + { "name": "allsortscastles.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "allstarpartyinflatables.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "alohapartyevents.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "alpha88uat.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "alphabouncycastles.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "alphainflatablehire.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "als-japan.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "amaranthus.com.ph", "include_subdomains": true, "mode": "force-https" }, + { "name": "amateurvoicetalent.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "amazing-castles.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "amazingbouncycastles.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "amazinginflatables.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "amberglowleisure.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "amberlightleisure.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "ambouncyhire.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "americanoutlawjeepparts.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "americansforcommunitydevelopment.org", "include_subdomains": true, "mode": "force-https" }, + { "name": "amethystdevelopment.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "amh-entertainments.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "amministratore.biz", "include_subdomains": true, "mode": "force-https" }, + { "name": "amtentertainments.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "anajianu.ro", "include_subdomains": true, "mode": "force-https" }, + { "name": "ancestramil.fr", "include_subdomains": true, "mode": "force-https" }, + { "name": "anditi.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "anglingactive.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "angrut.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "angryteeth.net", "include_subdomains": true, "mode": "force-https" }, + { "name": "anim.ee", "include_subdomains": true, "mode": "force-https" }, + { "name": "anime-culture.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "annsbouncycastles.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "anonrea.ch", "include_subdomains": true, "mode": "force-https" }, + { "name": "ansichtssache.at", "include_subdomains": true, "mode": "force-https" }, + { "name": "antecim.fr", "include_subdomains": true, "mode": "force-https" }, + { "name": "antennista.pavia.it", "include_subdomains": true, "mode": "force-https" }, + { "name": "anulowano.pl", "include_subdomains": true, "mode": "force-https" }, + { "name": "aplis-online.de", "include_subdomains": true, "mode": "force-https" }, + { "name": "apmpproject.org", "include_subdomains": true, "mode": "force-https" }, + { "name": "applejacks-bouncy-castles.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "appmeas.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "appveyor.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "arcbouncycastles.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "arenzanaphotography.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "arieswdd.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "arinflatablefun.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "arniescastles.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "arterienundvenen.ch", "include_subdomains": true, "mode": "force-https" }, + { "name": "artionet.ch", "include_subdomains": true, "mode": "force-https" }, + { "name": "artisticedgegranite.net", "include_subdomains": true, "mode": "force-https" }, + { "name": "asral7.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "assistcart.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "astarbouncycastles.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "atelierbw.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "atelierhupsakee.nl", "include_subdomains": true, "mode": "force-https" }, + { "name": "atigerseye.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "atlas-5.site", "include_subdomains": true, "mode": "force-https" }, + { "name": "atomic-bounce.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "atomicbounce.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "aucklandcastles.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "auto-plus.tn", "include_subdomains": true, "mode": "force-https" }, + { "name": "av01.tv", "include_subdomains": true, "mode": "force-https" }, + { "name": "avabouncehire.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "availablecastles.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "aveling-adventure.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "awbouncycastlehire.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "awesomebouncycastles.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "aycomba.de", "include_subdomains": true, "mode": "force-https" }, + { "name": "aylesburycastlehire.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "ayrohq.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "ayrshirebouncycastlehire.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "b2bpromoteit.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "b4bouncycastles.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "bag.bg", "include_subdomains": true, "mode": "force-https" }, + { "name": "bagsofbounce.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "baildonbouncycastles.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "baildonhottubs.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "bannermarquees.ie", "include_subdomains": true, "mode": "force-https" }, + { "name": "banxehoi.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "bas.co.jp", "include_subdomains": true, "mode": "force-https" }, + { "name": "bassment.ph", "include_subdomains": true, "mode": "force-https" }, + { "name": "batterystaple.pw", "include_subdomains": true, "mode": "force-https" }, + { "name": "bbcastles.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "bceventhire.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "bcmhire.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "beckenhamcastles.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "bee-line.org.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "beethoveninlove.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "beeutifulparties.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "beezkneezcastles.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "belfastbounce.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "belvoirbouncycastles.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "benevita.life", "include_subdomains": true, "mode": "force-https" }, + { "name": "bennettsbouncycastlehire.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "bennettshire.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "bensbouncycastles.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "bensinflatables.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "best-of-bounce.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "bestoliveoils.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "bestpartyhire.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "better-bounce.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "bexleycastles.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "beyondbounce.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "bgp.space", "include_subdomains": true, "mode": "force-https" }, + { "name": "big-bounce.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "bigbouncebouncycastles.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "bigbounceentertainment.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "bigbouncetheory.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "bigbounceuk.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "bigcorporateevents.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "bigfunbouncycastles.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "bikelifetvkidsquads.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "bilalic.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "bilbayt.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "billrhodesbakery.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "billysbouncycastlehire.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "bio-disinfestazione.it", "include_subdomains": true, "mode": "force-https" }, + { "name": "biodiagnostiki.clinic", "include_subdomains": true, "mode": "force-https" }, + { "name": "birminghamcastlehire.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "bitsburg.ru", "include_subdomains": true, "mode": "force-https" }, + { "name": "bittervault.xyz", "include_subdomains": true, "mode": "force-https" }, + { "name": "bizzybeebouncers.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "bjsbouncycastles.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "bkositspartytime.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "black-mail.nl", "include_subdomains": true, "mode": "force-https" }, + { "name": "blackbase.de", "include_subdomains": true, "mode": "force-https" }, + { "name": "blastentertainment.com.au", "include_subdomains": true, "mode": "force-https" }, + { "name": "blastzoneentertainments.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "blivawesome.dk", "include_subdomains": true, "mode": "force-https" }, + { "name": "blivvektor.dk", "include_subdomains": true, "mode": "force-https" }, + { "name": "bloggytalky.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "bloglife-bb.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "bnbsinflatablehire.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "bnjscastles.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "bobnbouncedublin.ie", "include_subdomains": true, "mode": "force-https" }, + { "name": "bolivarfm.com.ve", "include_subdomains": true, "mode": "force-https" }, + { "name": "boogiebouncecastles.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "boosinflatablegames.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "bopp.org", "include_subdomains": true, "mode": "force-https" }, + { "name": "born2bounce.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "bounce-a-mania.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "bounce-a-roo.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "bounce-abouts.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "bounce-n-go.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "bounce-on.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "bounce-r-us.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "bounce-xtreme.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "bounce4fun.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "bounce4fun.ie", "include_subdomains": true, "mode": "force-https" }, + { "name": "bounce4kidz.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "bounce4less.ie", "include_subdomains": true, "mode": "force-https" }, + { "name": "bouncea-bout.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "bounceaboutandplay.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "bounceaboutnewark.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "bounceaboutsussex.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "bouncealotcastlehire.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "bouncealotnorthwest.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "bounceandwobble.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "bouncearoundevents.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "bouncearoundsheffield.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "bounceawaycastles.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "bouncebackcastles.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "bouncebeyondcastles.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "bouncebookings.com.au", "include_subdomains": true, "mode": "force-https" }, + { "name": "bouncecrazy.ie", "include_subdomains": true, "mode": "force-https" }, + { "name": "bouncehighpeak.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "bouncejumpboston.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "bouncekingdom.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "bouncelanduk.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "bouncemania.org", "include_subdomains": true, "mode": "force-https" }, + { "name": "bouncemaniaevents.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "bouncemaniainflatables.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "bouncemasters.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "bouncemonkeys.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "bouncenortheast.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "bouncenpaint.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "bouncenslidenortheast.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "bouncepartycastles.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "bounceroosevents.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "bouncers-bouncycastlehire.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "bouncesouthwales.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "bouncesquad.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "bouncetasticuk.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "bouncetheparty.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "bounceunlimited.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "bouncewithbovells.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "bouncewrightcastles.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "bouncincastles.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "bouncing-bugs.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "bouncing4joy.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "bouncingbairnsinflatables.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "bouncingbeansinflatables.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "bouncingbobsinflatables.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "bouncingbuddiesleicester.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "bouncingbuzzybees.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "bouncinghigher.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "bouncingscotland.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "bouncy-castles-surrey.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "bouncy-tots.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "bouncybaileys.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "bouncyballscastles.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "bouncybouncyboocastlehire.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "bouncycastle.net.au", "include_subdomains": true, "mode": "force-https" }, + { "name": "bouncycastleandparty.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "bouncycastlehire-norwich.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "bouncycastlehire-sheffield.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "bouncycastlehireauckland.co.nz", "include_subdomains": true, "mode": "force-https" }, + { "name": "bouncycastlehirebarnstaple.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "bouncycastlehirebexley.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "bouncycastlehirechelmsford.org.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "bouncycastlehirehull.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "bouncycastlehireinglasgow.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "bouncycastlehirelouth.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "bouncycastlehiremalvern.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "bouncycastlehireoldham.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "bouncycastlehirestroud.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "bouncycastlehiresurrey.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "bouncycastlehiretameside.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "bouncycastlehirewinchester.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "bouncycastleman.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "bouncycastlemangloucestershire.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "bouncycastleparade.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "bouncycastles.me", "include_subdomains": true, "mode": "force-https" }, + { "name": "bouncycastlesgalway.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "bouncycastleshire.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "bouncycastleshireleeds.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "bouncycastlesin.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "bouncycastlesinderby.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "bouncycastlesinleeds.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "bouncycastlesisleofwight.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "bouncycastlesmonaghan.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "bouncycastlessheerness.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "bouncydays.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "bouncyfeet.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "bouncygiggles.com.au", "include_subdomains": true, "mode": "force-https" }, + { "name": "bouncyhigher.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "bouncyhousecastlehire.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "bouncyhouses.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "bouncykingdom.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "bouncykings.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "bouncykingsnortheast.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "bouncymacs.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "bouncymadness.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "bouncyrainbows.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "bouncytime.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "bouncytown.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "bouncywouncy.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "bound2bounce.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "bournefun.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "boxlitepackaging.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "bozosbouncycastles.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "bradfordhottubhire.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "bradfordmascots.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "braintreebouncycastles.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "bramhallsamusements.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "brandbil.dk", "include_subdomains": true, "mode": "force-https" }, + { "name": "brandstead.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "brau-ingenieur.de", "include_subdomains": true, "mode": "force-https" }, + { "name": "braudoktor.de", "include_subdomains": true, "mode": "force-https" }, + { "name": "brighouse-leisure.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "brightonbouncycastles.net", "include_subdomains": true, "mode": "force-https" }, + { "name": "brilliantbouncyfun.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "bristolandwestonsuperbounce.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "brmascots.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "btth.tv", "include_subdomains": true, "mode": "force-https" }, + { "name": "btth.xyz", "include_subdomains": true, "mode": "force-https" }, + { "name": "bubblinghottubs.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "bubblybouncers.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "budgetcastlehire.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "budgiesballoons.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "builmaker.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "bulldoghire.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "burnhamonseabouncycastles.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "bustup-tips.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "buttermilk.cf", "include_subdomains": true, "mode": "force-https" }, + { "name": "buyingsellingflorida.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "bvl.aero", "include_subdomains": true, "mode": "force-https" }, + { "name": "byvshie.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "c-rom.fr", "include_subdomains": true, "mode": "force-https" }, + { "name": "cachetagalong.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "cadsys.net", "include_subdomains": true, "mode": "force-https" }, + { "name": "caldecotevillagehall.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "cambridgebouncers.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "candlcastles.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "candykidsentertainment.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "canterburybouncycastlehire.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "caplinbouncycastles.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "carlsbouncycastlesandhottubs.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "carrando.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "cartooncastles.ie", "include_subdomains": true, "mode": "force-https" }, + { "name": "casalindamex.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "casasuara.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "casjay.info", "include_subdomains": true, "mode": "force-https" }, + { "name": "castlecapers.com.au", "include_subdomains": true, "mode": "force-https" }, + { "name": "castleking.net", "include_subdomains": true, "mode": "force-https" }, + { "name": "castlekingdomstockport.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "castlekingkent.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "castleparty.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "castles-in-the-sky.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "castles4kidz.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "castles4rascalsiow.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "castlesrus-kent.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "castleswa.com.au", "include_subdomains": true, "mode": "force-https" }, + { "name": "catherinescastles.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "cbc-hire.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "cda-nw.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "centaur.de", "include_subdomains": true, "mode": "force-https" }, + { "name": "centio.bg", "include_subdomains": true, "mode": "force-https" }, + { "name": "cerpus-course.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "cfsh.tk", "include_subdomains": true, "mode": "force-https" }, + { "name": "chabert-provence.fr", "include_subdomains": true, "mode": "force-https" }, + { "name": "chadklass.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "chaleur.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "chameleon-ents.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "champdogs.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "champdogs.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "championcastles.ie", "include_subdomains": true, "mode": "force-https" }, + { "name": "changethislater.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "chanshiyu.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "chaoscastles.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "chapelfordbouncers.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "chaseandzoey.de", "include_subdomains": true, "mode": "force-https" }, + { "name": "checos.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "cheekycharliessoftplay.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "cheekylittlerascals.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "cheekymonkeysinflatables.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "cheesypicsbooths.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "chehalemgroup.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "cheltenhambounce.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "cheltenhambouncycastles.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "chengtongled.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "cherrydropscandycarts.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "chertseybouncycastles.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "chez.moe", "include_subdomains": true, "mode": "force-https" }, + { "name": "childrensentertainmentleicester.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "childrenspartiesrus.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "chloescastles.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "choc-o-lush.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "christchurchbouncycastles.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "christian-gredig.de", "include_subdomains": true, "mode": "force-https" }, + { "name": "christmaspartyhire.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "chronology.no", "include_subdomains": true, "mode": "force-https" }, + { "name": "cipartyhire.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "ciri.com.co", "include_subdomains": true, "mode": "force-https" }, + { "name": "cirujanooral.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "clairescastles.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "clanebouncycastles.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "clarksgaragedoorrepair.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "cleanbrowsing.org", "include_subdomains": true, "mode": "force-https" }, + { "name": "clear.ml", "include_subdomains": true, "mode": "force-https" }, + { "name": "clearip.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "clickomobile.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "cloghercastles.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "cloud9bouncycastlehire.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "cloudkit.pro", "include_subdomains": true, "mode": "force-https" }, + { "name": "cloudsocial.io", "include_subdomains": true, "mode": "force-https" }, + { "name": "cloudspire.net", "include_subdomains": true, "mode": "force-https" }, + { "name": "clownaroundbouncycastles.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "cmusical.es", "include_subdomains": true, "mode": "force-https" }, + { "name": "cobracastles.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "cocoscastles.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "codific.eu", "include_subdomains": true, "mode": "force-https" }, + { "name": "coisasdaterra.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "coloristcafe.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "colossal-events.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "colourfulcastles.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "comcol.nl", "include_subdomains": true, "mode": "force-https" }, + { "name": "cometbot.cf", "include_subdomains": true, "mode": "force-https" }, + { "name": "comodormirmasrapido.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "conejovalleyelectrical.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "connectmath.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "constancechen.me", "include_subdomains": true, "mode": "force-https" }, + { "name": "construct-trust.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "consultpetkov.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "contentcoms.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "cookescastles.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "cookiestudies.cf", "include_subdomains": true, "mode": "force-https" }, + { "name": "cool-parties.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "coolattractions.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "coole-fete.de", "include_subdomains": true, "mode": "force-https" }, + { "name": "coolkidsbouncycastles.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "copperheados.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "core.org.pt", "include_subdomains": true, "mode": "force-https" }, + { "name": "corlija.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "corytyburski.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "costulessdirect.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "coupe-bordure.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "covbounce.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "cppressinc.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "crawleybouncycastles.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "crazycastles.ie", "include_subdomains": true, "mode": "force-https" }, + { "name": "creamcastles.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "create-together.nl", "include_subdomains": true, "mode": "force-https" }, + { "name": "creation-contemporaine.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "creativlabor.ch", "include_subdomains": true, "mode": "force-https" }, + { "name": "creators.direct", "include_subdomains": true, "mode": "force-https" }, + { "name": "crownbouncycastlehire.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "crowncastles.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "crownmarqueehire.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "croydonbouncycastles.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "cskentertainment.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "cub-bouncingcastles.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "currentlystreaming.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "customizeyoursink.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "cytegic-update-packages.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "dadosch.de", "include_subdomains": true, "mode": "force-https" }, + { "name": "daisidaniels.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "dancingcubs.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "danmarksbedstefredagsbar.dk", "include_subdomains": true, "mode": "force-https" }, + { "name": "datsumou-q.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "datumou-recipe.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "davidfrancoeur.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "dbentertainment.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "dblcastles.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "dcbouncycastles.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "ddracepro.net", "include_subdomains": true, "mode": "force-https" }, + { "name": "dealinflatables.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "deano-s.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "dearnevalleybouncycastles.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "debitoutil.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "debitpaie.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "deegeeinflatables.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "depedshs.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "derbybouncycastles.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "derdewereldrommelmarkt.nl", "include_subdomains": true, "mode": "force-https" }, + { "name": "derehamcastles.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "derekseaman.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "derekseaman.studio", "include_subdomains": true, "mode": "force-https" }, + { "name": "detalyedesigngroup.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "detroitzoo.org", "include_subdomains": true, "mode": "force-https" }, + { "name": "dev-brandywineglobal.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "dgbouncycastlehire.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "dhinflatables.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "didikhari.web.id", "include_subdomains": true, "mode": "force-https" }, + { "name": "digibild.ch", "include_subdomains": true, "mode": "force-https" }, + { "name": "digitalsurge.io", "include_subdomains": true, "mode": "force-https" }, + { "name": "dinotopia.org.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "dirtcraft.ca", "include_subdomains": true, "mode": "force-https" }, + { "name": "discarica.roma.it", "include_subdomains": true, "mode": "force-https" }, + { "name": "disinfestatori.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "disinfestazione.venezia.it", "include_subdomains": true, "mode": "force-https" }, + { "name": "disinfestazione24.it", "include_subdomains": true, "mode": "force-https" }, + { "name": "disinfestazioni-umbria.it", "include_subdomains": true, "mode": "force-https" }, + { "name": "disinfestazioni.info", "include_subdomains": true, "mode": "force-https" }, + { "name": "disroot.org", "include_subdomains": true, "mode": "force-https" }, + { "name": "dizzythewizard.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "dj3dub.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "djbbouncycastles.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "djdavid98.hu", "include_subdomains": true, "mode": "force-https" }, + { "name": "djsbouncycastlehire.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "djwaynepryke.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "dlabouncycastlehire.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "dlbouncers.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "dlunch.net", "include_subdomains": true, "mode": "force-https" }, + { "name": "dmcastles.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "docsoc.org.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "dorsetentertainments.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "dosvientoselectrical.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "dpfsolutionsfl.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "dralexjimenez.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "dreamlux.cz", "include_subdomains": true, "mode": "force-https" }, + { "name": "dreamlux.sk", "include_subdomains": true, "mode": "force-https" }, + { "name": "drezzy.it", "include_subdomains": true, "mode": "force-https" }, + { "name": "drillnation.com.au", "include_subdomains": true, "mode": "force-https" }, + { "name": "drive.xyz", "include_subdomains": true, "mode": "force-https" }, + { "name": "drizz.com.br", "include_subdomains": true, "mode": "force-https" }, + { "name": "drjenafernandez.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "dtbouncycastles.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "dtuaarsfest.dk", "include_subdomains": true, "mode": "force-https" }, + { "name": "duckyubuntu.tk", "include_subdomains": true, "mode": "force-https" }, + { "name": "duncanfamilytrust.org", "include_subdomains": true, "mode": "force-https" }, + { "name": "dvhosting.be", "include_subdomains": true, "mode": "force-https" }, + { "name": "e505.net", "include_subdomains": true, "mode": "force-https" }, + { "name": "eastcoastbubbleandbounce.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "eastcoastinflatables.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "eastlothianbouncycastles.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "educatweb.de", "include_subdomains": true, "mode": "force-https" }, + { "name": "eft.boutique", "include_subdomains": true, "mode": "force-https" }, + { "name": "ekaigotenshoku.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "elderoost.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "electronicafacil.net", "include_subdomains": true, "mode": "force-https" }, + { "name": "elitebouncingfun.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "elliesbouncers.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "ellisamusements.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "ellisleisure.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "elna-service.com.ua", "include_subdomains": true, "mode": "force-https" }, + { "name": "elternbeiratswahl.online", "include_subdomains": true, "mode": "force-https" }, + { "name": "emotuit.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "endspamwith.us", "include_subdomains": true, "mode": "force-https" }, + { "name": "epicbouncycastlehirenorwich.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "epicbouncycastles.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "epicinflatables.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "eposbristol.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "erclab.kr", "include_subdomains": true, "mode": "force-https" }, + { "name": "erkaelderbarenaaben.dk", "include_subdomains": true, "mode": "force-https" }, + { "name": "espace.network", "include_subdomains": true, "mode": "force-https" }, + { "name": "ethika.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "etiquetaunica.com.br", "include_subdomains": true, "mode": "force-https" }, + { "name": "event4fun.no", "include_subdomains": true, "mode": "force-https" }, + { "name": "events-hire.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "evolutioninflatables.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "ewizmo.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "exclusivebouncycastles.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "exebouncycastles.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "extasic.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "ez3d.eu", "include_subdomains": true, "mode": "force-https" }, + { "name": "fabian-fingerle.de", "include_subdomains": true, "mode": "force-https" }, + { "name": "fabian-kluge.de", "include_subdomains": true, "mode": "force-https" }, + { "name": "facebylouise.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "fachschaftslisten.at", "include_subdomains": true, "mode": "force-https" }, + { "name": "fairplay.im", "include_subdomains": true, "mode": "force-https" }, + { "name": "falbros.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "familyparties.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "fander.it", "include_subdomains": true, "mode": "force-https" }, + { "name": "fantasycastles.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "fantasypartyhire.com.au", "include_subdomains": true, "mode": "force-https" }, + { "name": "fastpresence.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "fb.me", "include_subdomains": true, "mode": "force-https" }, + { "name": "fbcdn.net", "include_subdomains": true, "mode": "force-https" }, + { "name": "fbsbx.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "fdevs.ch", "include_subdomains": true, "mode": "force-https" }, + { "name": "felixqu.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "fengyadi.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "ferienchalet-wallis.ch", "include_subdomains": true, "mode": "force-https" }, + { "name": "firstchoicebouncycastlehire.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "firstclasscastles.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "firstclassleisure.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "fixeaide.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "fjugstad.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "fleamarketgoods.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "floridahomesinvest.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "floydm.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "flyp.me", "include_subdomains": true, "mode": "force-https" }, + { "name": "fmdance.cl", "include_subdomains": true, "mode": "force-https" }, + { "name": "fognini-depablo.eu", "include_subdomains": true, "mode": "force-https" }, + { "name": "formaliteo.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "formapi.io", "include_subdomains": true, "mode": "force-https" }, + { "name": "forum3.ru", "include_subdomains": true, "mode": "force-https" }, + { "name": "fowlervwparts.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "francesca-and-lucas.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "freddysfuncastles.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "freedomfrontier.tk", "include_subdomains": true, "mode": "force-https" }, + { "name": "freedomonline.bg", "include_subdomains": true, "mode": "force-https" }, + { "name": "freejidi.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "fstatic.io", "include_subdomains": true, "mode": "force-https" }, + { "name": "fujiwaraqol.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "fullstacknotes.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "fun-bounce.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "fun-tasia.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "fun4kidzbouncycastles.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "fun4ubouncycastles.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "funandbounce.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "funbouncelincs.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "fundayltd.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "funfactorleeds.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "funfoodco.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "funhouse-inflatables.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "funtastic-event-hire.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "funtastic.ie", "include_subdomains": true, "mode": "force-https" }, + { "name": "funtasticinflatablesdurham.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "funtime-inflatables.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "funtimebourne.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "funtimeentertainment.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "funtimesbouncycastles.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "furigana.info", "include_subdomains": true, "mode": "force-https" }, + { "name": "fuzoku.jp", "include_subdomains": true, "mode": "force-https" }, + { "name": "gaio-automobiles.fr", "include_subdomains": true, "mode": "force-https" }, + { "name": "gameshowchallenge.ie", "include_subdomains": true, "mode": "force-https" }, + { "name": "garciniacambogiareviewed.co", "include_subdomains": true, "mode": "force-https" }, + { "name": "gardengameshireuk.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "gearfinder.nl", "include_subdomains": true, "mode": "force-https" }, + { "name": "geerdsen.net", "include_subdomains": true, "mode": "force-https" }, + { "name": "gensend.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "geometra.roma.it", "include_subdomains": true, "mode": "force-https" }, + { "name": "getsetbounce.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "getswadeshi.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "getupandbounce.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "gfbouncycastles.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "gfcleisure.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "ghuntley.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "giggletotz.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "giliamor.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "gillyscastles.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "giraffeinflatables.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "gladwellentertainments.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "glcastlekings.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "glendarraghbouncycastles.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "gmind.ovh", "include_subdomains": true, "mode": "force-https" }, + { "name": "gnhub.org", "include_subdomains": true, "mode": "force-https" }, + { "name": "gobouncy.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "gobouncy.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "gottfriedfeyen.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "gowildrodeo.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "gracechurchpc.net", "include_subdomains": true, "mode": "force-https" }, + { "name": "grahamofthewheels.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "grammysgrid.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "grandcastles.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "greenliquidsystem.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "gslink.me", "include_subdomains": true, "mode": "force-https" }, + { "name": "gueze-ardeche.fr", "include_subdomains": true, "mode": "force-https" }, + { "name": "gueze-sas.fr", "include_subdomains": true, "mode": "force-https" }, + { "name": "gumi.ca", "include_subdomains": true, "mode": "force-https" }, + { "name": "h24.org", "include_subdomains": true, "mode": "force-https" }, + { "name": "haggeluring.su", "include_subdomains": true, "mode": "force-https" }, + { "name": "hairraisingphotobooths.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "hak5.org", "include_subdomains": true, "mode": "force-https" }, + { "name": "halkirkbouncycastles.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "hancatemc.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "happybounce.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "happykidscastles.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "haribilalic.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "harryphoto.fr", "include_subdomains": true, "mode": "force-https" }, + { "name": "harrysgardengamehire.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "harrysqnc.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "haveabounce.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "hayden.one", "include_subdomains": true, "mode": "force-https" }, + { "name": "haydenjames.io", "include_subdomains": true, "mode": "force-https" }, + { "name": "hazeover.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "heldundsexgott.de", "include_subdomains": true, "mode": "force-https" }, + { "name": "heliosvoting.org", "include_subdomains": true, "mode": "force-https" }, + { "name": "helpflux.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "hendrinortier.nl", "include_subdomains": true, "mode": "force-https" }, + { "name": "hengstumone.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "henker.net", "include_subdomains": true, "mode": "force-https" }, + { "name": "henleybouncycastles.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "here4funpartysolutions.ie", "include_subdomains": true, "mode": "force-https" }, + { "name": "heritagebaptistchurch.com.ph", "include_subdomains": true, "mode": "force-https" }, + { "name": "herohirehq.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "hertsbouncycastles.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "hiddenhillselectrical.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "hillebrand.io", "include_subdomains": true, "mode": "force-https" }, + { "name": "hireabouncycastle.net", "include_subdomains": true, "mode": "force-https" }, + { "name": "histoire-theatre.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "hoezzi.nl", "include_subdomains": true, "mode": "force-https" }, + { "name": "hoiquanadida.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "homegardeningforum.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "homeremodelingcontractorsca.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "horisonttimedia.fi", "include_subdomains": true, "mode": "force-https" }, + { "name": "horrell.ca", "include_subdomains": true, "mode": "force-https" }, + { "name": "hostedcomments.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "hotelvalena.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "hottubhirenewcastle.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "hottubspasnewcastle.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "housetalk.ru", "include_subdomains": true, "mode": "force-https" }, + { "name": "huglen.info", "include_subdomains": true, "mode": "force-https" }, + { "name": "huntingdonbouncers.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "hyeok.org", "include_subdomains": true, "mode": "force-https" }, + { "name": "ichmachdas.net", "include_subdomains": true, "mode": "force-https" }, + { "name": "icys2017.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "idealinflatablehire.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "idraulico.roma.it", "include_subdomains": true, "mode": "force-https" }, + { "name": "idtechnowizard.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "ienakanote.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "ifyou.live", "include_subdomains": true, "mode": "force-https" }, + { "name": "ignet.gov", "include_subdomains": true, "mode": "force-https" }, + { "name": "ijunohana.jp", "include_subdomains": true, "mode": "force-https" }, + { "name": "ikenmeyer.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "ikinokori-marketing.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "ildomani.it", "include_subdomains": true, "mode": "force-https" }, + { "name": "imanesdeviaje.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "imarkethost.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "impas.se", "include_subdomains": true, "mode": "force-https" }, + { "name": "imprendo.co", "include_subdomains": true, "mode": "force-https" }, + { "name": "impresa-pulizie.it", "include_subdomains": true, "mode": "force-https" }, + { "name": "inait.ai", "include_subdomains": true, "mode": "force-https" }, + { "name": "inandeyes.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "indigoinflatables.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "infinitiofallentownparts.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "infinitybas.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "inflatablehire-scotland.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "inflatablesny.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "inflatadays.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "inflatamania.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "infovision-france.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "ingerhy.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "inhouseents.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "inpas.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "insgesamt.net", "include_subdomains": true, "mode": "force-https" }, + { "name": "integrityoklahoma.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "intensifyrsvp.com.au", "include_subdomains": true, "mode": "force-https" }, + { "name": "interimages.fr", "include_subdomains": true, "mode": "force-https" }, + { "name": "internaluse.net", "include_subdomains": true, "mode": "force-https" }, + { "name": "investarholding.nl", "include_subdomains": true, "mode": "force-https" }, + { "name": "iobint.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "ipmonitoring.hu", "include_subdomains": true, "mode": "force-https" }, + { "name": "it-kron.de", "include_subdomains": true, "mode": "force-https" }, + { "name": "itraveille.fr", "include_subdomains": true, "mode": "force-https" }, + { "name": "itsabouncything.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "itsecblog.de", "include_subdomains": true, "mode": "force-https" }, + { "name": "itsmyparty.ie", "include_subdomains": true, "mode": "force-https" }, + { "name": "itspartytimeonline.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "iyinolaashafa.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "j0m.de", "include_subdomains": true, "mode": "force-https" }, + { "name": "jackpothappy.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "jagbouncycastles.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "jamieweb.net", "include_subdomains": true, "mode": "force-https" }, + { "name": "jammysplodgers.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "jangocloud.tk", "include_subdomains": true, "mode": "force-https" }, + { "name": "janheidler.dynv6.net", "include_subdomains": true, "mode": "force-https" }, + { "name": "jballelectronics.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "jbsinternational.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "jdheysupplies.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "jdpleisure.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "jdscastlehire.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "jeandanielfaessler.ch", "include_subdomains": true, "mode": "force-https" }, + { "name": "jeankygourmet.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "jeanmarieayer.ch", "include_subdomains": true, "mode": "force-https" }, + { "name": "jerseybikehire.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "jerseyjumpingbeans.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "jessesjumpingcastles.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "jeton.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "jfnllc.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "jhe.li", "include_subdomains": true, "mode": "force-https" }, + { "name": "jimmycn.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "jjspartyhire.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "jjspartytime.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "jk-entertainment.biz", "include_subdomains": true, "mode": "force-https" }, + { "name": "jkinteriorspa.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "jmalarcon.es", "include_subdomains": true, "mode": "force-https" }, + { "name": "jmentertainment.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "joellimberg.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "johngo.tk", "include_subdomains": true, "mode": "force-https" }, + { "name": "jojosplaycentreandcafeteria.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "jollykidswobbleworld.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "jonas-wenk.de", "include_subdomains": true, "mode": "force-https" }, + { "name": "jonathandupree.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "josegerber.ch", "include_subdomains": true, "mode": "force-https" }, + { "name": "jpcrochetapparel.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "jpsinflatables.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "jschoi.org", "include_subdomains": true, "mode": "force-https" }, + { "name": "jsent.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "jsvr.tk", "include_subdomains": true, "mode": "force-https" }, + { "name": "jtcat.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "julico.nl", "include_subdomains": true, "mode": "force-https" }, + { "name": "jump-zone.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "jump4funinflatables.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "jumpandbounce.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "jumpandjivechildrensparties.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "jumparoundbouncycastles.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "jumparoundreading.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "jumparty.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "jumpeasy.com.au", "include_subdomains": true, "mode": "force-https" }, + { "name": "jumperoos.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "jumpin-jax.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "jumpingbee.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "jumpingcastlesonline.com.au", "include_subdomains": true, "mode": "force-https" }, + { "name": "jumpingjacksbouncycastles.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "jumpinjaes.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "jumpinmonkeys.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "jumpnplay.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "junespina.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "junglejackscastles.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "justbouncecastles.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "justice.gov", "include_subdomains": true, "mode": "force-https" }, + { "name": "juventusclublugano.ch", "include_subdomains": true, "mode": "force-https" }, + { "name": "juwelierstoopman.nl", "include_subdomains": true, "mode": "force-https" }, + { "name": "jvbouncycastlehire.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "jvphotoboothhire.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "kaibol.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "kalsbouncies.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "kanecastles.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "kangaroo-bouncycastle.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "kangaroojacks.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "karasik.by", "include_subdomains": true, "mode": "force-https" }, + { "name": "katieskandy.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "katieskastles.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "katscastles.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "kbbouncycastlehire.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "kbleventhire.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "keinanung.nl", "include_subdomains": true, "mode": "force-https" }, + { "name": "kellyskastles.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "kensbouncycastles.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "keycontainers.co.za", "include_subdomains": true, "mode": "force-https" }, + { "name": "khas.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "kids-castles.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "kidsplay-plymouth.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "kidsplaybouncycastles.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "kidzpartiesllp.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "kidzsmile.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "kiki-voice.jp", "include_subdomains": true, "mode": "force-https" }, + { "name": "killymoonbouncycastles.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "kimscrazeecastles.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "king-henris-castles.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "king-of-the-castles.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "kingiescastles.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "kingofthecastlecoventry.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "kingofthecastlesentertainments.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "kingofthecastlesouthwales.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "kingofthecastlesrhyl.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "kirig.ph", "include_subdomains": true, "mode": "force-https" }, + { "name": "kmsci.com.ph", "include_subdomains": true, "mode": "force-https" }, + { "name": "kogudesi.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "konst.se", "include_subdomains": true, "mode": "force-https" }, + { "name": "koodimasin.ee", "include_subdomains": true, "mode": "force-https" }, + { "name": "kotorimusic.ga", "include_subdomains": true, "mode": "force-https" }, + { "name": "koushinjo.org", "include_subdomains": true, "mode": "force-https" }, + { "name": "kowshiksundararajan.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "krazykastles.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "krazykoolkastles.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "krazyphotobooths.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "kristofdv.be", "include_subdomains": true, "mode": "force-https" }, + { "name": "kspg.tv", "include_subdomains": true, "mode": "force-https" }, + { "name": "kuchenschock.de", "include_subdomains": true, "mode": "force-https" }, + { "name": "kuronekogaro.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "kushtikidsparties.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "kutsankaplan.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "kylescastles.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "kyras-castles.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "labouncycastlehire.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "lady-2.jp", "include_subdomains": true, "mode": "force-https" }, + { "name": "laindonleisure.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "lakehavasucitynews.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "lakesherwoodelectrical.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "lamarieealhonneur.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "lanonfire.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "lasseleegaard.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "lasseleegaard.dk", "include_subdomains": true, "mode": "force-https" }, + { "name": "lasseleegaard.net", "include_subdomains": true, "mode": "force-https" }, + { "name": "lasseleegaard.org", "include_subdomains": true, "mode": "force-https" }, + { "name": "lastweekinaws.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "lbphacker.pw", "include_subdomains": true, "mode": "force-https" }, + { "name": "lce-events.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "leapandjump.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "learn-smart.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "learnpianogreece.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "leatherwood.nl", "include_subdomains": true, "mode": "force-https" }, + { "name": "leetcode.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "legatofmrc.fr", "include_subdomains": true, "mode": "force-https" }, + { "name": "leisure-supplies-show.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "leition.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "leitionusercontent.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "lenidh.de", "include_subdomains": true, "mode": "force-https" }, + { "name": "lenyip.me", "include_subdomains": true, "mode": "force-https" }, + { "name": "leon-tech.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "lets-bounce.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "letsbounceuk.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "letspartyrugby.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "leveluprails.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "lidel.org", "include_subdomains": true, "mode": "force-https" }, + { "name": "lifemarque.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "lifeventure.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "lignemalin.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "lilysbouncycastles.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "limberg.me", "include_subdomains": true, "mode": "force-https" }, + { "name": "lincsbouncycastlehire.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "lionsdeal.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "lipartydepot.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "lisburnhottubnbounce.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "littlejumpers.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "littlelundgrenladies.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "littleprincessandmascotparties.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "littlescallywagsplay.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "livebetterwith.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "lizzythepooch.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "localbouncycastle.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "logitank.net", "include_subdomains": true, "mode": "force-https" }, + { "name": "lolcorp.pl", "include_subdomains": true, "mode": "force-https" }, + { "name": "loma.ml", "include_subdomains": true, "mode": "force-https" }, + { "name": "looneymooney.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "lotz.li", "include_subdomains": true, "mode": "force-https" }, + { "name": "lucascantor.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "luckycastles.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "ludovic-muller.fr", "include_subdomains": true, "mode": "force-https" }, + { "name": "lukesbouncycastlehire.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "luminancy.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "lutizi.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "lynnlaytonnissanparts.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "m-mail.fr", "include_subdomains": true, "mode": "force-https" }, + { "name": "m-ses.fr", "include_subdomains": true, "mode": "force-https" }, + { "name": "m.me", "include_subdomains": true, "mode": "force-https" }, + { "name": "ma-musique.fr", "include_subdomains": true, "mode": "force-https" }, + { "name": "maaya.jp", "include_subdomains": true, "mode": "force-https" }, + { "name": "machineryhouse.com.au", "include_subdomains": true, "mode": "force-https" }, + { "name": "maciespartyhire.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "mactools.com.co", "include_subdomains": true, "mode": "force-https" }, + { "name": "madbouncycastles.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "magicdaysomagh.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "magickmoments.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "makem-bounce.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "malik.id", "include_subdomains": true, "mode": "force-https" }, + { "name": "malikussaid.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "malyshata.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "manalu.cz", "include_subdomains": true, "mode": "force-https" }, + { "name": "mandcbouncycastlehire.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "manicbouncycastles.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "manuscript.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "marcocasoni.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "marianhoenscheid.de", "include_subdomains": true, "mode": "force-https" }, + { "name": "marko-fenster24.de", "include_subdomains": true, "mode": "force-https" }, + { "name": "markscastles.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "marshallscastles.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "martide.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "massflix.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "matarrosabierzo.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "matthiasott.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "mayomarquees.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "mayopartyhire.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "mbainflatables.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "mble.mg", "include_subdomains": true, "mode": "force-https" }, + { "name": "mcdermottautomotive.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "mclinflatables.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "mcsinflatables.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "mdbouncycastlehirelondon.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "mdoering.de", "include_subdomains": true, "mode": "force-https" }, + { "name": "mdxdave.de", "include_subdomains": true, "mode": "force-https" }, + { "name": "medicinskavranje.edu.rs", "include_subdomains": true, "mode": "force-https" }, + { "name": "medwaybouncycastlehire.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "meeztertom.nl", "include_subdomains": true, "mode": "force-https" }, + { "name": "meg-a-bounce.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "megabounce.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "megabounceni.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "megabouncingcastles.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "megainflatables.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "mehalick.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "meinbetriebsrat24.de", "include_subdomains": true, "mode": "force-https" }, + { "name": "melodiouscode.net", "include_subdomains": true, "mode": "force-https" }, + { "name": "memorycards.ie", "include_subdomains": true, "mode": "force-https" }, + { "name": "mendipbouncycastles.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "metadistribution.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "metikam.pl", "include_subdomains": true, "mode": "force-https" }, + { "name": "metrolush.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "micado-software.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "michaelschubert.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "microlinks.org", "include_subdomains": true, "mode": "force-https" }, + { "name": "midlandleisuresales.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "midlandsfundays.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "midlandsphotobooths.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "mikerichards.photography", "include_subdomains": true, "mode": "force-https" }, + { "name": "minigolfandgames.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "minimayhemsoftplay.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "mintclass.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "mishkovskyi.net", "include_subdomains": true, "mode": "force-https" }, + { "name": "mjasm.org", "include_subdomains": true, "mode": "force-https" }, + { "name": "mkbouncycastles.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "mkbouncyhire.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "mojilitygroup.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "mondo-it.ch", "include_subdomains": true, "mode": "force-https" }, + { "name": "monitoring.kalisz.pl", "include_subdomains": true, "mode": "force-https" }, + { "name": "monokoo.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "monstermashentertainments.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "moonysbouncycastles.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "moorfunevents.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "morethandigital.info", "include_subdomains": true, "mode": "force-https" }, + { "name": "morgansleisure.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "motherboard.services", "include_subdomains": true, "mode": "force-https" }, + { "name": "motostorie.blog", "include_subdomains": true, "mode": "force-https" }, + { "name": "moving-pixtures.de", "include_subdomains": true, "mode": "force-https" }, + { "name": "mp3donusturucu.net", "include_subdomains": true, "mode": "force-https" }, + { "name": "mrbounce.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "mrbouncescrazycastles.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "mrbouncycastle.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "mrcoolevents.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "mrdleisure.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "mrnh.de", "include_subdomains": true, "mode": "force-https" }, + { "name": "mrnh.tk", "include_subdomains": true, "mode": "force-https" }, + { "name": "msi-zlin.cz", "include_subdomains": true, "mode": "force-https" }, + { "name": "msnr.net", "include_subdomains": true, "mode": "force-https" }, + { "name": "msp66.de", "include_subdomains": true, "mode": "force-https" }, + { "name": "mucmail.de", "include_subdomains": true, "mode": "force-https" }, + { "name": "mulherportuguesa.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "multikalender.de", "include_subdomains": true, "mode": "force-https" }, + { "name": "muusika.fun", "include_subdomains": true, "mode": "force-https" }, + { "name": "mvandek.nl", "include_subdomains": true, "mode": "force-https" }, + { "name": "mxlife.org", "include_subdomains": true, "mode": "force-https" }, + { "name": "myjumparoo.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "mymun.net", "include_subdomains": true, "mode": "force-https" }, + { "name": "myowndisk.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "myowndisk.net", "include_subdomains": true, "mode": "force-https" }, + { "name": "mzh.io", "include_subdomains": true, "mode": "force-https" }, + { "name": "n-kanazawa.jp", "include_subdomains": true, "mode": "force-https" }, + { "name": "n26.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "nakedtruthbeauty.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "nan.ci", "include_subdomains": true, "mode": "force-https" }, + { "name": "nanovolt.nl", "include_subdomains": true, "mode": "force-https" }, + { "name": "narazaka.net", "include_subdomains": true, "mode": "force-https" }, + { "name": "narviz.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "naturaum.de", "include_subdomains": true, "mode": "force-https" }, + { "name": "ncamarquee.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "ndpbrn-research.org", "include_subdomains": true, "mode": "force-https" }, + { "name": "neio.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "newburybouncycastles.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "newburyparkelectrical.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "newmarketbouncycastlehire.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "newsa2.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "nfir.nl", "include_subdomains": true, "mode": "force-https" }, + { "name": "ninaforever.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "njguardtraining.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "noc.org", "include_subdomains": true, "mode": "force-https" }, + { "name": "noegoph.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "noodleyum.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "noon-entertainments.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "nopaynocure.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "normandgascon.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "northdevonbouncycastles.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "northeastrodeo.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "northernselfstorage.co.za", "include_subdomains": true, "mode": "force-https" }, + { "name": "northwest-events.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "novadermis.es", "include_subdomains": true, "mode": "force-https" }, + { "name": "novecity.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "oakparkelectrical.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "obud.cz", "include_subdomains": true, "mode": "force-https" }, + { "name": "ocsr.nl", "include_subdomains": true, "mode": "force-https" }, + { "name": "octothorpe.ninja", "include_subdomains": true, "mode": "force-https" }, + { "name": "officefundays.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "ogrodywstudniach.pl", "include_subdomains": true, "mode": "force-https" }, + { "name": "ohhdeertrade.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "ohsohairy.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "okchousebuyer.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "oldbrookinflatables.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "oldbrookmarqueehire.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "oliode.tk", "include_subdomains": true, "mode": "force-https" }, + { "name": "olivierberardphotographe.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "omgbouncycastlehire.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "ona.io", "include_subdomains": true, "mode": "force-https" }, + { "name": "onceuponarainbow.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "ond-inc.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "onestopcastles.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "oo.edu.rs", "include_subdomains": true, "mode": "force-https" }, + { "name": "oodlessoftplay.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "opendecide.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "orangejetpack.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "orlandoprojects.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "ormer.nl", "include_subdomains": true, "mode": "force-https" }, + { "name": "oswbouncycastles.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "p1ratrulezzz.me", "include_subdomains": true, "mode": "force-https" }, + { "name": "p22.co", "include_subdomains": true, "mode": "force-https" }, + { "name": "pacificpalisadeselectrical.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "paperhoney.by", "include_subdomains": true, "mode": "force-https" }, + { "name": "paprikas.fr", "include_subdomains": true, "mode": "force-https" }, + { "name": "parfum-baza.ru", "include_subdomains": true, "mode": "force-https" }, + { "name": "parkviewmotorcompany.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "parquettista.roma.it", "include_subdomains": true, "mode": "force-https" }, + { "name": "party-and-play.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "party-time-inflatables-durham.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "partybounceplay.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "partyhireformby.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "partyhireisleofwight.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "partyhireliverpool.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "partyrocksbounce.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "partyspaces.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "partytime-uk.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "partytimeltd.ie", "include_subdomains": true, "mode": "force-https" }, + { "name": "partytownireland.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "partytownmarquees.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "partyzone.ie", "include_subdomains": true, "mode": "force-https" }, + { "name": "pascal-bourhis.net", "include_subdomains": true, "mode": "force-https" }, + { "name": "patbatesremodeling.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "pathagoras.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "paulpetersen.dk", "include_subdomains": true, "mode": "force-https" }, + { "name": "pavelkahouseforcisco.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "pay8522.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "payloc.io", "include_subdomains": true, "mode": "force-https" }, + { "name": "pedidamanosevilla.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "pedrosaurus.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "pelican.ie", "include_subdomains": true, "mode": "force-https" }, + { "name": "pensanisso.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "pension-veldzigt.nl", "include_subdomains": true, "mode": "force-https" }, + { "name": "perfectionunite.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "perfectoparty.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "perfectsnap.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "petroscand.eu", "include_subdomains": true, "mode": "force-https" }, + { "name": "philippebonnard.fr", "include_subdomains": true, "mode": "force-https" }, + { "name": "photoboothpartyhire.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "piccolo-parties.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "pickormix.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "pixelgliders.de", "include_subdomains": true, "mode": "force-https" }, + { "name": "pizzahut.ru", "include_subdomains": true, "mode": "force-https" }, + { "name": "pjentertainments.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "pjleisure.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "pkphotobooths.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "plantrustler.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "playawaycastles.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "playdaysparties.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "playtimebouncycastles.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "playzonecastles.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "pld-entertainment.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "pleaseuseansnisupportedbrowser.ml", "include_subdomains": true, "mode": "force-https" }, + { "name": "plochka.bg", "include_subdomains": true, "mode": "force-https" }, + { "name": "plymouthbouncycastles.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "plymouthsoftplay.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "podroof.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "podroof.com.au", "include_subdomains": true, "mode": "force-https" }, + { "name": "pogrebisky.net", "include_subdomains": true, "mode": "force-https" }, + { "name": "pointum.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "ponycyclepals.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "popupsoftplay.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "porncandi.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "porterranchelectrical.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "portsmouthbouncycastles.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "poshcastles.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "premierbouncycastles.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "premierevents.ie", "include_subdomains": true, "mode": "force-https" }, + { "name": "preparedcapital.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "pressography.org", "include_subdomains": true, "mode": "force-https" }, + { "name": "prestigebouncycastles.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "prestigeeventshire.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "primalinea.pro", "include_subdomains": true, "mode": "force-https" }, + { "name": "printsos.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "pristineevents.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "proautorepairs.com.au", "include_subdomains": true, "mode": "force-https" }, + { "name": "projectcastle.tech", "include_subdomains": true, "mode": "force-https" }, + { "name": "promarketer.net", "include_subdomains": true, "mode": "force-https" }, + { "name": "provokator.co.il", "include_subdomains": true, "mode": "force-https" }, + { "name": "psc.gov", "include_subdomains": true, "mode": "force-https" }, + { "name": "ptmarquees.ie", "include_subdomains": true, "mode": "force-https" }, + { "name": "puppet.pl", "include_subdomains": true, "mode": "force-https" }, + { "name": "pushstar.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "pvmotorco.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "pyzlnar.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "qa-brandywineglobal.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "qaconstrucciones.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "quevisiongrafica.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "qvggroup.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "rabynska.eu", "include_subdomains": true, "mode": "force-https" }, + { "name": "raccoltarifiuti.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "rachelsbouncycastles.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "racoo.net", "include_subdomains": true, "mode": "force-https" }, + { "name": "raeu.me", "include_subdomains": true, "mode": "force-https" }, + { "name": "raidensnakesden.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "raidensnakesden.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "raidensnakesden.net", "include_subdomains": true, "mode": "force-https" }, + { "name": "rainbowinflatables.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "rajyogarishikesh.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "ramov.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "randombits.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "rascals-castles.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "rascalscastles.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "rascalscastlesdoncaster.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "ravengergaming.net", "include_subdomains": true, "mode": "force-https" }, + { "name": "rcdocuments.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "realfamilyincest.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "realitycrazy.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "redsicom.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "reepay.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "registerforevent.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "regraph.de", "include_subdomains": true, "mode": "force-https" }, + { "name": "reimaginebelonging.de", "include_subdomains": true, "mode": "force-https" }, + { "name": "reinfer.io", "include_subdomains": true, "mode": "force-https" }, + { "name": "reisekosten-gorilla.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "remodelwithlegacy.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "rentourhomeinprovence.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "repex.co.il", "include_subdomains": true, "mode": "force-https" }, + { "name": "reproduciblescience.org", "include_subdomains": true, "mode": "force-https" }, + { "name": "reprozip.org", "include_subdomains": true, "mode": "force-https" }, + { "name": "retropage.co", "include_subdomains": true, "mode": "force-https" }, + { "name": "rgbinnovation.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "rickscastles.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "rmsupply.nl", "include_subdomains": true, "mode": "force-https" }, + { "name": "robocop.no", "include_subdomains": true, "mode": "force-https" }, + { "name": "rockinronniescastles.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "rockitinflatables.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "rodeobull.biz", "include_subdomains": true, "mode": "force-https" }, + { "name": "rodeohire.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "rodeosales.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "roguefortgame.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "roma-servizi.it", "include_subdomains": true, "mode": "force-https" }, + { "name": "rondouin.fr", "include_subdomains": true, "mode": "force-https" }, + { "name": "roxiesbouncycastlehire.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "rraesthetics.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "rsl.gd", "include_subdomains": true, "mode": "force-https" }, + { "name": "rtrinflatables.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "rubberlegscastles.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "rud.is", "include_subdomains": true, "mode": "force-https" }, + { "name": "rumplesinflatables.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "russellupevents.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "rzentarzewski.net", "include_subdomains": true, "mode": "force-https" }, + { "name": "s404.de", "include_subdomains": true, "mode": "force-https" }, + { "name": "sa-blog.net", "include_subdomains": true, "mode": "force-https" }, + { "name": "said.id", "include_subdomains": true, "mode": "force-https" }, + { "name": "samappleton.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "sancy.de", "include_subdomains": true, "mode": "force-https" }, + { "name": "sandhaufen.tk", "include_subdomains": true, "mode": "force-https" }, + { "name": "sandmanintel.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "sanepsychologen.nl", "include_subdomains": true, "mode": "force-https" }, + { "name": "saq.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "saudavel.com.vc", "include_subdomains": true, "mode": "force-https" }, + { "name": "savethedogfishfoundation.org", "include_subdomains": true, "mode": "force-https" }, + { "name": "scallywagsbouncycastles.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "scamblockplus.org", "include_subdomains": true, "mode": "force-https" }, + { "name": "scatsbouncingcastles.ie", "include_subdomains": true, "mode": "force-https" }, + { "name": "scienceminnesota.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "scpartyentertainment.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "sctm.at", "include_subdomains": true, "mode": "force-https" }, + { "name": "sebi.cf", "include_subdomains": true, "mode": "force-https" }, + { "name": "secretnation.net", "include_subdomains": true, "mode": "force-https" }, + { "name": "security-24-7.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "self.nu", "include_subdomains": true, "mode": "force-https" }, + { "name": "sellercritic.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "seo.london", "include_subdomains": true, "mode": "force-https" }, + { "name": "serversftw.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "sfdev.ovh", "include_subdomains": true, "mode": "force-https" }, + { "name": "sfile.eu", "include_subdomains": true, "mode": "force-https" }, + { "name": "sfleisure.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "sft-framework.org", "include_subdomains": true, "mode": "force-https" }, + { "name": "shad.waw.pl", "include_subdomains": true, "mode": "force-https" }, + { "name": "sharemessage.net", "include_subdomains": true, "mode": "force-https" }, + { "name": "shavegazette.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "shawnbsmith.me", "include_subdomains": true, "mode": "force-https" }, + { "name": "shearcomfort.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "shin-inc.jp", "include_subdomains": true, "mode": "force-https" }, + { "name": "sibfk.org", "include_subdomains": true, "mode": "force-https" }, + { "name": "sillysnapz.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "silvine.xyz", "include_subdomains": true, "mode": "force-https" }, + { "name": "simpleinvoices.io", "include_subdomains": true, "mode": "force-https" }, + { "name": "simply.scot", "include_subdomains": true, "mode": "force-https" }, + { "name": "sirbouncealotcastles.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "sirbouncelot.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "sj-leisure.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "sjleisure.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "skhire.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "skuldwyrm.no", "include_subdomains": true, "mode": "force-https" }, + { "name": "skylineservers.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "skype.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "skys-entertainment.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "skyzimba.com.br", "include_subdomains": true, "mode": "force-https" }, + { "name": "slavasveta.info", "include_subdomains": true, "mode": "force-https" }, + { "name": "slingo.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "smart-shapes.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "smi-a.me", "include_subdomains": true, "mode": "force-https" }, + { "name": "smilessoftplay.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "sndbouncycastles.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "snote.io", "include_subdomains": true, "mode": "force-https" }, + { "name": "so.is-a-cpa.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "soccorso-stradale.org", "include_subdomains": true, "mode": "force-https" }, + { "name": "sockeye.io", "include_subdomains": true, "mode": "force-https" }, + { "name": "sodexam.pro", "include_subdomains": true, "mode": "force-https" }, + { "name": "softandbouncy.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "softplay4hire.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "softplaynation.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "softtennis-zenei.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "softwarevoortherapeuten.nl", "include_subdomains": true, "mode": "force-https" }, + { "name": "solentbubblesandbounce.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "solihullinflatables.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "sonixonline.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "sos-idraulico.it", "include_subdomains": true, "mode": "force-https" }, + { "name": "sosoftplay.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "soulcrazy.org", "include_subdomains": true, "mode": "force-https" }, + { "name": "southambouncycastle.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "soutien-naissance.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "sp-sephiroth.jp", "include_subdomains": true, "mode": "force-https" }, + { "name": "spahireleeds.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "speedychat.it", "include_subdomains": true, "mode": "force-https" }, + { "name": "sportressofblogitude.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "spunkt.fr", "include_subdomains": true, "mode": "force-https" }, + { "name": "srvonfire.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "ss88.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "stardust-entertainments.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "starlightentertainmentdevon.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "starphotoboothsni.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "startaninflatablebusiness.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "statofus.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "stedbg.net", "include_subdomains": true, "mode": "force-https" }, + { "name": "ster-enzo.nl", "include_subdomains": true, "mode": "force-https" }, + { "name": "stickergiant.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "stivesbouncycastlehire.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "stm-net.de", "include_subdomains": true, "mode": "force-https" }, + { "name": "stneotsbouncycastlehire.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "stoffelnet.de", "include_subdomains": true, "mode": "force-https" }, + { "name": "stordbatlag.no", "include_subdomains": true, "mode": "force-https" }, + { "name": "striptizer.tk", "include_subdomains": true, "mode": "force-https" }, + { "name": "studio-architetto.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "sub-net.at", "include_subdomains": true, "mode": "force-https" }, + { "name": "sunxchina.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "superbouncebouncycastles.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "supercastlesadelaide.com.au", "include_subdomains": true, "mode": "force-https" }, + { "name": "supercastlesbrisbane.com.au", "include_subdomains": true, "mode": "force-https" }, + { "name": "supercastlesmelbourne.com.au", "include_subdomains": true, "mode": "force-https" }, + { "name": "supercastlessouthsydney.com.au", "include_subdomains": true, "mode": "force-https" }, + { "name": "supercastlessunshinecoast.com.au", "include_subdomains": true, "mode": "force-https" }, + { "name": "supercastlessydney.com.au", "include_subdomains": true, "mode": "force-https" }, + { "name": "supersole.net", "include_subdomains": true, "mode": "force-https" }, + { "name": "supersteosbouncycastles.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "sushi.roma.it", "include_subdomains": true, "mode": "force-https" }, + { "name": "suttonbouncycastles.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "svantner.sk", "include_subdomains": true, "mode": "force-https" }, + { "name": "swanseapartyhire.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "swfmax.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "synergisticsoccer.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "t47.io", "include_subdomains": true, "mode": "force-https" }, + { "name": "taqsim.jp", "include_subdomains": true, "mode": "force-https" }, + { "name": "taylors-castles.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "tbtech.cz", "include_subdomains": true, "mode": "force-https" }, + { "name": "tdsinflatables.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "teamassists.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "tecit.ch", "include_subdomains": true, "mode": "force-https" }, + { "name": "tecne.ws", "include_subdomains": true, "mode": "force-https" }, + { "name": "temasa.net", "include_subdomains": true, "mode": "force-https" }, + { "name": "template-parks.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "tendomag.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "terra-x.net", "include_subdomains": true, "mode": "force-https" }, + { "name": "tewkesburybouncycastles.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "texasvolunteerattorneys.org", "include_subdomains": true, "mode": "force-https" }, + { "name": "tfg-bouncycastles.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "the3musketeers.biz", "include_subdomains": true, "mode": "force-https" }, + { "name": "thebcm.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "thebestfun.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "thebouncedepartment.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "thebouncyman.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "thedominatorsclan.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "thefrk.xyz", "include_subdomains": true, "mode": "force-https" }, + { "name": "thefunfirm.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "thegeekdiary.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "thehaxbys.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "theinflatables-ni.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "theinflatablesne.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "thelonelyones.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "thepartydoctors.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "thepieslicer.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "theplaydaysbus.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "theplayspot.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "theruizes.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "theskingym.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "thetapirsmouth.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "thewebsitedoctors.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "thexfactorgames.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "thinkingplanet.net", "include_subdomains": true, "mode": "force-https" }, + { "name": "thosci.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "thxandbye.de", "include_subdomains": true, "mode": "force-https" }, + { "name": "ticketpro.ca", "include_subdomains": true, "mode": "force-https" }, + { "name": "ticketsvergleichen.de", "include_subdomains": true, "mode": "force-https" }, + { "name": "tiggeriffic.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "tilleysbouncycastles.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "timberkel.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "tinytownsoftplay.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "tjkcastles.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "tjsbouncycastles.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "tmc.com.mt", "include_subdomains": true, "mode": "force-https" }, + { "name": "tmcpromotions.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "tohokinemakan.tk", "include_subdomains": true, "mode": "force-https" }, + { "name": "tokobungaasryflorist.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "tokobungadilampung.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "tokobungadipadangflorist.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "tokyo-onkyo.jp", "include_subdomains": true, "mode": "force-https" }, + { "name": "tomochun.net", "include_subdomains": true, "mode": "force-https" }, + { "name": "topbounce.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "topbouncycastles.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "topclassfun.ie", "include_subdomains": true, "mode": "force-https" }, + { "name": "topdogsinflatables.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "topirishcasinos.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "toptheto.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "totalpahire.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "totalparts.com.au", "include_subdomains": true, "mode": "force-https" }, + { "name": "toushi-return.xyz", "include_subdomains": true, "mode": "force-https" }, + { "name": "tppdebate.org", "include_subdomains": true, "mode": "force-https" }, + { "name": "trackdomains.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "traffic.az", "include_subdomains": true, "mode": "force-https" }, + { "name": "trafficpixel.tk", "include_subdomains": true, "mode": "force-https" }, + { "name": "traffictigers.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "traforet.win", "include_subdomains": true, "mode": "force-https" }, + { "name": "transnexus.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "traslocare.roma.it", "include_subdomains": true, "mode": "force-https" }, + { "name": "treehouseresort.nl", "include_subdomains": true, "mode": "force-https" }, + { "name": "trianglecastles.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "trizone.com.au", "include_subdomains": true, "mode": "force-https" }, + { "name": "troisdorf-gestalten.de", "include_subdomains": true, "mode": "force-https" }, + { "name": "tryupdates.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "tubetoon.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "tubetooncartoons.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "tubs4fun.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "tumblenfun.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "tuminauskas.lt", "include_subdomains": true, "mode": "force-https" }, + { "name": "tuppenceworth.ie", "include_subdomains": true, "mode": "force-https" }, + { "name": "turtles.ga", "include_subdomains": true, "mode": "force-https" }, + { "name": "tuthowto.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "tuvangoicuoc.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "tverdohleb.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "tvs-virtual.cz", "include_subdomains": true, "mode": "force-https" }, + { "name": "twizzkidzinflatables.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "txlrs.org", "include_subdomains": true, "mode": "force-https" }, + { "name": "ukmortgagecompare.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "ultima-ratio.at", "include_subdomains": true, "mode": "force-https" }, + { "name": "unbelievableplaces.de", "include_subdomains": true, "mode": "force-https" }, + { "name": "underbridgeleisure.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "unique-bouncy-castles.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "universeinform.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "unobrindes.com.br", "include_subdomains": true, "mode": "force-https" }, + { "name": "unworthy.ml", "include_subdomains": true, "mode": "force-https" }, + { "name": "usbevents.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "usds.gov", "include_subdomains": true, "mode": "force-https" }, + { "name": "usualbeings.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "uwac.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "v-desk.ga", "include_subdomains": true, "mode": "force-https" }, + { "name": "v-tek.fi", "include_subdomains": true, "mode": "force-https" }, + { "name": "valentinberclaz.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "vascomm.co.id", "include_subdomains": true, "mode": "force-https" }, + { "name": "vastgoedcultuurfonds.nl", "include_subdomains": true, "mode": "force-https" }, + { "name": "veriomed.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "vethouse.com.ua", "include_subdomains": true, "mode": "force-https" }, + { "name": "victornilsson.pw", "include_subdomains": true, "mode": "force-https" }, + { "name": "vintock.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "viptamol.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "virtualcustoms.tech", "include_subdomains": true, "mode": "force-https" }, + { "name": "vividinflatables.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "vkino.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "vmhydro.ru", "include_subdomains": true, "mode": "force-https" }, + { "name": "vowsy.club", "include_subdomains": true, "mode": "force-https" }, + { "name": "walls.de", "include_subdomains": true, "mode": "force-https" }, + { "name": "wanda76.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "wanda78.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "wanda79.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "wanda96.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "wanda97.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "wanda98.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "waonui.io", "include_subdomains": true, "mode": "force-https" }, + { "name": "warebouncycastles.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "warringtonkidsbouncycastles.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "wd627.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "wd976.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "wdbflowersevents.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "wdmg.com.ua", "include_subdomains": true, "mode": "force-https" }, + { "name": "webcatchers.nl", "include_subdomains": true, "mode": "force-https" }, + { "name": "webdev-quiz.de", "include_subdomains": true, "mode": "force-https" }, + { "name": "webjobposting.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "webpostingmart.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "webpostingreviews.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "websandbox.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "websiteout.ca", "include_subdomains": true, "mode": "force-https" }, + { "name": "websiteout.net", "include_subdomains": true, "mode": "force-https" }, + { "name": "wecleanbins.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "weddingsbynoon.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "wefitboilers.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "weightreviews.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "werbik.at", "include_subdomains": true, "mode": "force-https" }, + { "name": "werkgroepderdewereld.nl", "include_subdomains": true, "mode": "force-https" }, + { "name": "wespeakgeek.co.za", "include_subdomains": true, "mode": "force-https" }, + { "name": "westcoastcastles.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "westmidlandsbouncycastlehire.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "westmidlandsinflatables.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "westwood.no", "include_subdomains": true, "mode": "force-https" }, + { "name": "wexfordbouncycastles.ie", "include_subdomains": true, "mode": "force-https" }, + { "name": "wheelwide.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "whitelabeltickets.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "whizzzbang.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "wholelotofbounce.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "widenews.org", "include_subdomains": true, "mode": "force-https" }, + { "name": "wikivisually.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "wirralbouncycastles.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "withoutacrystalball.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "wizardbouncycastles.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "wizznab.tk", "include_subdomains": true, "mode": "force-https" }, + { "name": "wj0666.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "wlsme.org", "include_subdomains": true, "mode": "force-https" }, + { "name": "wlt.ca", "include_subdomains": true, "mode": "force-https" }, + { "name": "wltix.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "wobblywotnotz.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "wonabo.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "worcesterbouncycastlehire.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "worcesterbouncycastles.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "wordplay.one", "include_subdomains": true, "mode": "force-https" }, + { "name": "worldofparties.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "worldofwobble.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "wowbouncycastles.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "wp-master.org", "include_subdomains": true, "mode": "force-https" }, + { "name": "wulpi.it", "include_subdomains": true, "mode": "force-https" }, + { "name": "wweichen.com.cn", "include_subdomains": true, "mode": "force-https" }, + { "name": "wwv-8522.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "xenomedia.nl", "include_subdomains": true, "mode": "force-https" }, + { "name": "xenotropegames.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "xlinar.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "xn--80aaagmgvmvmcuoq7r.xn--p1ai", "include_subdomains": true, "mode": "force-https" }, + { "name": "xn--erklderbarenben-slbh.dk", "include_subdomains": true, "mode": "force-https" }, + { "name": "xn--rlcus7b3d.xn--xkc2dl3a5ee0h", "include_subdomains": true, "mode": "force-https" }, + { "name": "xn--t-oha.lv", "include_subdomains": true, "mode": "force-https" }, + { "name": "xntrik.wtf", "include_subdomains": true, "mode": "force-https" }, + { "name": "xtremebouncepartyhire.com.au", "include_subdomains": true, "mode": "force-https" }, + { "name": "yabuisha.jp", "include_subdomains": true, "mode": "force-https" }, + { "name": "ybresson.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "ybsul.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "yeapdata.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "yennhi.co", "include_subdomains": true, "mode": "force-https" }, + { "name": "yoibyoin.info", "include_subdomains": true, "mode": "force-https" }, + { "name": "yorkshiredalesinflatables.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "yorkshireinflatables.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "youftp.tk", "include_subdomains": true, "mode": "force-https" }, + { "name": "yzimroni.net", "include_subdomains": true, "mode": "force-https" }, + { "name": "zacharopoulos.eu", "include_subdomains": true, "mode": "force-https" }, + { "name": "zacharopoulos.me", "include_subdomains": true, "mode": "force-https" }, + { "name": "zacharopoulos.org", "include_subdomains": true, "mode": "force-https" }, + { "name": "zakspartiesandevents.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "zebedeescastles.co.uk", "include_subdomains": true, "mode": "force-https" }, + { "name": "zk9.nl", "include_subdomains": true, "mode": "force-https" }, + { "name": "zoofit.com.au", "include_subdomains": true, "mode": "force-https" }, + { "name": "zooom2.azurewebsites.net", "include_subdomains": true, "mode": "force-https" }, + // END OF 1-YEAR BULK HSTS ENTRIES // Manual additions and changes in Chrome 51 or later that do not belong in a // special section above. - // START OF MANUAL ENTRIES + // START OF MANUAL CUSTOM ENTRIES { "name": "bodhi.fedoraproject.org", "include_subdomains": true, "mode": "force-https" }, { "name": "communityblog.fedoraproject.org", "include_subdomains": true, "mode": "force-https" }, { "name": "keys.fedoraproject.org", "include_subdomains": true, "mode": "force-https" }, @@ -38762,8 +40325,7 @@ "expect_ct": true, "expect_ct_report_uri": "https://history.report-uri.io/r/default/ct/reportOnly" }, - - // END OF MANUAL ENTRIES + // END OF MANUAL CUSTOM ENTRIES // TODO(lgarron): hstspreload.org can't scan IPv6-only sites due to Google // Cloud limitations. Move these entries to the bulk entries once they can
diff --git a/net/quic/chromium/quic_chromium_client_session.cc b/net/quic/chromium/quic_chromium_client_session.cc index 05d293d..d11bca6 100644 --- a/net/quic/chromium/quic_chromium_client_session.cc +++ b/net/quic/chromium/quic_chromium_client_session.cc
@@ -1246,7 +1246,13 @@ new_address.port()); } - stream_factory_->MigrateSessionToNewPeerAddress(this, new_address, net_log_); + if (!stream_factory_->allow_server_migration()) + return; + + // Specifying kInvalidNetworkHandle for the |network| parameter + // causes the session to use the default network for the new socket. + Migrate(NetworkChangeNotifier::kInvalidNetworkHandle, new_address, + /*close_session_on_error*/ true, net_log_); } void QuicChromiumClientSession::OnCryptoHandshakeEvent( @@ -1576,6 +1582,30 @@ /*close_session_on_error=*/true, net_log); } +void QuicChromiumClientSession::OnNetworkDisconnected( + NetworkChangeNotifier::NetworkHandle alternate_network, + const NetLogWithSource& migration_net_log) { + // TODO(zhongyi): move metrics collection to session. + if (!migrate_session_on_network_change_) + return; + + MaybeMigrateOrCloseSession( + alternate_network, /*close_if_cannot_migrate*/ true, migration_net_log); +} + +void QuicChromiumClientSession::OnNetworkMadeDefault( + NetworkChangeNotifier::NetworkHandle new_network, + const NetLogWithSource& migration_net_log) { + // TODO(zhongyi): move metrics collection to session. + if (!migrate_session_on_network_change_) + return; + + DCHECK_NE(NetworkChangeNotifier::kInvalidNetworkHandle, new_network); + + MaybeMigrateOrCloseSession(new_network, /*close_if_cannot_migrate*/ false, + migration_net_log); +} + void QuicChromiumClientSession::OnWriteError(int error_code) { DCHECK_NE(ERR_IO_PENDING, error_code); DCHECK_GT(0, error_code);
diff --git a/net/quic/chromium/quic_chromium_client_session.h b/net/quic/chromium/quic_chromium_client_session.h index 9d540ec..ea57022 100644 --- a/net/quic/chromium/quic_chromium_client_session.h +++ b/net/quic/chromium/quic_chromium_client_session.h
@@ -486,6 +486,18 @@ void OnNetworkConnected(NetworkChangeNotifier::NetworkHandle network, const NetLogWithSource& net_log); + // Called when NetworkChangeNotifier broadcasts to observers of the original + // network disconnection. Migrates this session to |alternate_network| if + // possible. + void OnNetworkDisconnected( + NetworkChangeNotifier::NetworkHandle alternate_network, + const NetLogWithSource& migration_net_log); + + // Called when NetworkChangeNotifier broadcats to observers of a new default + // network. Migrates this session to |new_network| if appropriate. + void OnNetworkMadeDefault(NetworkChangeNotifier::NetworkHandle new_network, + const NetLogWithSource& migration_net_log); + // Schedules a migration alarm to wait for a new network. void OnNoNewNetwork();
diff --git a/net/quic/chromium/quic_stream_factory.cc b/net/quic/chromium/quic_stream_factory.cc index f7a4324..5b4b4ed 100644 --- a/net/quic/chromium/quic_stream_factory.cc +++ b/net/quic/chromium/quic_stream_factory.cc
@@ -1201,8 +1201,14 @@ DCHECK_NE(NetworkChangeNotifier::kInvalidNetworkHandle, network); ScopedConnectionMigrationEventLog scoped_event_log(net_log_, "OnNetworkMadeDefault"); - MaybeMigrateOrCloseSessions(network, /*close_if_cannot_migrate=*/false, - scoped_event_log.net_log()); + + QuicStreamFactory::SessionIdMap::iterator it = all_sessions_.begin(); + // Sessions may be deleted while iterating through the map. + while (it != all_sessions_.end()) { + QuicChromiumClientSession* session = it->first; + ++it; + session->OnNetworkMadeDefault(network, scoped_event_log.net_log()); + } set_require_confirmation(true); } @@ -1238,8 +1244,13 @@ ScopedConnectionMigrationEventLog scoped_event_log(net_log_, "OnNetworkDisconnected"); NetworkHandle new_network = FindAlternateNetwork(network); - MaybeMigrateOrCloseSessions(new_network, /*close_if_cannot_migrate=*/true, - scoped_event_log.net_log()); + QuicStreamFactory::SessionIdMap::iterator it = all_sessions_.begin(); + // Sessions may be deleted while iterating through the map. + while (it != all_sessions_.end()) { + QuicChromiumClientSession* session = it->first; + ++it; + session->OnNetworkDisconnected(new_network, scoped_event_log.net_log()); + } } // This method is expected to only be called when migrating from Cellular to @@ -1260,19 +1271,6 @@ return NetworkChangeNotifier::kInvalidNetworkHandle; } -void QuicStreamFactory::MaybeMigrateOrCloseSessions( - NetworkHandle new_network, - bool close_if_cannot_migrate, - const NetLogWithSource& net_log) { - QuicStreamFactory::SessionIdMap::iterator it = all_sessions_.begin(); - while (it != all_sessions_.end()) { - QuicChromiumClientSession* session = it->first; - ++it; - session->MaybeMigrateOrCloseSession(new_network, close_if_cannot_migrate, - net_log); - } -} - void QuicStreamFactory::CollectDataOnWriteError(int error_code) { most_recent_write_error_timestamp_ = base::TimeTicks::Now(); most_recent_write_error_ = error_code; @@ -1283,23 +1281,6 @@ most_recent_path_degrading_timestamp_ = base::TimeTicks::Now(); } -void QuicStreamFactory::MigrateSessionToNewPeerAddress( - QuicChromiumClientSession* session, - IPEndPoint peer_address, - const NetLogWithSource& net_log) { - if (!allow_server_migration_) - return; - - IPEndPoint old_address; - session->GetDefaultSocket()->GetPeerAddress(&old_address); - DCHECK_EQ(old_address.GetFamily(), peer_address.GetFamily()); - - // Specifying kInvalidNetworkHandle for the |network| parameter - // causes the session to use the default network for the new socket. - session->Migrate(NetworkChangeNotifier::kInvalidNetworkHandle, peer_address, - /*close_session_on_error*/ true, net_log); -} - std::unique_ptr<DatagramClientSocket> QuicStreamFactory::CreateSocket( NetLog* net_log, const NetLogSource& source) {
diff --git a/net/quic/chromium/quic_stream_factory.h b/net/quic/chromium/quic_stream_factory.h index ac09048..e8d4a2a 100644 --- a/net/quic/chromium/quic_stream_factory.h +++ b/net/quic/chromium/quic_stream_factory.h
@@ -288,21 +288,6 @@ NetworkChangeNotifier::NetworkHandle FindAlternateNetwork( NetworkChangeNotifier::NetworkHandle old_network); - // Method that initiates migration of active sessions to |new_network|. - // If |new_network| is a valid network, sessions that can migrate are - // migrated to |new_network|, and sessions not bound to |new_network| - // are left unchanged. Sessions with non-migratable streams are closed - // if |close_if_cannot_migrate| is true, and continue using their current - // network otherwise. - // - // If |new_network| is NetworkChangeNotifier::kInvalidNetworkHandle, - // there is no new network to migrate sessions onto, and all sessions are - // closed. - void MaybeMigrateOrCloseSessions( - NetworkChangeNotifier::NetworkHandle new_network, - bool close_if_cannot_migrate, - const NetLogWithSource& net_log); - // TODO(zhongyi): move metrics collection to session once connection migration // logic is all in QuicChromiumClientSession. // Method that collects error code data on write error. @@ -313,12 +298,6 @@ // Method that collects timestamp when some session is on path degrading. void CollectDataOnPathDegrading(); - // Migrates |session| over to using |peer_address|. Causes a PING frame - // to be sent to the new peer address. - void MigrateSessionToNewPeerAddress(QuicChromiumClientSession* session, - IPEndPoint peer_address, - const NetLogWithSource& net_log); - // Creates a datagram socket. |source| is the NetLogSource for the entity // trying to create the socket, if it has one. std::unique_ptr<DatagramClientSocket> CreateSocket( @@ -353,6 +332,8 @@ bool require_confirmation() const { return require_confirmation_; } + bool allow_server_migration() const { return allow_server_migration_; } + void set_require_confirmation(bool require_confirmation); // It returns the amount of time waiting job should be delayed.
diff --git a/net/quic/chromium/quic_stream_factory_test.cc b/net/quic/chromium/quic_stream_factory_test.cc index e7cbf604..c5e1de6 100644 --- a/net/quic/chromium/quic_stream_factory_test.cc +++ b/net/quic/chromium/quic_stream_factory_test.cc
@@ -4109,8 +4109,9 @@ const uint8_t kTestIpAddress[] = {1, 2, 3, 4}; const uint16_t kTestPort = 123; - factory_->MigrateSessionToNewPeerAddress( - session, IPEndPoint(IPAddress(kTestIpAddress), kTestPort), net_log_); + session->Migrate(NetworkChangeNotifier::kInvalidNetworkHandle, + IPEndPoint(IPAddress(kTestIpAddress), kTestPort), true, + net_log_); session->GetDefaultSocket()->GetPeerAddress(&ip); DVLOG(1) << "Socket migrated to: " << ip.address().ToString() << " "
diff --git a/services/device/hid/hid_manager_unittest.cc b/services/device/hid/hid_manager_unittest.cc index aa1645b4..1537d6c 100644 --- a/services/device/hid/hid_manager_unittest.cc +++ b/services/device/hid/hid_manager_unittest.cc
@@ -25,31 +25,29 @@ const char* kTestDeviceIds[] = {"A", "B"}; #endif -class MockHidManagerClient : public device::mojom::HidManagerClient { +class MockHidManagerClient : public mojom::HidManagerClient { public: MockHidManagerClient() : binding_(this) {} - void Bind(device::mojom::HidManagerClientAssociatedRequest request) { + void Bind(mojom::HidManagerClientAssociatedRequest request) { binding_.Bind(std::move(request)); } - void DeviceAdded(device::mojom::HidDeviceInfoPtr device_info) override { + void DeviceAdded(mojom::HidDeviceInfoPtr device_info) override { EXPECT_EQ(expect_guid_, device_info->guid); std::move(quit_closure_).Run(); } - void DeviceRemoved(device::mojom::HidDeviceInfoPtr device_info) override { + void DeviceRemoved(mojom::HidDeviceInfoPtr device_info) override { EXPECT_EQ(expect_guid_, device_info->guid); std::move(quit_closure_).Run(); } - void SetConnection(device::mojom::HidConnectionPtr hid_connection) { + void SetConnection(mojom::HidConnectionPtr hid_connection) { hid_connection_ = std::move(hid_connection); } - device::mojom::HidConnection* GetConnection() { - return hid_connection_.get(); - } + mojom::HidConnection* GetConnection() { return hid_connection_.get(); } void SetQuitClosure(base::OnceClosure quit_closure) { quit_closure_ = std::move(quit_closure); @@ -58,8 +56,8 @@ void SetExpectGUID(std::string guid) { expect_guid_ = guid; } private: - mojo::AssociatedBinding<device::mojom::HidManagerClient> binding_; - device::mojom::HidConnectionPtr hid_connection_; + mojo::AssociatedBinding<mojom::HidManagerClient> binding_; + mojom::HidConnectionPtr hid_connection_; base::OnceClosure quit_closure_; std::string expect_guid_; @@ -68,7 +66,7 @@ void OnGetDevices(base::OnceClosure quit_closure, size_t expect, - std::vector<device::mojom::HidDeviceInfoPtr> devices) { + std::vector<mojom::HidDeviceInfoPtr> devices) { EXPECT_EQ(expect, devices.size()); std::move(quit_closure).Run(); @@ -76,7 +74,7 @@ void OnConnect(base::OnceClosure quit_closure, MockHidManagerClient* client, - device::mojom::HidConnectionPtr connection) { + mojom::HidConnectionPtr connection) { DCHECK(client); DCHECK(connection); client->SetConnection(std::move(connection)); @@ -124,7 +122,7 @@ void SetUp() override { DeviceServiceTestBase::SetUp(); - auto mock_hid_service = std::make_unique<device::MockHidService>(); + auto mock_hid_service = std::make_unique<MockHidService>(); mock_hid_service_ = mock_hid_service.get(); // Transfer the ownership of the |mock_hid_service| to HidManagerImpl. // It is safe to use the |mock_hid_service_| in this test. @@ -134,7 +132,7 @@ void TearDown() override { HidManagerImpl::SetHidServiceForTesting(nullptr); } - void AddDevice(scoped_refptr<device::HidDeviceInfo> device_info) { + void AddDevice(scoped_refptr<HidDeviceInfo> device_info) { mock_hid_service_->AddDevice(device_info); } @@ -142,8 +140,8 @@ mock_hid_service_->RemoveDevice(platform_device_id); } - device::mojom::HidManagerPtr hid_manager_; - device::MockHidService* mock_hid_service_; + mojom::HidManagerPtr hid_manager_; + MockHidService* mock_hid_service_; DISALLOW_COPY_AND_ASSIGN(HidManagerTest); }; @@ -151,13 +149,13 @@ // Test the GetDevices. TEST_F(HidManagerTest, GetDevicesOnly) { // Add two hid devices - auto device0 = base::MakeRefCounted<device::HidDeviceInfo>( + auto device0 = base::MakeRefCounted<HidDeviceInfo>( kTestDeviceIds[0], 0, 0, "Hid Service Unit Test", "HidDevice-0", - device::mojom::HidBusType::kHIDBusTypeUSB, std::vector<uint8_t>()); + mojom::HidBusType::kHIDBusTypeUSB, std::vector<uint8_t>()); - auto device1 = base::MakeRefCounted<device::HidDeviceInfo>( + auto device1 = base::MakeRefCounted<HidDeviceInfo>( kTestDeviceIds[1], 0, 0, "Hid Service Unit Test", "HidDevice-1", - device::mojom::HidBusType::kHIDBusTypeUSB, std::vector<uint8_t>()); + mojom::HidBusType::kHIDBusTypeUSB, std::vector<uint8_t>()); mock_hid_service_->AddDevice(device0); mock_hid_service_->AddDevice(device1); mock_hid_service_->FirstEnumerationComplete(); @@ -169,18 +167,18 @@ run_loop.Run(); } -// Test the GetDevicesAndSetClient and the device::mojom::HidManagerClient +// Test the GetDevicesAndSetClient and the mojom::HidManagerClient // interface. TEST_F(HidManagerTest, GetDevicesAndSetClient) { // Add one hid device. - auto device0 = base::MakeRefCounted<device::HidDeviceInfo>( + auto device0 = base::MakeRefCounted<HidDeviceInfo>( kTestDeviceIds[0], 0, 0, "Hid Service Unit Test", "HidDevice-0", - device::mojom::HidBusType::kHIDBusTypeUSB, std::vector<uint8_t>()); + mojom::HidBusType::kHIDBusTypeUSB, std::vector<uint8_t>()); mock_hid_service_->AddDevice(device0); mock_hid_service_->FirstEnumerationComplete(); auto client = std::make_unique<MockHidManagerClient>(); - device::mojom::HidManagerClientAssociatedPtrInfo hid_manager_client; + mojom::HidManagerClientAssociatedPtrInfo hid_manager_client; client->Bind(mojo::MakeRequest(&hid_manager_client)); // Call GetDevicesAndSetClient, expect 1 device will be received in @@ -195,9 +193,9 @@ // Add another hid device, expect MockHidManagerClient::DeviceAdded() will be // called, and the guid should be same as expected. - auto device1 = base::MakeRefCounted<device::HidDeviceInfo>( + auto device1 = base::MakeRefCounted<HidDeviceInfo>( kTestDeviceIds[1], 0, 0, "Hid Service Unit Test", "HidDevice-1", - device::mojom::HidBusType::kHIDBusTypeUSB, std::vector<uint8_t>()); + mojom::HidBusType::kHIDBusTypeUSB, std::vector<uint8_t>()); mock_hid_service_->AddDevice(device1); { base::RunLoop run_loop; @@ -217,19 +215,19 @@ } } -// Test the Connect and the device::mojom::HidConnection interface. +// Test the Connect and the mojom::HidConnection interface. TEST_F(HidManagerTest, TestHidConnectionInterface) { // Add one hid device. - auto c_info = device::mojom::HidCollectionInfo::New(); - c_info->usage = device::mojom::HidUsageAndPage::New(1, 0xf1d0); - auto device0 = base::MakeRefCounted<device::HidDeviceInfo>( + auto c_info = mojom::HidCollectionInfo::New(); + c_info->usage = mojom::HidUsageAndPage::New(1, 0xf1d0); + auto device0 = base::MakeRefCounted<HidDeviceInfo>( kTestDeviceIds[0], 0, 0, "Hid Service Unit Test", "HidDevice-0", - device::mojom::HidBusType::kHIDBusTypeUSB, std::move(c_info), 64, 64, 64); + mojom::HidBusType::kHIDBusTypeUSB, std::move(c_info), 64, 64, 64); mock_hid_service_->AddDevice(device0); mock_hid_service_->FirstEnumerationComplete(); auto client = std::make_unique<MockHidManagerClient>(); - device::mojom::HidManagerClientAssociatedPtrInfo hid_manager_client; + mojom::HidManagerClientAssociatedPtrInfo hid_manager_client; client->Bind(mojo::MakeRequest(&hid_manager_client)); // Call GetDevicesAndSetClient, expect 1 device will be received in @@ -251,7 +249,7 @@ run_loop.Run(); } - // Test device::mojom::HidConnection::Read(). + // Test mojom::HidConnection::Read(). { base::RunLoop run_loop; client->GetConnection()->Read( @@ -259,7 +257,7 @@ run_loop.Run(); } - // Test device::mojom::HidConnection::Write(). + // Test mojom::HidConnection::Write(). { base::RunLoop run_loop; client->GetConnection()->Write( @@ -268,7 +266,7 @@ run_loop.Run(); } - // Test device::mojom::HidConnection::GetFeatureReport(). + // Test mojom::HidConnection::GetFeatureReport(). { base::RunLoop run_loop; client->GetConnection()->GetFeatureReport( @@ -277,7 +275,7 @@ run_loop.Run(); } - // Test device::mojom::HidConnection::SendFeatureReport(). + // Test mojom::HidConnection::SendFeatureReport(). { base::RunLoop run_loop; // The callback of SendFeatureReport() is same as Write().
diff --git a/testing/buildbot/chromium.fyi.json b/testing/buildbot/chromium.fyi.json index 6490106..c3bd27d 100644 --- a/testing/buildbot/chromium.fyi.json +++ b/testing/buildbot/chromium.fyi.json
@@ -7093,31 +7093,6 @@ } ] }, - "WebKit Linux - RandomOrder": { - "isolated_scripts": [ - { - "isolate_name": "webkit_layout_tests_exparchive", - "merge": { - "args": [ - "--verbose" - ], - "script": "//third_party/WebKit/Tools/Scripts/merge-layout-test-results" - }, - "name": "webkit_layout_tests", - "results_handler": "layout tests", - "swarming": { - "can_use_on_swarming_builders": true, - "dimension_sets": [ - { - "os": "Ubuntu-14.04" - } - ], - "hard_timeout": 900, - "shards": 18 - } - } - ] - }, "WebKit Linux layout_ng Dummy Builder": { "isolated_scripts": [ { @@ -7202,87 +7177,6 @@ } ] }, - "WebKit Mac - RandomOrder": { - "isolated_scripts": [ - { - "isolate_name": "webkit_layout_tests_exparchive", - "merge": { - "args": [ - "--verbose" - ], - "script": "//third_party/WebKit/Tools/Scripts/merge-layout-test-results" - }, - "name": "webkit_layout_tests", - "results_handler": "layout tests", - "swarming": { - "can_use_on_swarming_builders": true, - "dimension_sets": [ - { - "gpu": "none", - "os": "Mac-10.9.5", - "pool": "Chrome" - }, - { - "gpu": "none", - "os": "Mac-10.10.5", - "pool": "Chrome" - }, - { - "gpu": "none", - "os": "Mac-10.11.6", - "pool": "Chrome" - }, - { - "gpu": "8086:0d26", - "hidpi": "1", - "os": "Mac-10.11.6", - "pool": "Chrome-perf" - }, - { - "gpu": "8086:0a2e", - "hidpi": "0", - "os": "Mac-10.12.6", - "pool": "Chrome" - }, - { - "gpu": "8086:0d26", - "hidpi": "1", - "os": "Mac-10.12.6", - "pool": "Chrome" - } - ], - "shards": 2 - } - } - ] - }, - "WebKit Win - RandomOrder": { - "isolated_scripts": [ - { - "isolate_name": "webkit_layout_tests_exparchive", - "merge": { - "args": [ - "--verbose" - ], - "script": "//third_party/WebKit/Tools/Scripts/merge-layout-test-results" - }, - "name": "webkit_layout_tests", - "swarming": { - "can_use_on_swarming_builders": true, - "dimension_sets": [ - { - "os": "Windows-10-10586" - }, - { - "os": "Windows-7-SP1" - } - ], - "hard_timeout": 900, - "shards": 10 - } - } - ] - }, "Win 10 Fast Ring": { "gtest_tests": [ {
diff --git a/testing/buildbot/chromium.perf.fyi.json b/testing/buildbot/chromium.perf.fyi.json index abff49b..b079c2b 100644 --- a/testing/buildbot/chromium.perf.fyi.json +++ b/testing/buildbot/chromium.perf.fyi.json
@@ -142,7 +142,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -172,7 +172,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -204,7 +204,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -234,7 +234,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -266,7 +266,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -296,7 +296,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -328,7 +328,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -358,7 +358,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -390,7 +390,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -420,7 +420,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -452,7 +452,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -482,7 +482,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -514,7 +514,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -576,7 +576,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -638,7 +638,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -668,7 +668,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -700,7 +700,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -730,7 +730,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -762,7 +762,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -792,7 +792,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -824,7 +824,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -854,7 +854,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -886,7 +886,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -907,7 +907,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -937,7 +937,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -969,7 +969,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -999,7 +999,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -1031,7 +1031,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -1061,7 +1061,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -1093,7 +1093,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -1123,7 +1123,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -1155,7 +1155,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -1185,7 +1185,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -1217,7 +1217,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -1226,7 +1226,7 @@ "-v", "--upload-results", "--browser=release_x64", - "--output-format=histograms" + "--output-format=chartjson" ], "isolate_name": "telemetry_perf_tests", "name": "dummy_benchmark.noisy_benchmark_1", @@ -1247,7 +1247,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -1256,7 +1256,7 @@ "-v", "--upload-results", "--browser=reference", - "--output-format=histograms", + "--output-format=chartjson", "--max-failures=5", "--output-trace-tag=_ref" ], @@ -1279,7 +1279,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -1288,7 +1288,7 @@ "-v", "--upload-results", "--browser=release_x64", - "--output-format=histograms" + "--output-format=chartjson" ], "isolate_name": "telemetry_perf_tests", "name": "dummy_benchmark.stable_benchmark_1", @@ -1309,7 +1309,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -1318,7 +1318,7 @@ "-v", "--upload-results", "--browser=reference", - "--output-format=histograms", + "--output-format=chartjson", "--max-failures=5", "--output-trace-tag=_ref" ], @@ -1341,7 +1341,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -1362,7 +1362,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -1392,7 +1392,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 1200, - "upload_test_results": false + "upload_test_results": true } }, { @@ -1424,7 +1424,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 1200, - "upload_test_results": false + "upload_test_results": true } }, { @@ -1454,7 +1454,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -1486,7 +1486,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -1507,7 +1507,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -1567,7 +1567,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -1599,7 +1599,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -1629,7 +1629,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -1661,7 +1661,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -1691,7 +1691,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -1723,7 +1723,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -1753,7 +1753,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -1785,7 +1785,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -1815,7 +1815,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -1847,7 +1847,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -1877,7 +1877,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -1909,7 +1909,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -1939,7 +1939,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -1971,7 +1971,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -2022,7 +2022,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -2052,7 +2052,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -2084,7 +2084,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -2114,7 +2114,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -2146,7 +2146,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -2176,7 +2176,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -2208,7 +2208,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -2238,7 +2238,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -2270,7 +2270,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -2300,7 +2300,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -2332,7 +2332,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -2362,7 +2362,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -2394,7 +2394,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -2424,7 +2424,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -2456,7 +2456,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -2486,7 +2486,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -2518,7 +2518,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -2548,7 +2548,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -2580,7 +2580,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -2610,7 +2610,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -2642,7 +2642,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -2672,7 +2672,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -2704,7 +2704,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -2766,7 +2766,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -2796,7 +2796,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -2828,7 +2828,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -2858,7 +2858,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -2890,7 +2890,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -2920,7 +2920,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -2952,7 +2952,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -2982,7 +2982,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -3014,7 +3014,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -3044,7 +3044,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -3076,7 +3076,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -3106,7 +3106,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -3138,7 +3138,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -3168,7 +3168,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -3200,7 +3200,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -3262,7 +3262,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -3324,7 +3324,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -3354,7 +3354,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -3386,7 +3386,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -3416,7 +3416,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -3448,7 +3448,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -3478,7 +3478,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -3510,7 +3510,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -3572,7 +3572,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -3634,7 +3634,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -3664,7 +3664,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -3696,7 +3696,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -3726,7 +3726,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -3758,7 +3758,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -3788,7 +3788,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -3820,7 +3820,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -3850,7 +3850,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -3882,7 +3882,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -3903,7 +3903,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -3965,7 +3965,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -3995,7 +3995,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -4027,7 +4027,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -4057,7 +4057,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -4119,7 +4119,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -4149,7 +4149,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -4181,7 +4181,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } } ] @@ -4215,7 +4215,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -4247,7 +4247,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -4277,7 +4277,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -4309,7 +4309,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -4339,7 +4339,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -4371,7 +4371,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -4401,7 +4401,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -4433,7 +4433,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -4463,7 +4463,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -4495,7 +4495,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -4525,7 +4525,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -4557,7 +4557,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -4619,7 +4619,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -4681,7 +4681,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -4711,7 +4711,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -4743,7 +4743,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -4773,7 +4773,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -4805,7 +4805,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -4835,7 +4835,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -4867,7 +4867,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -4897,7 +4897,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -4929,7 +4929,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -4959,7 +4959,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -4991,7 +4991,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -5021,7 +5021,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -5053,7 +5053,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -5083,7 +5083,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -5115,7 +5115,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -5145,7 +5145,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -5177,7 +5177,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -5207,7 +5207,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -5239,7 +5239,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -5248,7 +5248,7 @@ "-v", "--upload-results", "--browser=release_x64", - "--output-format=histograms" + "--output-format=chartjson" ], "isolate_name": "telemetry_perf_tests", "name": "dummy_benchmark.noisy_benchmark_1", @@ -5269,7 +5269,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -5278,7 +5278,7 @@ "-v", "--upload-results", "--browser=reference", - "--output-format=histograms", + "--output-format=chartjson", "--max-failures=5", "--output-trace-tag=_ref" ], @@ -5301,7 +5301,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -5310,7 +5310,7 @@ "-v", "--upload-results", "--browser=release_x64", - "--output-format=histograms" + "--output-format=chartjson" ], "isolate_name": "telemetry_perf_tests", "name": "dummy_benchmark.stable_benchmark_1", @@ -5331,7 +5331,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -5340,7 +5340,7 @@ "-v", "--upload-results", "--browser=reference", - "--output-format=histograms", + "--output-format=chartjson", "--max-failures=5", "--output-trace-tag=_ref" ], @@ -5363,7 +5363,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -5393,7 +5393,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 1200, - "upload_test_results": false + "upload_test_results": true } }, { @@ -5425,7 +5425,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 1200, - "upload_test_results": false + "upload_test_results": true } }, { @@ -5455,7 +5455,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -5487,7 +5487,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -5547,7 +5547,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -5579,7 +5579,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -5609,7 +5609,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -5641,7 +5641,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -5671,7 +5671,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -5703,7 +5703,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -5733,7 +5733,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -5765,7 +5765,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -5795,7 +5795,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -5827,7 +5827,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -5857,7 +5857,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -5889,7 +5889,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -5919,7 +5919,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -5951,7 +5951,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -5981,7 +5981,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -6011,7 +6011,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -6043,7 +6043,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -6073,7 +6073,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -6105,7 +6105,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -6135,7 +6135,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -6167,7 +6167,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -6197,7 +6197,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -6229,7 +6229,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -6259,7 +6259,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -6291,7 +6291,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -6321,7 +6321,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -6353,7 +6353,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -6383,7 +6383,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -6415,7 +6415,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -6445,7 +6445,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -6477,7 +6477,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -6507,7 +6507,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -6539,7 +6539,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -6569,7 +6569,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -6601,7 +6601,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -6631,7 +6631,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -6663,7 +6663,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -6725,7 +6725,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -6755,7 +6755,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -6787,7 +6787,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -6817,7 +6817,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -6849,7 +6849,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -6879,7 +6879,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -6911,7 +6911,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -6941,7 +6941,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -6973,7 +6973,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -7003,7 +7003,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -7035,7 +7035,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -7065,7 +7065,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -7097,7 +7097,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -7127,7 +7127,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -7159,7 +7159,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -7221,7 +7221,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -7283,7 +7283,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -7313,7 +7313,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -7345,7 +7345,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -7375,7 +7375,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -7407,7 +7407,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -7437,7 +7437,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -7469,7 +7469,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -7531,7 +7531,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -7593,7 +7593,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -7623,7 +7623,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -7655,7 +7655,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -7685,7 +7685,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -7717,7 +7717,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -7747,7 +7747,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -7779,7 +7779,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -7809,7 +7809,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -7841,7 +7841,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -7903,7 +7903,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -7933,7 +7933,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -7965,7 +7965,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -7995,7 +7995,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -8057,7 +8057,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -8087,7 +8087,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -8119,7 +8119,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } } ]
diff --git a/testing/buildbot/chromium.perf.json b/testing/buildbot/chromium.perf.json index e0409e2..f3c4935 100644 --- a/testing/buildbot/chromium.perf.json +++ b/testing/buildbot/chromium.perf.json
@@ -34,7 +34,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -65,7 +65,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -94,7 +94,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -125,7 +125,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -154,7 +154,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -185,7 +185,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -214,7 +214,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -245,7 +245,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -274,7 +274,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -305,7 +305,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -334,7 +334,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -365,7 +365,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -425,7 +425,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -485,7 +485,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -514,7 +514,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -545,7 +545,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -574,7 +574,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -605,7 +605,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -634,7 +634,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -665,7 +665,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -694,7 +694,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -725,7 +725,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -745,7 +745,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -774,7 +774,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -805,7 +805,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -834,7 +834,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -865,7 +865,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -894,7 +894,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -925,7 +925,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -954,7 +954,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -985,7 +985,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -1014,7 +1014,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -1045,7 +1045,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -1054,7 +1054,7 @@ "-v", "--upload-results", "--browser=android-chromium", - "--output-format=histograms" + "--output-format=chartjson" ], "isolate_name": "telemetry_perf_tests", "name": "dummy_benchmark.noisy_benchmark_1", @@ -1074,7 +1074,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -1083,7 +1083,7 @@ "-v", "--upload-results", "--browser=reference", - "--output-format=histograms", + "--output-format=chartjson", "--max-failures=5", "--output-trace-tag=_ref" ], @@ -1105,7 +1105,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -1114,7 +1114,7 @@ "-v", "--upload-results", "--browser=android-chromium", - "--output-format=histograms" + "--output-format=chartjson" ], "isolate_name": "telemetry_perf_tests", "name": "dummy_benchmark.stable_benchmark_1", @@ -1134,7 +1134,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -1143,7 +1143,7 @@ "-v", "--upload-results", "--browser=reference", - "--output-format=histograms", + "--output-format=chartjson", "--max-failures=5", "--output-trace-tag=_ref" ], @@ -1165,7 +1165,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -1185,7 +1185,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -1214,7 +1214,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 1200, - "upload_test_results": false + "upload_test_results": true } }, { @@ -1245,7 +1245,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 1200, - "upload_test_results": false + "upload_test_results": true } }, { @@ -1274,7 +1274,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -1305,7 +1305,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -1334,7 +1334,7 @@ "hard_timeout": 16200, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -1363,7 +1363,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -1394,7 +1394,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -1423,7 +1423,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -1454,7 +1454,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -1483,7 +1483,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -1514,7 +1514,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -1543,7 +1543,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -1574,7 +1574,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -1603,7 +1603,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -1634,7 +1634,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -1663,7 +1663,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -1694,7 +1694,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -1723,7 +1723,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -1754,7 +1754,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -1783,7 +1783,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -1812,7 +1812,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -1843,7 +1843,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -1872,7 +1872,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -1903,7 +1903,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -1932,7 +1932,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -1963,7 +1963,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -1992,7 +1992,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -2023,7 +2023,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -2052,7 +2052,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -2083,7 +2083,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -2112,7 +2112,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -2143,7 +2143,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -2172,7 +2172,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -2203,7 +2203,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -2232,7 +2232,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -2263,7 +2263,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -2292,7 +2292,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -2323,7 +2323,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -2352,7 +2352,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -2383,7 +2383,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -2412,7 +2412,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -2443,7 +2443,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -2472,7 +2472,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -2503,7 +2503,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -2532,7 +2532,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -2563,7 +2563,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -2592,7 +2592,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -2623,7 +2623,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -2652,7 +2652,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -2683,7 +2683,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -2712,7 +2712,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -2743,7 +2743,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -2772,7 +2772,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -2803,7 +2803,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -2832,7 +2832,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -2863,7 +2863,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -2923,7 +2923,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -2952,7 +2952,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -2983,7 +2983,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -3012,7 +3012,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -3043,7 +3043,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -3072,7 +3072,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -3103,7 +3103,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -3132,7 +3132,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -3163,7 +3163,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -3192,7 +3192,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -3223,7 +3223,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -3252,7 +3252,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -3283,7 +3283,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -3312,7 +3312,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -3343,7 +3343,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -3372,7 +3372,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -3403,7 +3403,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -3463,7 +3463,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -3523,7 +3523,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -3552,7 +3552,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -3583,7 +3583,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -3612,7 +3612,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -3643,7 +3643,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -3672,7 +3672,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -3703,7 +3703,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -3732,7 +3732,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -3763,7 +3763,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -3792,7 +3792,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -3823,7 +3823,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -3883,7 +3883,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -3943,7 +3943,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -3972,7 +3972,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -4003,7 +4003,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -4032,7 +4032,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -4063,7 +4063,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -4092,7 +4092,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -4123,7 +4123,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -4152,7 +4152,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -4183,7 +4183,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -4212,7 +4212,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -4243,7 +4243,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -4272,7 +4272,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -4303,7 +4303,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -4332,7 +4332,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -4363,7 +4363,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -4392,7 +4392,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -4423,7 +4423,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -4452,7 +4452,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -4483,7 +4483,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -4503,7 +4503,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -4563,7 +4563,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -4592,7 +4592,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -4623,7 +4623,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -4652,7 +4652,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -4712,7 +4712,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -4741,7 +4741,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -4772,7 +4772,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } } ] @@ -4805,7 +4805,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -4836,7 +4836,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -4865,7 +4865,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -4896,7 +4896,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -4925,7 +4925,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -4956,7 +4956,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -4985,7 +4985,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -5016,7 +5016,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -5045,7 +5045,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -5076,7 +5076,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -5105,7 +5105,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -5136,7 +5136,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -5196,7 +5196,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -5256,7 +5256,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -5285,7 +5285,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -5316,7 +5316,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -5345,7 +5345,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -5376,7 +5376,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -5405,7 +5405,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -5436,7 +5436,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -5465,7 +5465,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -5496,7 +5496,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -5525,7 +5525,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -5556,7 +5556,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -5585,7 +5585,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -5616,7 +5616,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -5645,7 +5645,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -5676,7 +5676,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -5705,7 +5705,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -5736,7 +5736,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -5765,7 +5765,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -5796,7 +5796,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -5805,7 +5805,7 @@ "-v", "--upload-results", "--browser=android-chromium", - "--output-format=histograms" + "--output-format=chartjson" ], "isolate_name": "telemetry_perf_tests", "name": "dummy_benchmark.noisy_benchmark_1", @@ -5825,7 +5825,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -5834,7 +5834,7 @@ "-v", "--upload-results", "--browser=reference", - "--output-format=histograms", + "--output-format=chartjson", "--max-failures=5", "--output-trace-tag=_ref" ], @@ -5856,7 +5856,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -5865,7 +5865,7 @@ "-v", "--upload-results", "--browser=android-chromium", - "--output-format=histograms" + "--output-format=chartjson" ], "isolate_name": "telemetry_perf_tests", "name": "dummy_benchmark.stable_benchmark_1", @@ -5885,7 +5885,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -5894,7 +5894,7 @@ "-v", "--upload-results", "--browser=reference", - "--output-format=histograms", + "--output-format=chartjson", "--max-failures=5", "--output-trace-tag=_ref" ], @@ -5916,7 +5916,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -5936,7 +5936,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -5965,7 +5965,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 1200, - "upload_test_results": false + "upload_test_results": true } }, { @@ -5996,7 +5996,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 1200, - "upload_test_results": false + "upload_test_results": true } }, { @@ -6025,7 +6025,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -6056,7 +6056,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -6085,7 +6085,7 @@ "hard_timeout": 16200, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -6114,7 +6114,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -6145,7 +6145,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -6174,7 +6174,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -6205,7 +6205,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -6234,7 +6234,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -6265,7 +6265,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -6294,7 +6294,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -6325,7 +6325,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -6354,7 +6354,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -6385,7 +6385,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -6414,7 +6414,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -6445,7 +6445,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -6474,7 +6474,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -6505,7 +6505,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -6534,7 +6534,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -6563,7 +6563,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -6594,7 +6594,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -6623,7 +6623,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -6654,7 +6654,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -6683,7 +6683,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -6714,7 +6714,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -6743,7 +6743,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -6774,7 +6774,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -6803,7 +6803,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -6834,7 +6834,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -6863,7 +6863,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -6894,7 +6894,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -6923,7 +6923,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -6954,7 +6954,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -6983,7 +6983,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -7014,7 +7014,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -7043,7 +7043,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -7074,7 +7074,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -7103,7 +7103,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -7134,7 +7134,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -7163,7 +7163,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -7194,7 +7194,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -7223,7 +7223,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -7254,7 +7254,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -7283,7 +7283,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -7314,7 +7314,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -7343,7 +7343,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -7374,7 +7374,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -7403,7 +7403,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -7434,7 +7434,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -7463,7 +7463,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -7494,7 +7494,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -7523,7 +7523,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -7554,7 +7554,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -7583,7 +7583,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -7614,7 +7614,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -7674,7 +7674,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -7703,7 +7703,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -7734,7 +7734,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -7763,7 +7763,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -7794,7 +7794,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -7823,7 +7823,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -7854,7 +7854,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -7883,7 +7883,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -7914,7 +7914,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -7943,7 +7943,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -7974,7 +7974,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -8003,7 +8003,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -8034,7 +8034,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -8063,7 +8063,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -8094,7 +8094,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -8123,7 +8123,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -8154,7 +8154,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -8214,7 +8214,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -8274,7 +8274,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -8303,7 +8303,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -8334,7 +8334,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -8363,7 +8363,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -8394,7 +8394,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -8423,7 +8423,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -8454,7 +8454,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -8483,7 +8483,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -8514,7 +8514,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -8543,7 +8543,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -8574,7 +8574,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -8634,7 +8634,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -8694,7 +8694,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -8723,7 +8723,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -8754,7 +8754,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -8783,7 +8783,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -8814,7 +8814,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -8843,7 +8843,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -8874,7 +8874,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -8903,7 +8903,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -8934,7 +8934,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -8963,7 +8963,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -8994,7 +8994,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -9023,7 +9023,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -9054,7 +9054,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -9083,7 +9083,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -9114,7 +9114,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -9143,7 +9143,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -9174,7 +9174,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -9203,7 +9203,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -9234,7 +9234,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -9254,7 +9254,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -9314,7 +9314,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -9343,7 +9343,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -9374,7 +9374,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -9403,7 +9403,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -9463,7 +9463,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -9492,7 +9492,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -9523,7 +9523,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } } ] @@ -9557,7 +9557,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -9587,7 +9587,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -9617,7 +9617,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -9647,7 +9647,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -9677,7 +9677,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -9707,7 +9707,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -9797,7 +9797,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -9827,7 +9827,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -9857,7 +9857,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -9887,7 +9887,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -9917,7 +9917,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -9947,7 +9947,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -9977,7 +9977,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -10007,7 +10007,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -10037,7 +10037,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -10046,7 +10046,7 @@ "-v", "--upload-results", "--browser=android-webview", - "--output-format=histograms", + "--output-format=chartjson", "--webview-embedder-apk=../../out/Release/apks/SystemWebViewShell.apk" ], "isolate_name": "telemetry_perf_webview_tests", @@ -10067,7 +10067,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -10076,7 +10076,7 @@ "-v", "--upload-results", "--browser=android-webview", - "--output-format=histograms", + "--output-format=chartjson", "--webview-embedder-apk=../../out/Release/apks/SystemWebViewShell.apk" ], "isolate_name": "telemetry_perf_webview_tests", @@ -10097,7 +10097,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -10127,7 +10127,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 1200, - "upload_test_results": false + "upload_test_results": true } }, { @@ -10157,7 +10157,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -10187,7 +10187,7 @@ "hard_timeout": 16200, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -10217,7 +10217,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -10247,7 +10247,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -10277,7 +10277,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -10307,7 +10307,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -10337,7 +10337,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -10367,7 +10367,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -10397,7 +10397,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -10427,7 +10427,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -10457,7 +10457,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -10487,7 +10487,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -10517,7 +10517,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -10547,7 +10547,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -10577,7 +10577,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -10607,7 +10607,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -10637,7 +10637,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -10667,7 +10667,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -10697,7 +10697,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -10727,7 +10727,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -10757,7 +10757,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -10787,7 +10787,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -10817,7 +10817,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -10847,7 +10847,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -10877,7 +10877,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -10907,7 +10907,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -10967,7 +10967,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -10997,7 +10997,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -11027,7 +11027,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -11057,7 +11057,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -11087,7 +11087,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -11117,7 +11117,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -11147,7 +11147,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -11177,7 +11177,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -11267,7 +11267,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -11297,7 +11297,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -11327,7 +11327,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -11417,7 +11417,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -11447,7 +11447,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -11477,7 +11477,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -11507,7 +11507,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -11537,7 +11537,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -11567,7 +11567,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -11597,7 +11597,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -11627,7 +11627,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -11657,7 +11657,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -11687,7 +11687,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -11747,7 +11747,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -11777,7 +11777,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -11837,7 +11837,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } } ] @@ -11870,7 +11870,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -11901,7 +11901,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -11930,7 +11930,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -11961,7 +11961,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -11990,7 +11990,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -12021,7 +12021,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -12050,7 +12050,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -12081,7 +12081,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -12110,7 +12110,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -12141,7 +12141,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -12170,7 +12170,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -12201,7 +12201,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -12261,7 +12261,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -12321,7 +12321,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -12350,7 +12350,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -12381,7 +12381,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -12410,7 +12410,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -12441,7 +12441,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -12470,7 +12470,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -12501,7 +12501,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -12530,7 +12530,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -12561,7 +12561,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -12581,7 +12581,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -12610,7 +12610,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -12641,7 +12641,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -12670,7 +12670,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -12701,7 +12701,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -12730,7 +12730,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -12761,7 +12761,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -12790,7 +12790,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -12821,7 +12821,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -12850,7 +12850,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -12881,7 +12881,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -12890,7 +12890,7 @@ "-v", "--upload-results", "--browser=android-chromium", - "--output-format=histograms" + "--output-format=chartjson" ], "isolate_name": "telemetry_perf_tests", "name": "dummy_benchmark.noisy_benchmark_1", @@ -12910,7 +12910,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -12919,7 +12919,7 @@ "-v", "--upload-results", "--browser=reference", - "--output-format=histograms", + "--output-format=chartjson", "--max-failures=5", "--output-trace-tag=_ref" ], @@ -12941,7 +12941,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -12950,7 +12950,7 @@ "-v", "--upload-results", "--browser=android-chromium", - "--output-format=histograms" + "--output-format=chartjson" ], "isolate_name": "telemetry_perf_tests", "name": "dummy_benchmark.stable_benchmark_1", @@ -12970,7 +12970,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -12979,7 +12979,7 @@ "-v", "--upload-results", "--browser=reference", - "--output-format=histograms", + "--output-format=chartjson", "--max-failures=5", "--output-trace-tag=_ref" ], @@ -13001,7 +13001,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -13021,7 +13021,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -13050,7 +13050,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 1200, - "upload_test_results": false + "upload_test_results": true } }, { @@ -13081,7 +13081,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 1200, - "upload_test_results": false + "upload_test_results": true } }, { @@ -13110,7 +13110,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -13141,7 +13141,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -13170,7 +13170,7 @@ "hard_timeout": 16200, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -13199,7 +13199,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -13230,7 +13230,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -13259,7 +13259,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -13290,7 +13290,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -13319,7 +13319,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -13350,7 +13350,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -13379,7 +13379,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -13410,7 +13410,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -13439,7 +13439,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -13470,7 +13470,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -13499,7 +13499,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -13530,7 +13530,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -13559,7 +13559,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -13590,7 +13590,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -13619,7 +13619,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -13648,7 +13648,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -13679,7 +13679,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -13708,7 +13708,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -13739,7 +13739,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -13768,7 +13768,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -13799,7 +13799,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -13828,7 +13828,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -13859,7 +13859,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -13888,7 +13888,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -13919,7 +13919,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -13948,7 +13948,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -13979,7 +13979,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -14008,7 +14008,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -14039,7 +14039,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -14068,7 +14068,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -14099,7 +14099,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -14128,7 +14128,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -14159,7 +14159,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -14188,7 +14188,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -14219,7 +14219,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -14248,7 +14248,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -14279,7 +14279,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -14308,7 +14308,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -14339,7 +14339,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -14368,7 +14368,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -14399,7 +14399,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -14428,7 +14428,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -14459,7 +14459,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -14488,7 +14488,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -14519,7 +14519,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -14548,7 +14548,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -14579,7 +14579,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -14608,7 +14608,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -14639,7 +14639,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -14668,7 +14668,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -14699,7 +14699,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -14759,7 +14759,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -14788,7 +14788,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -14819,7 +14819,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -14848,7 +14848,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -14879,7 +14879,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -14908,7 +14908,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -14939,7 +14939,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -14968,7 +14968,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -14999,7 +14999,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -15028,7 +15028,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -15059,7 +15059,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -15088,7 +15088,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -15119,7 +15119,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -15148,7 +15148,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -15179,7 +15179,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -15208,7 +15208,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -15239,7 +15239,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -15299,7 +15299,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -15359,7 +15359,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -15388,7 +15388,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -15419,7 +15419,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -15448,7 +15448,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -15479,7 +15479,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -15508,7 +15508,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -15539,7 +15539,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -15568,7 +15568,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -15599,7 +15599,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -15628,7 +15628,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -15659,7 +15659,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -15719,7 +15719,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -15779,7 +15779,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -15808,7 +15808,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -15839,7 +15839,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -15868,7 +15868,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -15899,7 +15899,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -15928,7 +15928,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -15959,7 +15959,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -15988,7 +15988,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -16019,7 +16019,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -16048,7 +16048,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -16079,7 +16079,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -16108,7 +16108,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -16139,7 +16139,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -16168,7 +16168,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -16199,7 +16199,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -16228,7 +16228,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -16259,7 +16259,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -16288,7 +16288,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -16319,7 +16319,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -16339,7 +16339,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -16399,7 +16399,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -16428,7 +16428,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -16459,7 +16459,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -16488,7 +16488,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -16548,7 +16548,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -16577,7 +16577,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -16608,7 +16608,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } } ] @@ -16642,7 +16642,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -16672,7 +16672,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -16702,7 +16702,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -16732,7 +16732,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -16762,7 +16762,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -16792,7 +16792,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -16882,7 +16882,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -16912,7 +16912,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -16942,7 +16942,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -16972,7 +16972,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -17002,7 +17002,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -17032,7 +17032,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -17062,7 +17062,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -17092,7 +17092,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -17122,7 +17122,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -17131,7 +17131,7 @@ "-v", "--upload-results", "--browser=android-webview", - "--output-format=histograms", + "--output-format=chartjson", "--webview-embedder-apk=../../out/Release/apks/SystemWebViewShell.apk" ], "isolate_name": "telemetry_perf_webview_tests", @@ -17152,7 +17152,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -17161,7 +17161,7 @@ "-v", "--upload-results", "--browser=android-webview", - "--output-format=histograms", + "--output-format=chartjson", "--webview-embedder-apk=../../out/Release/apks/SystemWebViewShell.apk" ], "isolate_name": "telemetry_perf_webview_tests", @@ -17182,7 +17182,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -17212,7 +17212,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 1200, - "upload_test_results": false + "upload_test_results": true } }, { @@ -17242,7 +17242,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -17272,7 +17272,7 @@ "hard_timeout": 16200, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -17302,7 +17302,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -17332,7 +17332,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -17362,7 +17362,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -17392,7 +17392,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -17422,7 +17422,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -17452,7 +17452,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -17482,7 +17482,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -17512,7 +17512,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -17542,7 +17542,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -17572,7 +17572,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -17602,7 +17602,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -17632,7 +17632,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -17662,7 +17662,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -17692,7 +17692,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -17722,7 +17722,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -17752,7 +17752,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -17782,7 +17782,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -17812,7 +17812,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -17842,7 +17842,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -17872,7 +17872,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -17902,7 +17902,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -17932,7 +17932,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -17962,7 +17962,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -17992,7 +17992,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -18052,7 +18052,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -18082,7 +18082,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -18112,7 +18112,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -18142,7 +18142,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -18172,7 +18172,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -18202,7 +18202,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -18232,7 +18232,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -18262,7 +18262,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -18352,7 +18352,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -18382,7 +18382,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -18412,7 +18412,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -18502,7 +18502,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -18532,7 +18532,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -18562,7 +18562,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -18592,7 +18592,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -18622,7 +18622,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -18652,7 +18652,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -18682,7 +18682,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -18712,7 +18712,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -18742,7 +18742,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -18772,7 +18772,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -18832,7 +18832,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -18862,7 +18862,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -18922,7 +18922,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } } ] @@ -18955,7 +18955,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -18986,7 +18986,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -19015,7 +19015,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -19046,7 +19046,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -19075,7 +19075,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -19106,7 +19106,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -19135,7 +19135,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -19166,7 +19166,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -19195,7 +19195,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -19226,7 +19226,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -19255,7 +19255,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -19286,7 +19286,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -19346,7 +19346,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -19406,7 +19406,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -19435,7 +19435,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -19466,7 +19466,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -19495,7 +19495,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -19526,7 +19526,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -19555,7 +19555,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -19586,7 +19586,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -19615,7 +19615,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -19646,7 +19646,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -19666,7 +19666,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -19695,7 +19695,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -19726,7 +19726,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -19755,7 +19755,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -19786,7 +19786,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -19815,7 +19815,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -19846,7 +19846,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -19875,7 +19875,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -19906,7 +19906,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -19935,7 +19935,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -19966,7 +19966,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -19975,7 +19975,7 @@ "-v", "--upload-results", "--browser=android-chromium", - "--output-format=histograms" + "--output-format=chartjson" ], "isolate_name": "telemetry_perf_tests", "name": "dummy_benchmark.noisy_benchmark_1", @@ -19995,7 +19995,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -20004,7 +20004,7 @@ "-v", "--upload-results", "--browser=reference", - "--output-format=histograms", + "--output-format=chartjson", "--max-failures=5", "--output-trace-tag=_ref" ], @@ -20026,7 +20026,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -20035,7 +20035,7 @@ "-v", "--upload-results", "--browser=android-chromium", - "--output-format=histograms" + "--output-format=chartjson" ], "isolate_name": "telemetry_perf_tests", "name": "dummy_benchmark.stable_benchmark_1", @@ -20055,7 +20055,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -20064,7 +20064,7 @@ "-v", "--upload-results", "--browser=reference", - "--output-format=histograms", + "--output-format=chartjson", "--max-failures=5", "--output-trace-tag=_ref" ], @@ -20086,7 +20086,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -20106,7 +20106,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -20135,7 +20135,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 1200, - "upload_test_results": false + "upload_test_results": true } }, { @@ -20166,7 +20166,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 1200, - "upload_test_results": false + "upload_test_results": true } }, { @@ -20195,7 +20195,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -20226,7 +20226,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -20255,7 +20255,7 @@ "hard_timeout": 16200, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -20284,7 +20284,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -20315,7 +20315,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -20344,7 +20344,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -20375,7 +20375,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -20404,7 +20404,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -20435,7 +20435,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -20464,7 +20464,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -20495,7 +20495,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -20524,7 +20524,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -20555,7 +20555,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -20584,7 +20584,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -20615,7 +20615,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -20644,7 +20644,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -20675,7 +20675,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -20704,7 +20704,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -20733,7 +20733,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -20764,7 +20764,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -20793,7 +20793,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -20824,7 +20824,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -20853,7 +20853,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -20884,7 +20884,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -20913,7 +20913,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -20944,7 +20944,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -20973,7 +20973,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -21004,7 +21004,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -21033,7 +21033,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -21064,7 +21064,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -21093,7 +21093,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -21124,7 +21124,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -21153,7 +21153,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -21184,7 +21184,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -21213,7 +21213,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -21244,7 +21244,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -21273,7 +21273,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -21304,7 +21304,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -21333,7 +21333,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -21364,7 +21364,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -21393,7 +21393,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -21424,7 +21424,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -21453,7 +21453,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -21484,7 +21484,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -21513,7 +21513,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -21544,7 +21544,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -21573,7 +21573,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -21604,7 +21604,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -21633,7 +21633,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -21664,7 +21664,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -21693,7 +21693,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -21724,7 +21724,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -21753,7 +21753,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -21784,7 +21784,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -21844,7 +21844,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -21873,7 +21873,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -21904,7 +21904,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -21933,7 +21933,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -21964,7 +21964,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -21993,7 +21993,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -22024,7 +22024,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -22053,7 +22053,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -22084,7 +22084,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -22113,7 +22113,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -22144,7 +22144,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -22173,7 +22173,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -22204,7 +22204,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -22233,7 +22233,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -22264,7 +22264,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -22293,7 +22293,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -22324,7 +22324,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -22384,7 +22384,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -22444,7 +22444,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -22473,7 +22473,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -22504,7 +22504,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -22533,7 +22533,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -22564,7 +22564,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -22593,7 +22593,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -22624,7 +22624,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -22653,7 +22653,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -22684,7 +22684,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -22713,7 +22713,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -22744,7 +22744,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -22804,7 +22804,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -22864,7 +22864,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -22893,7 +22893,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -22924,7 +22924,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -22953,7 +22953,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -22984,7 +22984,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -23013,7 +23013,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -23044,7 +23044,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -23073,7 +23073,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -23104,7 +23104,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -23133,7 +23133,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -23164,7 +23164,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -23193,7 +23193,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -23224,7 +23224,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -23253,7 +23253,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -23284,7 +23284,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -23313,7 +23313,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -23344,7 +23344,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -23373,7 +23373,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -23404,7 +23404,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -23424,7 +23424,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -23484,7 +23484,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -23513,7 +23513,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -23544,7 +23544,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -23573,7 +23573,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -23633,7 +23633,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -23662,7 +23662,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -23693,7 +23693,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } } ] @@ -23726,7 +23726,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -23757,7 +23757,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -23786,7 +23786,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -23817,7 +23817,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -23846,7 +23846,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -23877,7 +23877,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -23906,7 +23906,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -23937,7 +23937,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -23966,7 +23966,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -23997,7 +23997,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -24026,7 +24026,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -24057,7 +24057,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -24117,7 +24117,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -24177,7 +24177,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -24206,7 +24206,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -24237,7 +24237,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -24266,7 +24266,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -24297,7 +24297,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -24326,7 +24326,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -24357,7 +24357,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -24386,7 +24386,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -24417,7 +24417,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -24446,7 +24446,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -24477,7 +24477,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -24506,7 +24506,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -24537,7 +24537,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -24566,7 +24566,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -24597,7 +24597,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -24626,7 +24626,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -24657,7 +24657,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -24686,7 +24686,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -24717,7 +24717,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -24726,7 +24726,7 @@ "-v", "--upload-results", "--browser=android-chromium", - "--output-format=histograms" + "--output-format=chartjson" ], "isolate_name": "telemetry_perf_tests", "name": "dummy_benchmark.noisy_benchmark_1", @@ -24746,7 +24746,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -24755,7 +24755,7 @@ "-v", "--upload-results", "--browser=reference", - "--output-format=histograms", + "--output-format=chartjson", "--max-failures=5", "--output-trace-tag=_ref" ], @@ -24777,7 +24777,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -24786,7 +24786,7 @@ "-v", "--upload-results", "--browser=android-chromium", - "--output-format=histograms" + "--output-format=chartjson" ], "isolate_name": "telemetry_perf_tests", "name": "dummy_benchmark.stable_benchmark_1", @@ -24806,7 +24806,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -24815,7 +24815,7 @@ "-v", "--upload-results", "--browser=reference", - "--output-format=histograms", + "--output-format=chartjson", "--max-failures=5", "--output-trace-tag=_ref" ], @@ -24837,7 +24837,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -24857,7 +24857,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -24886,7 +24886,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 1200, - "upload_test_results": false + "upload_test_results": true } }, { @@ -24917,7 +24917,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 1200, - "upload_test_results": false + "upload_test_results": true } }, { @@ -24946,7 +24946,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -24977,7 +24977,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -25006,7 +25006,7 @@ "hard_timeout": 16200, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -25035,7 +25035,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -25066,7 +25066,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -25095,7 +25095,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -25126,7 +25126,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -25155,7 +25155,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -25186,7 +25186,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -25215,7 +25215,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -25246,7 +25246,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -25275,7 +25275,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -25306,7 +25306,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -25335,7 +25335,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -25366,7 +25366,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -25395,7 +25395,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -25426,7 +25426,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -25455,7 +25455,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -25484,7 +25484,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -25515,7 +25515,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -25544,7 +25544,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -25575,7 +25575,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -25604,7 +25604,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -25635,7 +25635,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -25664,7 +25664,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -25695,7 +25695,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -25724,7 +25724,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -25755,7 +25755,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -25784,7 +25784,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -25815,7 +25815,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -25844,7 +25844,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -25875,7 +25875,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -25904,7 +25904,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -25935,7 +25935,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -25964,7 +25964,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -25995,7 +25995,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -26024,7 +26024,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -26055,7 +26055,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -26084,7 +26084,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -26115,7 +26115,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -26144,7 +26144,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -26175,7 +26175,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -26204,7 +26204,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -26235,7 +26235,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -26264,7 +26264,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -26295,7 +26295,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -26324,7 +26324,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -26355,7 +26355,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -26384,7 +26384,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -26415,7 +26415,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -26444,7 +26444,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -26475,7 +26475,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -26504,7 +26504,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -26535,7 +26535,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -26595,7 +26595,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -26624,7 +26624,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -26655,7 +26655,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -26684,7 +26684,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -26715,7 +26715,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -26744,7 +26744,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -26775,7 +26775,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -26804,7 +26804,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -26835,7 +26835,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -26864,7 +26864,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -26895,7 +26895,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -26924,7 +26924,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -26955,7 +26955,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -26984,7 +26984,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -27015,7 +27015,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -27044,7 +27044,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -27075,7 +27075,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -27135,7 +27135,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -27195,7 +27195,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -27224,7 +27224,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -27255,7 +27255,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -27284,7 +27284,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -27315,7 +27315,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -27344,7 +27344,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -27375,7 +27375,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -27404,7 +27404,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -27435,7 +27435,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -27464,7 +27464,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -27495,7 +27495,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -27555,7 +27555,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -27615,7 +27615,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -27644,7 +27644,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -27675,7 +27675,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -27704,7 +27704,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -27735,7 +27735,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -27764,7 +27764,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -27795,7 +27795,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -27824,7 +27824,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -27855,7 +27855,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -27884,7 +27884,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -27915,7 +27915,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -27944,7 +27944,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -27975,7 +27975,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -28004,7 +28004,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -28035,7 +28035,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -28064,7 +28064,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -28095,7 +28095,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -28124,7 +28124,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -28155,7 +28155,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -28175,7 +28175,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -28235,7 +28235,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -28264,7 +28264,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -28295,7 +28295,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -28324,7 +28324,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -28384,7 +28384,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -28413,7 +28413,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -28444,7 +28444,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } } ] @@ -28483,7 +28483,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -28515,7 +28515,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -28545,7 +28545,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -28577,7 +28577,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -28607,7 +28607,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -28639,7 +28639,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -28669,7 +28669,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -28701,7 +28701,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -28731,7 +28731,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -28763,7 +28763,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -28793,7 +28793,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -28825,7 +28825,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -28887,7 +28887,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -28949,7 +28949,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -28979,7 +28979,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -29011,7 +29011,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -29041,7 +29041,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -29073,7 +29073,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -29103,7 +29103,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -29135,7 +29135,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -29165,7 +29165,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -29197,7 +29197,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -29227,7 +29227,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -29259,7 +29259,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -29289,7 +29289,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -29321,7 +29321,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -29351,7 +29351,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -29383,7 +29383,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -29413,7 +29413,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -29445,7 +29445,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -29475,7 +29475,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -29507,7 +29507,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -29516,7 +29516,7 @@ "-v", "--upload-results", "--browser=release", - "--output-format=histograms" + "--output-format=chartjson" ], "isolate_name": "telemetry_perf_tests", "name": "dummy_benchmark.noisy_benchmark_1", @@ -29537,7 +29537,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -29546,7 +29546,7 @@ "-v", "--upload-results", "--browser=reference", - "--output-format=histograms", + "--output-format=chartjson", "--max-failures=5", "--output-trace-tag=_ref" ], @@ -29569,7 +29569,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -29578,7 +29578,7 @@ "-v", "--upload-results", "--browser=release", - "--output-format=histograms" + "--output-format=chartjson" ], "isolate_name": "telemetry_perf_tests", "name": "dummy_benchmark.stable_benchmark_1", @@ -29599,7 +29599,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -29608,7 +29608,7 @@ "-v", "--upload-results", "--browser=reference", - "--output-format=histograms", + "--output-format=chartjson", "--max-failures=5", "--output-trace-tag=_ref" ], @@ -29631,7 +29631,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -29661,7 +29661,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 1200, - "upload_test_results": false + "upload_test_results": true } }, { @@ -29693,7 +29693,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 1200, - "upload_test_results": false + "upload_test_results": true } }, { @@ -29723,7 +29723,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -29755,7 +29755,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -29776,7 +29776,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -29836,7 +29836,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -29868,7 +29868,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -29898,7 +29898,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -29930,7 +29930,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -29951,7 +29951,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -29981,7 +29981,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -30013,7 +30013,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -30043,7 +30043,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -30075,7 +30075,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -30105,7 +30105,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -30137,7 +30137,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -30158,7 +30158,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -30188,7 +30188,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -30220,7 +30220,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -30250,7 +30250,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -30282,7 +30282,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -30312,7 +30312,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -30342,7 +30342,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -30374,7 +30374,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -30404,7 +30404,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -30436,7 +30436,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -30466,7 +30466,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -30498,7 +30498,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -30528,7 +30528,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -30560,7 +30560,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -30590,7 +30590,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -30622,7 +30622,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -30652,7 +30652,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -30684,7 +30684,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -30714,7 +30714,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -30746,7 +30746,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -30776,7 +30776,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -30808,7 +30808,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -30838,7 +30838,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -30870,7 +30870,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -30900,7 +30900,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -30932,7 +30932,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -30962,7 +30962,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -30994,7 +30994,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -31056,7 +31056,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -31086,7 +31086,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -31118,7 +31118,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -31148,7 +31148,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -31180,7 +31180,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -31210,7 +31210,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -31242,7 +31242,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -31272,7 +31272,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -31304,7 +31304,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -31334,7 +31334,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -31366,7 +31366,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -31396,7 +31396,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -31428,7 +31428,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -31458,7 +31458,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -31490,7 +31490,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -31552,7 +31552,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -31614,7 +31614,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -31644,7 +31644,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -31676,7 +31676,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -31706,7 +31706,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -31738,7 +31738,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -31768,7 +31768,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -31800,7 +31800,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -31862,7 +31862,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -31924,7 +31924,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -31954,7 +31954,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -31986,7 +31986,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -32016,7 +32016,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -32048,7 +32048,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -32078,7 +32078,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -32110,7 +32110,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -32140,7 +32140,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -32172,7 +32172,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -32202,7 +32202,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -32234,7 +32234,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -32255,7 +32255,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -32317,7 +32317,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -32347,7 +32347,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -32379,7 +32379,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -32409,7 +32409,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -32471,7 +32471,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -32501,7 +32501,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -32533,7 +32533,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } } ] @@ -32567,7 +32567,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -32599,7 +32599,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -32661,7 +32661,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -32691,7 +32691,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -32723,7 +32723,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -32753,7 +32753,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -32785,7 +32785,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -32815,7 +32815,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -32847,7 +32847,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -32877,7 +32877,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -32909,7 +32909,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -32939,7 +32939,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -32971,7 +32971,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -33001,7 +33001,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -33033,7 +33033,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -33095,7 +33095,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -33157,7 +33157,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -33187,7 +33187,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -33219,7 +33219,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -33249,7 +33249,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -33281,7 +33281,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -33311,7 +33311,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -33343,7 +33343,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -33373,7 +33373,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -33405,7 +33405,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -33435,7 +33435,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -33467,7 +33467,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -33497,7 +33497,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -33529,7 +33529,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -33559,7 +33559,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -33591,7 +33591,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -33621,7 +33621,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -33653,7 +33653,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -33683,7 +33683,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -33715,7 +33715,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -33724,7 +33724,7 @@ "-v", "--upload-results", "--browser=release", - "--output-format=histograms" + "--output-format=chartjson" ], "isolate_name": "telemetry_perf_tests", "name": "dummy_benchmark.noisy_benchmark_1", @@ -33745,7 +33745,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -33754,7 +33754,7 @@ "-v", "--upload-results", "--browser=reference", - "--output-format=histograms", + "--output-format=chartjson", "--max-failures=5", "--output-trace-tag=_ref" ], @@ -33777,7 +33777,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -33786,7 +33786,7 @@ "-v", "--upload-results", "--browser=release", - "--output-format=histograms" + "--output-format=chartjson" ], "isolate_name": "telemetry_perf_tests", "name": "dummy_benchmark.stable_benchmark_1", @@ -33807,7 +33807,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -33816,7 +33816,7 @@ "-v", "--upload-results", "--browser=reference", - "--output-format=histograms", + "--output-format=chartjson", "--max-failures=5", "--output-trace-tag=_ref" ], @@ -33839,7 +33839,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -33869,7 +33869,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 1200, - "upload_test_results": false + "upload_test_results": true } }, { @@ -33901,7 +33901,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 1200, - "upload_test_results": false + "upload_test_results": true } }, { @@ -33931,7 +33931,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -33963,7 +33963,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -34023,7 +34023,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -34055,7 +34055,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -34085,7 +34085,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -34117,7 +34117,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -34138,7 +34138,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -34168,7 +34168,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -34200,7 +34200,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -34230,7 +34230,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -34262,7 +34262,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -34292,7 +34292,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -34324,7 +34324,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -34354,7 +34354,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -34386,7 +34386,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -34416,7 +34416,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -34448,7 +34448,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -34478,7 +34478,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -34508,7 +34508,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -34540,7 +34540,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -34570,7 +34570,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -34602,7 +34602,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -34632,7 +34632,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -34664,7 +34664,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -34694,7 +34694,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -34726,7 +34726,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -34756,7 +34756,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -34788,7 +34788,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -34818,7 +34818,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -34850,7 +34850,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -34880,7 +34880,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -34912,7 +34912,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -34942,7 +34942,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -34974,7 +34974,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -35004,7 +35004,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -35036,7 +35036,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -35066,7 +35066,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -35098,7 +35098,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -35128,7 +35128,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -35160,7 +35160,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -35222,7 +35222,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -35252,7 +35252,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -35284,7 +35284,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -35314,7 +35314,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -35346,7 +35346,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -35376,7 +35376,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -35408,7 +35408,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -35438,7 +35438,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -35470,7 +35470,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -35500,7 +35500,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -35532,7 +35532,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -35562,7 +35562,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -35594,7 +35594,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -35624,7 +35624,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -35656,7 +35656,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -35718,7 +35718,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -35780,7 +35780,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -35810,7 +35810,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -35842,7 +35842,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -35872,7 +35872,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -35904,7 +35904,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -35934,7 +35934,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -35966,7 +35966,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -36028,7 +36028,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -36090,7 +36090,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -36120,7 +36120,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -36152,7 +36152,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -36182,7 +36182,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -36214,7 +36214,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -36244,7 +36244,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -36276,7 +36276,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -36306,7 +36306,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -36338,7 +36338,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -36400,7 +36400,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -36430,7 +36430,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -36462,7 +36462,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -36492,7 +36492,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -36554,7 +36554,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -36584,7 +36584,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -36616,7 +36616,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } } ] @@ -36650,7 +36650,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -36682,7 +36682,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -36744,7 +36744,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -36774,7 +36774,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -36806,7 +36806,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -36836,7 +36836,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -36868,7 +36868,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -36898,7 +36898,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -36930,7 +36930,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -36960,7 +36960,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -36992,7 +36992,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -37022,7 +37022,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -37054,7 +37054,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -37084,7 +37084,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -37116,7 +37116,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -37178,7 +37178,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -37240,7 +37240,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -37270,7 +37270,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -37302,7 +37302,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -37332,7 +37332,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -37364,7 +37364,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -37394,7 +37394,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -37426,7 +37426,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -37456,7 +37456,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -37488,7 +37488,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -37518,7 +37518,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -37550,7 +37550,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -37580,7 +37580,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -37612,7 +37612,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -37642,7 +37642,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -37674,7 +37674,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -37704,7 +37704,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -37736,7 +37736,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -37766,7 +37766,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -37798,7 +37798,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -37807,7 +37807,7 @@ "-v", "--upload-results", "--browser=release", - "--output-format=histograms" + "--output-format=chartjson" ], "isolate_name": "telemetry_perf_tests", "name": "dummy_benchmark.noisy_benchmark_1", @@ -37828,7 +37828,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -37837,7 +37837,7 @@ "-v", "--upload-results", "--browser=reference", - "--output-format=histograms", + "--output-format=chartjson", "--max-failures=5", "--output-trace-tag=_ref" ], @@ -37860,7 +37860,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -37869,7 +37869,7 @@ "-v", "--upload-results", "--browser=release", - "--output-format=histograms" + "--output-format=chartjson" ], "isolate_name": "telemetry_perf_tests", "name": "dummy_benchmark.stable_benchmark_1", @@ -37890,7 +37890,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -37899,7 +37899,7 @@ "-v", "--upload-results", "--browser=reference", - "--output-format=histograms", + "--output-format=chartjson", "--max-failures=5", "--output-trace-tag=_ref" ], @@ -37922,7 +37922,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -37952,7 +37952,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 1200, - "upload_test_results": false + "upload_test_results": true } }, { @@ -37984,7 +37984,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 1200, - "upload_test_results": false + "upload_test_results": true } }, { @@ -38014,7 +38014,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -38046,7 +38046,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -38106,7 +38106,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -38138,7 +38138,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -38168,7 +38168,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -38200,7 +38200,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -38230,7 +38230,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -38262,7 +38262,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -38292,7 +38292,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -38324,7 +38324,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -38354,7 +38354,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -38386,7 +38386,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -38407,7 +38407,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -38437,7 +38437,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -38469,7 +38469,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -38499,7 +38499,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -38531,7 +38531,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -38561,7 +38561,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -38591,7 +38591,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -38623,7 +38623,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -38653,7 +38653,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -38685,7 +38685,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -38715,7 +38715,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -38747,7 +38747,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -38777,7 +38777,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -38809,7 +38809,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -38839,7 +38839,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -38871,7 +38871,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -38901,7 +38901,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -38933,7 +38933,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -38963,7 +38963,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -38995,7 +38995,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -39025,7 +39025,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -39057,7 +39057,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -39087,7 +39087,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -39119,7 +39119,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -39149,7 +39149,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -39181,7 +39181,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -39211,7 +39211,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -39243,7 +39243,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -39305,7 +39305,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -39335,7 +39335,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -39367,7 +39367,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -39397,7 +39397,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -39429,7 +39429,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -39459,7 +39459,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -39491,7 +39491,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -39521,7 +39521,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -39553,7 +39553,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -39583,7 +39583,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -39615,7 +39615,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -39645,7 +39645,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -39677,7 +39677,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -39707,7 +39707,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -39739,7 +39739,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -39801,7 +39801,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -39863,7 +39863,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -39893,7 +39893,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -39925,7 +39925,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -39955,7 +39955,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -39987,7 +39987,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -40017,7 +40017,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -40049,7 +40049,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -40111,7 +40111,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -40173,7 +40173,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -40203,7 +40203,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -40235,7 +40235,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -40265,7 +40265,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -40297,7 +40297,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -40327,7 +40327,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -40359,7 +40359,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -40389,7 +40389,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -40421,7 +40421,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -40483,7 +40483,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -40513,7 +40513,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -40545,7 +40545,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -40575,7 +40575,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -40637,7 +40637,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -40667,7 +40667,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -40699,7 +40699,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } } ] @@ -40733,7 +40733,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -40765,7 +40765,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -40827,7 +40827,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -40857,7 +40857,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -40889,7 +40889,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -40919,7 +40919,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -40951,7 +40951,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -40981,7 +40981,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -41013,7 +41013,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -41043,7 +41043,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -41075,7 +41075,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -41105,7 +41105,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -41137,7 +41137,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -41167,7 +41167,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -41199,7 +41199,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -41261,7 +41261,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -41323,7 +41323,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -41353,7 +41353,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -41385,7 +41385,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -41415,7 +41415,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -41447,7 +41447,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -41477,7 +41477,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -41509,7 +41509,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -41539,7 +41539,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -41571,7 +41571,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -41601,7 +41601,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -41633,7 +41633,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -41663,7 +41663,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -41695,7 +41695,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -41725,7 +41725,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -41757,7 +41757,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -41787,7 +41787,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -41819,7 +41819,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -41849,7 +41849,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -41881,7 +41881,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -41890,7 +41890,7 @@ "-v", "--upload-results", "--browser=release", - "--output-format=histograms" + "--output-format=chartjson" ], "isolate_name": "telemetry_perf_tests", "name": "dummy_benchmark.noisy_benchmark_1", @@ -41911,7 +41911,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -41920,7 +41920,7 @@ "-v", "--upload-results", "--browser=reference", - "--output-format=histograms", + "--output-format=chartjson", "--max-failures=5", "--output-trace-tag=_ref" ], @@ -41943,7 +41943,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -41952,7 +41952,7 @@ "-v", "--upload-results", "--browser=release", - "--output-format=histograms" + "--output-format=chartjson" ], "isolate_name": "telemetry_perf_tests", "name": "dummy_benchmark.stable_benchmark_1", @@ -41973,7 +41973,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -41982,7 +41982,7 @@ "-v", "--upload-results", "--browser=reference", - "--output-format=histograms", + "--output-format=chartjson", "--max-failures=5", "--output-trace-tag=_ref" ], @@ -42005,7 +42005,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -42035,7 +42035,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 1200, - "upload_test_results": false + "upload_test_results": true } }, { @@ -42067,7 +42067,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 1200, - "upload_test_results": false + "upload_test_results": true } }, { @@ -42097,7 +42097,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -42129,7 +42129,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -42189,7 +42189,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -42221,7 +42221,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -42251,7 +42251,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -42283,7 +42283,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -42313,7 +42313,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -42345,7 +42345,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -42375,7 +42375,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -42407,7 +42407,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -42437,7 +42437,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -42469,7 +42469,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -42499,7 +42499,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -42531,7 +42531,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -42561,7 +42561,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -42593,7 +42593,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -42644,7 +42644,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -42674,7 +42674,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -42706,7 +42706,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -42736,7 +42736,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -42768,7 +42768,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -42798,7 +42798,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -42830,7 +42830,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -42860,7 +42860,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -42892,7 +42892,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -42922,7 +42922,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -42954,7 +42954,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -42984,7 +42984,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -43016,7 +43016,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -43046,7 +43046,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -43078,7 +43078,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -43108,7 +43108,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -43140,7 +43140,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -43170,7 +43170,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -43202,7 +43202,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -43232,7 +43232,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -43264,7 +43264,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -43294,7 +43294,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -43326,7 +43326,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -43388,7 +43388,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -43418,7 +43418,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -43450,7 +43450,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -43480,7 +43480,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -43512,7 +43512,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -43542,7 +43542,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -43574,7 +43574,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -43604,7 +43604,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -43636,7 +43636,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -43666,7 +43666,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -43698,7 +43698,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -43728,7 +43728,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -43760,7 +43760,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -43790,7 +43790,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -43822,7 +43822,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -43884,7 +43884,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -43946,7 +43946,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -43976,7 +43976,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -44008,7 +44008,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -44038,7 +44038,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -44070,7 +44070,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -44100,7 +44100,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -44132,7 +44132,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -44194,7 +44194,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -44256,7 +44256,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -44286,7 +44286,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -44318,7 +44318,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -44348,7 +44348,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -44380,7 +44380,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -44410,7 +44410,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -44442,7 +44442,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -44472,7 +44472,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -44504,7 +44504,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -44566,7 +44566,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -44596,7 +44596,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -44628,7 +44628,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -44658,7 +44658,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -44720,7 +44720,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -44750,7 +44750,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -44782,7 +44782,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } } ] @@ -44816,7 +44816,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -44848,7 +44848,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -44910,7 +44910,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -44940,7 +44940,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -44972,7 +44972,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -45002,7 +45002,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -45034,7 +45034,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -45064,7 +45064,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -45096,7 +45096,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -45126,7 +45126,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -45158,7 +45158,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -45188,7 +45188,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -45220,7 +45220,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -45250,7 +45250,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -45282,7 +45282,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -45344,7 +45344,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -45406,7 +45406,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -45436,7 +45436,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -45468,7 +45468,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -45498,7 +45498,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -45530,7 +45530,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -45560,7 +45560,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -45592,7 +45592,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -45622,7 +45622,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -45654,7 +45654,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -45684,7 +45684,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -45716,7 +45716,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -45746,7 +45746,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -45778,7 +45778,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -45808,7 +45808,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -45840,7 +45840,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -45870,7 +45870,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -45902,7 +45902,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -45932,7 +45932,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -45964,7 +45964,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -45973,7 +45973,7 @@ "-v", "--upload-results", "--browser=release", - "--output-format=histograms" + "--output-format=chartjson" ], "isolate_name": "telemetry_perf_tests", "name": "dummy_benchmark.noisy_benchmark_1", @@ -45994,7 +45994,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -46003,7 +46003,7 @@ "-v", "--upload-results", "--browser=reference", - "--output-format=histograms", + "--output-format=chartjson", "--max-failures=5", "--output-trace-tag=_ref" ], @@ -46026,7 +46026,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -46035,7 +46035,7 @@ "-v", "--upload-results", "--browser=release", - "--output-format=histograms" + "--output-format=chartjson" ], "isolate_name": "telemetry_perf_tests", "name": "dummy_benchmark.stable_benchmark_1", @@ -46056,7 +46056,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -46065,7 +46065,7 @@ "-v", "--upload-results", "--browser=reference", - "--output-format=histograms", + "--output-format=chartjson", "--max-failures=5", "--output-trace-tag=_ref" ], @@ -46088,7 +46088,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -46118,7 +46118,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 1200, - "upload_test_results": false + "upload_test_results": true } }, { @@ -46150,7 +46150,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 1200, - "upload_test_results": false + "upload_test_results": true } }, { @@ -46180,7 +46180,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -46212,7 +46212,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -46272,7 +46272,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -46304,7 +46304,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -46334,7 +46334,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -46366,7 +46366,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -46396,7 +46396,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -46428,7 +46428,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -46458,7 +46458,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -46490,7 +46490,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -46520,7 +46520,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -46552,7 +46552,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -46582,7 +46582,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -46614,7 +46614,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -46644,7 +46644,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -46676,7 +46676,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -46706,7 +46706,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -46736,7 +46736,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -46768,7 +46768,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -46798,7 +46798,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -46830,7 +46830,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -46860,7 +46860,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -46892,7 +46892,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -46922,7 +46922,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -46954,7 +46954,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -46984,7 +46984,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -47016,7 +47016,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -47046,7 +47046,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -47078,7 +47078,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -47108,7 +47108,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -47140,7 +47140,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -47170,7 +47170,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -47202,7 +47202,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -47232,7 +47232,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -47264,7 +47264,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -47294,7 +47294,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -47326,7 +47326,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -47356,7 +47356,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -47388,7 +47388,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -47450,7 +47450,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -47480,7 +47480,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -47512,7 +47512,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -47542,7 +47542,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -47574,7 +47574,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -47604,7 +47604,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -47636,7 +47636,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -47666,7 +47666,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -47698,7 +47698,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -47728,7 +47728,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -47760,7 +47760,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -47790,7 +47790,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -47822,7 +47822,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -47852,7 +47852,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -47884,7 +47884,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -47946,7 +47946,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -48008,7 +48008,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -48038,7 +48038,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -48070,7 +48070,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -48100,7 +48100,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -48132,7 +48132,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -48162,7 +48162,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -48194,7 +48194,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -48256,7 +48256,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -48318,7 +48318,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -48348,7 +48348,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -48380,7 +48380,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -48410,7 +48410,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -48442,7 +48442,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -48472,7 +48472,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -48504,7 +48504,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -48534,7 +48534,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -48566,7 +48566,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -48628,7 +48628,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -48658,7 +48658,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -48690,7 +48690,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -48720,7 +48720,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -48782,7 +48782,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -48812,7 +48812,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -48844,7 +48844,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } } ] @@ -48878,7 +48878,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -48910,7 +48910,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -48972,7 +48972,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -49002,7 +49002,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -49034,7 +49034,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -49064,7 +49064,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -49096,7 +49096,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -49126,7 +49126,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -49158,7 +49158,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -49188,7 +49188,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -49220,7 +49220,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -49250,7 +49250,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -49282,7 +49282,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -49312,7 +49312,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -49344,7 +49344,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -49406,7 +49406,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -49468,7 +49468,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -49498,7 +49498,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -49530,7 +49530,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -49560,7 +49560,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -49592,7 +49592,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -49622,7 +49622,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -49654,7 +49654,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -49684,7 +49684,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -49716,7 +49716,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -49746,7 +49746,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -49778,7 +49778,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -49808,7 +49808,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -49840,7 +49840,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -49870,7 +49870,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -49902,7 +49902,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -49932,7 +49932,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -49964,7 +49964,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -49994,7 +49994,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -50026,7 +50026,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -50035,7 +50035,7 @@ "-v", "--upload-results", "--browser=release", - "--output-format=histograms" + "--output-format=chartjson" ], "isolate_name": "telemetry_perf_tests", "name": "dummy_benchmark.noisy_benchmark_1", @@ -50056,7 +50056,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -50065,7 +50065,7 @@ "-v", "--upload-results", "--browser=reference", - "--output-format=histograms", + "--output-format=chartjson", "--max-failures=5", "--output-trace-tag=_ref" ], @@ -50088,7 +50088,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -50097,7 +50097,7 @@ "-v", "--upload-results", "--browser=release", - "--output-format=histograms" + "--output-format=chartjson" ], "isolate_name": "telemetry_perf_tests", "name": "dummy_benchmark.stable_benchmark_1", @@ -50118,7 +50118,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -50127,7 +50127,7 @@ "-v", "--upload-results", "--browser=reference", - "--output-format=histograms", + "--output-format=chartjson", "--max-failures=5", "--output-trace-tag=_ref" ], @@ -50150,7 +50150,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -50180,7 +50180,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 1200, - "upload_test_results": false + "upload_test_results": true } }, { @@ -50212,7 +50212,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 1200, - "upload_test_results": false + "upload_test_results": true } }, { @@ -50242,7 +50242,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -50274,7 +50274,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -50334,7 +50334,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -50366,7 +50366,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -50396,7 +50396,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -50428,7 +50428,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -50458,7 +50458,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -50490,7 +50490,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -50520,7 +50520,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -50552,7 +50552,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -50582,7 +50582,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -50614,7 +50614,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -50644,7 +50644,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -50676,7 +50676,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -50706,7 +50706,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -50738,7 +50738,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -50789,7 +50789,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -50819,7 +50819,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -50851,7 +50851,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -50881,7 +50881,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -50913,7 +50913,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -50943,7 +50943,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -50975,7 +50975,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -51005,7 +51005,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -51037,7 +51037,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -51067,7 +51067,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -51099,7 +51099,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -51129,7 +51129,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -51161,7 +51161,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -51191,7 +51191,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -51223,7 +51223,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -51253,7 +51253,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -51285,7 +51285,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -51315,7 +51315,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -51347,7 +51347,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -51377,7 +51377,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -51409,7 +51409,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -51439,7 +51439,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -51471,7 +51471,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -51533,7 +51533,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -51563,7 +51563,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -51595,7 +51595,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -51625,7 +51625,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -51657,7 +51657,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -51687,7 +51687,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -51719,7 +51719,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -51749,7 +51749,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -51781,7 +51781,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -51811,7 +51811,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -51843,7 +51843,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -51873,7 +51873,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -51905,7 +51905,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -51935,7 +51935,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -51967,7 +51967,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -52029,7 +52029,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -52091,7 +52091,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -52121,7 +52121,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -52153,7 +52153,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -52183,7 +52183,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -52215,7 +52215,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -52245,7 +52245,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -52277,7 +52277,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -52339,7 +52339,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -52401,7 +52401,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -52431,7 +52431,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -52463,7 +52463,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -52493,7 +52493,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -52525,7 +52525,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -52555,7 +52555,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -52587,7 +52587,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -52617,7 +52617,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -52649,7 +52649,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -52711,7 +52711,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -52741,7 +52741,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -52773,7 +52773,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -52803,7 +52803,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -52865,7 +52865,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -52895,7 +52895,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -52927,7 +52927,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } } ] @@ -52961,7 +52961,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -52993,7 +52993,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -53055,7 +53055,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -53085,7 +53085,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -53117,7 +53117,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -53147,7 +53147,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -53179,7 +53179,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -53209,7 +53209,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -53241,7 +53241,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -53271,7 +53271,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -53303,7 +53303,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -53333,7 +53333,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -53365,7 +53365,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -53395,7 +53395,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -53427,7 +53427,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -53489,7 +53489,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -53551,7 +53551,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -53581,7 +53581,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -53613,7 +53613,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -53643,7 +53643,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -53675,7 +53675,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -53705,7 +53705,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -53737,7 +53737,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -53767,7 +53767,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -53799,7 +53799,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -53829,7 +53829,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -53861,7 +53861,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -53891,7 +53891,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -53923,7 +53923,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -53953,7 +53953,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -53985,7 +53985,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -54015,7 +54015,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -54047,7 +54047,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -54077,7 +54077,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -54109,7 +54109,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -54118,7 +54118,7 @@ "-v", "--upload-results", "--browser=release", - "--output-format=histograms" + "--output-format=chartjson" ], "isolate_name": "telemetry_perf_tests", "name": "dummy_benchmark.noisy_benchmark_1", @@ -54139,7 +54139,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -54148,7 +54148,7 @@ "-v", "--upload-results", "--browser=reference", - "--output-format=histograms", + "--output-format=chartjson", "--max-failures=5", "--output-trace-tag=_ref" ], @@ -54171,7 +54171,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -54180,7 +54180,7 @@ "-v", "--upload-results", "--browser=release", - "--output-format=histograms" + "--output-format=chartjson" ], "isolate_name": "telemetry_perf_tests", "name": "dummy_benchmark.stable_benchmark_1", @@ -54201,7 +54201,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -54210,7 +54210,7 @@ "-v", "--upload-results", "--browser=reference", - "--output-format=histograms", + "--output-format=chartjson", "--max-failures=5", "--output-trace-tag=_ref" ], @@ -54233,7 +54233,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -54263,7 +54263,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 1200, - "upload_test_results": false + "upload_test_results": true } }, { @@ -54295,7 +54295,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 1200, - "upload_test_results": false + "upload_test_results": true } }, { @@ -54325,7 +54325,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -54357,7 +54357,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -54417,7 +54417,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -54449,7 +54449,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -54479,7 +54479,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -54511,7 +54511,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -54541,7 +54541,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -54573,7 +54573,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -54603,7 +54603,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -54635,7 +54635,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -54665,7 +54665,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -54697,7 +54697,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -54727,7 +54727,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -54759,7 +54759,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -54789,7 +54789,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -54821,7 +54821,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -54872,7 +54872,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -54902,7 +54902,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -54934,7 +54934,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -54964,7 +54964,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -54996,7 +54996,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -55026,7 +55026,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -55058,7 +55058,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -55088,7 +55088,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -55120,7 +55120,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -55150,7 +55150,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -55182,7 +55182,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -55212,7 +55212,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -55244,7 +55244,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -55274,7 +55274,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -55306,7 +55306,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -55336,7 +55336,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -55368,7 +55368,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -55398,7 +55398,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -55430,7 +55430,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -55460,7 +55460,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -55492,7 +55492,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -55522,7 +55522,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -55554,7 +55554,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -55616,7 +55616,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -55646,7 +55646,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -55678,7 +55678,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -55708,7 +55708,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -55740,7 +55740,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -55770,7 +55770,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -55802,7 +55802,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -55832,7 +55832,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -55864,7 +55864,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -55894,7 +55894,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -55926,7 +55926,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -55956,7 +55956,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -55988,7 +55988,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -56018,7 +56018,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -56050,7 +56050,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -56112,7 +56112,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -56174,7 +56174,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -56204,7 +56204,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -56236,7 +56236,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -56266,7 +56266,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -56298,7 +56298,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -56328,7 +56328,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -56360,7 +56360,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -56422,7 +56422,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -56484,7 +56484,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -56514,7 +56514,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -56546,7 +56546,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -56576,7 +56576,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -56608,7 +56608,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -56638,7 +56638,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -56670,7 +56670,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -56700,7 +56700,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -56732,7 +56732,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -56794,7 +56794,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -56824,7 +56824,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -56856,7 +56856,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -56886,7 +56886,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -56948,7 +56948,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -56978,7 +56978,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -57010,7 +57010,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } } ] @@ -57044,7 +57044,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -57076,7 +57076,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -57106,7 +57106,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -57138,7 +57138,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -57168,7 +57168,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -57200,7 +57200,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -57230,7 +57230,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -57262,7 +57262,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -57292,7 +57292,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -57324,7 +57324,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -57354,7 +57354,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -57386,7 +57386,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -57448,7 +57448,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -57510,7 +57510,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -57540,7 +57540,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -57572,7 +57572,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -57602,7 +57602,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -57634,7 +57634,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -57664,7 +57664,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -57696,7 +57696,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -57726,7 +57726,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -57758,7 +57758,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -57788,7 +57788,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -57820,7 +57820,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -57850,7 +57850,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -57882,7 +57882,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -57912,7 +57912,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -57944,7 +57944,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -57974,7 +57974,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -58006,7 +58006,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -58036,7 +58036,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -58068,7 +58068,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -58077,7 +58077,7 @@ "-v", "--upload-results", "--browser=release_x64", - "--output-format=histograms" + "--output-format=chartjson" ], "isolate_name": "telemetry_perf_tests", "name": "dummy_benchmark.noisy_benchmark_1", @@ -58098,7 +58098,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -58107,7 +58107,7 @@ "-v", "--upload-results", "--browser=reference", - "--output-format=histograms", + "--output-format=chartjson", "--max-failures=5", "--output-trace-tag=_ref" ], @@ -58130,7 +58130,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -58139,7 +58139,7 @@ "-v", "--upload-results", "--browser=release_x64", - "--output-format=histograms" + "--output-format=chartjson" ], "isolate_name": "telemetry_perf_tests", "name": "dummy_benchmark.stable_benchmark_1", @@ -58160,7 +58160,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -58169,7 +58169,7 @@ "-v", "--upload-results", "--browser=reference", - "--output-format=histograms", + "--output-format=chartjson", "--max-failures=5", "--output-trace-tag=_ref" ], @@ -58192,7 +58192,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -58222,7 +58222,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 1200, - "upload_test_results": false + "upload_test_results": true } }, { @@ -58254,7 +58254,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 1200, - "upload_test_results": false + "upload_test_results": true } }, { @@ -58284,7 +58284,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -58316,7 +58316,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -58376,7 +58376,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -58408,7 +58408,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -58438,7 +58438,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -58470,7 +58470,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -58500,7 +58500,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -58532,7 +58532,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -58562,7 +58562,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -58594,7 +58594,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -58624,7 +58624,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -58656,7 +58656,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -58686,7 +58686,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -58718,7 +58718,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -58748,7 +58748,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -58780,7 +58780,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -58810,7 +58810,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -58840,7 +58840,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -58872,7 +58872,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -58902,7 +58902,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -58934,7 +58934,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -58964,7 +58964,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -58996,7 +58996,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -59026,7 +59026,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -59058,7 +59058,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -59088,7 +59088,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -59120,7 +59120,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -59150,7 +59150,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -59182,7 +59182,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -59212,7 +59212,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -59244,7 +59244,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -59274,7 +59274,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -59306,7 +59306,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -59336,7 +59336,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -59368,7 +59368,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -59398,7 +59398,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -59430,7 +59430,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -59460,7 +59460,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -59492,7 +59492,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -59554,7 +59554,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -59584,7 +59584,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -59616,7 +59616,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -59646,7 +59646,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -59678,7 +59678,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -59708,7 +59708,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -59740,7 +59740,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -59770,7 +59770,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -59802,7 +59802,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -59832,7 +59832,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -59864,7 +59864,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -59894,7 +59894,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -59926,7 +59926,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -59956,7 +59956,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -59988,7 +59988,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -60050,7 +60050,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -60112,7 +60112,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -60142,7 +60142,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -60174,7 +60174,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -60204,7 +60204,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -60236,7 +60236,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -60266,7 +60266,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -60298,7 +60298,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -60360,7 +60360,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -60422,7 +60422,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -60452,7 +60452,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -60484,7 +60484,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -60514,7 +60514,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -60546,7 +60546,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -60576,7 +60576,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -60608,7 +60608,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -60638,7 +60638,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -60670,7 +60670,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -60732,7 +60732,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -60762,7 +60762,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -60794,7 +60794,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -60824,7 +60824,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -60886,7 +60886,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -60916,7 +60916,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -60948,7 +60948,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } } ] @@ -60982,7 +60982,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -61014,7 +61014,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -61044,7 +61044,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -61076,7 +61076,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -61106,7 +61106,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -61138,7 +61138,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -61168,7 +61168,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -61200,7 +61200,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -61230,7 +61230,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -61262,7 +61262,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -61292,7 +61292,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -61324,7 +61324,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -61386,7 +61386,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -61448,7 +61448,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -61478,7 +61478,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -61510,7 +61510,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -61540,7 +61540,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -61572,7 +61572,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -61602,7 +61602,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -61634,7 +61634,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -61664,7 +61664,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -61696,7 +61696,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -61726,7 +61726,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -61758,7 +61758,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -61788,7 +61788,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -61820,7 +61820,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -61850,7 +61850,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -61882,7 +61882,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -61912,7 +61912,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -61944,7 +61944,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -61974,7 +61974,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -62006,7 +62006,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -62015,7 +62015,7 @@ "-v", "--upload-results", "--browser=release_x64", - "--output-format=histograms" + "--output-format=chartjson" ], "isolate_name": "telemetry_perf_tests", "name": "dummy_benchmark.noisy_benchmark_1", @@ -62036,7 +62036,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -62045,7 +62045,7 @@ "-v", "--upload-results", "--browser=reference", - "--output-format=histograms", + "--output-format=chartjson", "--max-failures=5", "--output-trace-tag=_ref" ], @@ -62068,7 +62068,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -62077,7 +62077,7 @@ "-v", "--upload-results", "--browser=release_x64", - "--output-format=histograms" + "--output-format=chartjson" ], "isolate_name": "telemetry_perf_tests", "name": "dummy_benchmark.stable_benchmark_1", @@ -62098,7 +62098,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -62107,7 +62107,7 @@ "-v", "--upload-results", "--browser=reference", - "--output-format=histograms", + "--output-format=chartjson", "--max-failures=5", "--output-trace-tag=_ref" ], @@ -62130,7 +62130,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -62160,7 +62160,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 1200, - "upload_test_results": false + "upload_test_results": true } }, { @@ -62192,7 +62192,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 1200, - "upload_test_results": false + "upload_test_results": true } }, { @@ -62222,7 +62222,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -62254,7 +62254,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -62314,7 +62314,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -62346,7 +62346,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -62376,7 +62376,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -62408,7 +62408,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -62429,7 +62429,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -62459,7 +62459,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -62491,7 +62491,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -62521,7 +62521,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -62553,7 +62553,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -62583,7 +62583,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -62615,7 +62615,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -62645,7 +62645,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -62677,7 +62677,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -62707,7 +62707,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -62739,7 +62739,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -62769,7 +62769,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -62799,7 +62799,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -62831,7 +62831,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -62861,7 +62861,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -62893,7 +62893,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -62923,7 +62923,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -62955,7 +62955,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -62985,7 +62985,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -63017,7 +63017,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -63047,7 +63047,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -63079,7 +63079,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -63109,7 +63109,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -63141,7 +63141,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -63171,7 +63171,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -63203,7 +63203,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -63233,7 +63233,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -63265,7 +63265,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -63295,7 +63295,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -63327,7 +63327,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -63357,7 +63357,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -63389,7 +63389,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -63419,7 +63419,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -63451,7 +63451,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -63513,7 +63513,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -63543,7 +63543,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -63575,7 +63575,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -63605,7 +63605,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -63637,7 +63637,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -63667,7 +63667,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -63699,7 +63699,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -63729,7 +63729,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -63761,7 +63761,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -63791,7 +63791,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -63823,7 +63823,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -63853,7 +63853,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -63885,7 +63885,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -63915,7 +63915,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -63947,7 +63947,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -64009,7 +64009,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -64071,7 +64071,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -64101,7 +64101,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -64133,7 +64133,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -64163,7 +64163,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -64195,7 +64195,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -64225,7 +64225,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -64257,7 +64257,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -64319,7 +64319,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -64381,7 +64381,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -64411,7 +64411,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -64443,7 +64443,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -64473,7 +64473,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -64505,7 +64505,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -64535,7 +64535,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -64567,7 +64567,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -64597,7 +64597,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -64629,7 +64629,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -64691,7 +64691,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -64721,7 +64721,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -64753,7 +64753,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -64783,7 +64783,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -64845,7 +64845,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -64875,7 +64875,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -64907,7 +64907,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } } ] @@ -64932,7 +64932,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -64962,7 +64962,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -64994,7 +64994,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -65024,7 +65024,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -65056,7 +65056,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -65086,7 +65086,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -65118,7 +65118,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -65148,7 +65148,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -65180,7 +65180,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -65210,7 +65210,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -65242,7 +65242,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -65272,7 +65272,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -65304,7 +65304,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -65366,7 +65366,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -65428,7 +65428,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -65458,7 +65458,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -65490,7 +65490,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -65520,7 +65520,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -65552,7 +65552,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -65582,7 +65582,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -65614,7 +65614,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -65644,7 +65644,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -65676,7 +65676,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -65706,7 +65706,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -65738,7 +65738,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -65768,7 +65768,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -65800,7 +65800,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -65830,7 +65830,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -65862,7 +65862,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -65892,7 +65892,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -65924,7 +65924,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -65954,7 +65954,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -65986,7 +65986,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -65995,7 +65995,7 @@ "-v", "--upload-results", "--browser=release_x64", - "--output-format=histograms" + "--output-format=chartjson" ], "isolate_name": "telemetry_perf_tests", "name": "dummy_benchmark.noisy_benchmark_1", @@ -66016,7 +66016,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -66025,7 +66025,7 @@ "-v", "--upload-results", "--browser=reference", - "--output-format=histograms", + "--output-format=chartjson", "--max-failures=5", "--output-trace-tag=_ref" ], @@ -66048,7 +66048,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -66057,7 +66057,7 @@ "-v", "--upload-results", "--browser=release_x64", - "--output-format=histograms" + "--output-format=chartjson" ], "isolate_name": "telemetry_perf_tests", "name": "dummy_benchmark.stable_benchmark_1", @@ -66078,7 +66078,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -66087,7 +66087,7 @@ "-v", "--upload-results", "--browser=reference", - "--output-format=histograms", + "--output-format=chartjson", "--max-failures=5", "--output-trace-tag=_ref" ], @@ -66110,7 +66110,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -66140,7 +66140,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 1200, - "upload_test_results": false + "upload_test_results": true } }, { @@ -66172,7 +66172,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 1200, - "upload_test_results": false + "upload_test_results": true } }, { @@ -66202,7 +66202,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -66234,7 +66234,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -66255,7 +66255,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -66315,7 +66315,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -66347,7 +66347,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -66377,7 +66377,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -66409,7 +66409,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -66430,7 +66430,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -66460,7 +66460,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -66492,7 +66492,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -66522,7 +66522,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -66554,7 +66554,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -66584,7 +66584,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -66616,7 +66616,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -66646,7 +66646,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -66678,7 +66678,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -66708,7 +66708,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -66740,7 +66740,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -66791,7 +66791,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -66821,7 +66821,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -66853,7 +66853,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -66883,7 +66883,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -66915,7 +66915,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -66945,7 +66945,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -66977,7 +66977,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -67007,7 +67007,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -67039,7 +67039,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -67069,7 +67069,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -67101,7 +67101,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -67131,7 +67131,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -67163,7 +67163,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -67193,7 +67193,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -67225,7 +67225,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -67255,7 +67255,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -67287,7 +67287,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -67317,7 +67317,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -67349,7 +67349,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -67379,7 +67379,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -67411,7 +67411,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -67441,7 +67441,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -67473,7 +67473,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -67535,7 +67535,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -67565,7 +67565,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -67597,7 +67597,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -67627,7 +67627,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -67659,7 +67659,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -67689,7 +67689,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -67721,7 +67721,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -67751,7 +67751,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -67783,7 +67783,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -67813,7 +67813,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -67845,7 +67845,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -67875,7 +67875,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -67907,7 +67907,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -67937,7 +67937,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -67969,7 +67969,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -68031,7 +68031,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -68093,7 +68093,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -68123,7 +68123,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -68155,7 +68155,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -68185,7 +68185,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -68217,7 +68217,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -68247,7 +68247,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -68279,7 +68279,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -68341,7 +68341,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -68403,7 +68403,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -68433,7 +68433,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -68465,7 +68465,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -68495,7 +68495,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -68527,7 +68527,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -68557,7 +68557,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -68589,7 +68589,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -68619,7 +68619,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -68651,7 +68651,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -68713,7 +68713,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -68743,7 +68743,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -68775,7 +68775,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -68805,7 +68805,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -68867,7 +68867,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -68897,7 +68897,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -68929,7 +68929,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } } ] @@ -68954,7 +68954,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -68984,7 +68984,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -69016,7 +69016,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -69046,7 +69046,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -69078,7 +69078,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -69108,7 +69108,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -69140,7 +69140,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -69170,7 +69170,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -69202,7 +69202,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -69232,7 +69232,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -69264,7 +69264,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -69294,7 +69294,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -69326,7 +69326,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -69388,7 +69388,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -69450,7 +69450,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -69480,7 +69480,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -69512,7 +69512,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -69542,7 +69542,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -69574,7 +69574,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -69604,7 +69604,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -69636,7 +69636,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -69666,7 +69666,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -69698,7 +69698,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -69728,7 +69728,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -69760,7 +69760,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -69790,7 +69790,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -69822,7 +69822,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -69852,7 +69852,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -69884,7 +69884,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -69914,7 +69914,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -69946,7 +69946,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -69976,7 +69976,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -70008,7 +70008,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -70017,7 +70017,7 @@ "-v", "--upload-results", "--browser=release_x64", - "--output-format=histograms" + "--output-format=chartjson" ], "isolate_name": "telemetry_perf_tests", "name": "dummy_benchmark.noisy_benchmark_1", @@ -70038,7 +70038,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -70047,7 +70047,7 @@ "-v", "--upload-results", "--browser=reference", - "--output-format=histograms", + "--output-format=chartjson", "--max-failures=5", "--output-trace-tag=_ref" ], @@ -70070,7 +70070,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -70079,7 +70079,7 @@ "-v", "--upload-results", "--browser=release_x64", - "--output-format=histograms" + "--output-format=chartjson" ], "isolate_name": "telemetry_perf_tests", "name": "dummy_benchmark.stable_benchmark_1", @@ -70100,7 +70100,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -70109,7 +70109,7 @@ "-v", "--upload-results", "--browser=reference", - "--output-format=histograms", + "--output-format=chartjson", "--max-failures=5", "--output-trace-tag=_ref" ], @@ -70132,7 +70132,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -70162,7 +70162,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 1200, - "upload_test_results": false + "upload_test_results": true } }, { @@ -70194,7 +70194,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 1200, - "upload_test_results": false + "upload_test_results": true } }, { @@ -70224,7 +70224,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -70256,7 +70256,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -70277,7 +70277,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -70337,7 +70337,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -70369,7 +70369,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -70399,7 +70399,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -70431,7 +70431,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -70461,7 +70461,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -70493,7 +70493,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -70523,7 +70523,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -70555,7 +70555,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -70585,7 +70585,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -70617,7 +70617,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -70647,7 +70647,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -70679,7 +70679,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -70709,7 +70709,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -70741,7 +70741,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -70792,7 +70792,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -70822,7 +70822,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -70854,7 +70854,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -70884,7 +70884,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -70916,7 +70916,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -70946,7 +70946,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -70978,7 +70978,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -71008,7 +71008,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -71040,7 +71040,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -71070,7 +71070,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -71102,7 +71102,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -71132,7 +71132,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -71164,7 +71164,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -71194,7 +71194,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -71226,7 +71226,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -71256,7 +71256,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -71288,7 +71288,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -71318,7 +71318,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -71350,7 +71350,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -71380,7 +71380,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -71412,7 +71412,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -71442,7 +71442,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -71474,7 +71474,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -71536,7 +71536,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -71566,7 +71566,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -71598,7 +71598,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -71628,7 +71628,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -71660,7 +71660,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -71690,7 +71690,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -71722,7 +71722,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -71752,7 +71752,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -71784,7 +71784,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -71814,7 +71814,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -71846,7 +71846,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -71876,7 +71876,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -71908,7 +71908,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -71938,7 +71938,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -71970,7 +71970,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -72032,7 +72032,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -72094,7 +72094,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -72124,7 +72124,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -72156,7 +72156,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -72186,7 +72186,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -72218,7 +72218,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -72248,7 +72248,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -72280,7 +72280,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -72342,7 +72342,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -72404,7 +72404,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -72434,7 +72434,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -72466,7 +72466,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -72496,7 +72496,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -72528,7 +72528,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -72558,7 +72558,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -72590,7 +72590,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -72620,7 +72620,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -72652,7 +72652,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -72714,7 +72714,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -72744,7 +72744,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -72776,7 +72776,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -72806,7 +72806,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -72868,7 +72868,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -72898,7 +72898,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -72930,7 +72930,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } } ] @@ -72955,7 +72955,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -72985,7 +72985,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -73017,7 +73017,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -73047,7 +73047,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -73079,7 +73079,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -73109,7 +73109,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -73141,7 +73141,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -73171,7 +73171,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -73203,7 +73203,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -73233,7 +73233,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -73265,7 +73265,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -73295,7 +73295,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -73327,7 +73327,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -73389,7 +73389,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -73451,7 +73451,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -73481,7 +73481,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -73513,7 +73513,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -73543,7 +73543,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -73575,7 +73575,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -73605,7 +73605,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -73637,7 +73637,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -73667,7 +73667,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -73699,7 +73699,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -73729,7 +73729,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -73761,7 +73761,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -73791,7 +73791,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -73823,7 +73823,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -73853,7 +73853,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -73885,7 +73885,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -73915,7 +73915,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -73947,7 +73947,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -73977,7 +73977,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -74009,7 +74009,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -74018,7 +74018,7 @@ "-v", "--upload-results", "--browser=release_x64", - "--output-format=histograms" + "--output-format=chartjson" ], "isolate_name": "telemetry_perf_tests", "name": "dummy_benchmark.noisy_benchmark_1", @@ -74039,7 +74039,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -74048,7 +74048,7 @@ "-v", "--upload-results", "--browser=reference", - "--output-format=histograms", + "--output-format=chartjson", "--max-failures=5", "--output-trace-tag=_ref" ], @@ -74071,7 +74071,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -74080,7 +74080,7 @@ "-v", "--upload-results", "--browser=release_x64", - "--output-format=histograms" + "--output-format=chartjson" ], "isolate_name": "telemetry_perf_tests", "name": "dummy_benchmark.stable_benchmark_1", @@ -74101,7 +74101,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -74110,7 +74110,7 @@ "-v", "--upload-results", "--browser=reference", - "--output-format=histograms", + "--output-format=chartjson", "--max-failures=5", "--output-trace-tag=_ref" ], @@ -74133,7 +74133,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -74163,7 +74163,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 1200, - "upload_test_results": false + "upload_test_results": true } }, { @@ -74195,7 +74195,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 1200, - "upload_test_results": false + "upload_test_results": true } }, { @@ -74225,7 +74225,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -74257,7 +74257,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -74278,7 +74278,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -74338,7 +74338,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -74370,7 +74370,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -74400,7 +74400,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -74432,7 +74432,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -74453,7 +74453,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -74483,7 +74483,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -74515,7 +74515,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -74545,7 +74545,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -74577,7 +74577,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -74607,7 +74607,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -74639,7 +74639,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -74669,7 +74669,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -74701,7 +74701,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -74731,7 +74731,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -74763,7 +74763,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -74787,7 +74787,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -74817,7 +74817,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -74847,7 +74847,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -74879,7 +74879,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -74909,7 +74909,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -74941,7 +74941,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -74971,7 +74971,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -75003,7 +75003,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -75033,7 +75033,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -75065,7 +75065,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -75095,7 +75095,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -75127,7 +75127,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -75157,7 +75157,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -75189,7 +75189,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -75219,7 +75219,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -75251,7 +75251,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -75281,7 +75281,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -75313,7 +75313,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -75343,7 +75343,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -75375,7 +75375,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -75405,7 +75405,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -75437,7 +75437,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -75467,7 +75467,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -75499,7 +75499,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -75561,7 +75561,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -75591,7 +75591,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -75623,7 +75623,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -75653,7 +75653,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -75685,7 +75685,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -75715,7 +75715,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -75747,7 +75747,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -75777,7 +75777,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -75809,7 +75809,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -75839,7 +75839,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -75871,7 +75871,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -75901,7 +75901,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -75933,7 +75933,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -75963,7 +75963,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -75995,7 +75995,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -76057,7 +76057,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -76119,7 +76119,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -76149,7 +76149,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -76181,7 +76181,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -76211,7 +76211,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -76243,7 +76243,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -76273,7 +76273,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -76305,7 +76305,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -76367,7 +76367,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -76429,7 +76429,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -76459,7 +76459,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -76491,7 +76491,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -76521,7 +76521,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -76553,7 +76553,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -76583,7 +76583,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -76615,7 +76615,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -76645,7 +76645,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -76677,7 +76677,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -76739,7 +76739,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -76769,7 +76769,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -76801,7 +76801,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -76831,7 +76831,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -76893,7 +76893,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -76917,7 +76917,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -76947,7 +76947,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -76979,7 +76979,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } } ] @@ -77013,7 +77013,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -77045,7 +77045,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -77075,7 +77075,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -77107,7 +77107,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -77137,7 +77137,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -77169,7 +77169,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -77199,7 +77199,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -77231,7 +77231,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -77261,7 +77261,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -77293,7 +77293,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -77323,7 +77323,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -77355,7 +77355,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -77417,7 +77417,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -77479,7 +77479,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -77509,7 +77509,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -77541,7 +77541,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -77571,7 +77571,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -77603,7 +77603,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -77633,7 +77633,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -77665,7 +77665,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -77695,7 +77695,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -77727,7 +77727,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -77757,7 +77757,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -77789,7 +77789,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -77819,7 +77819,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -77851,7 +77851,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -77881,7 +77881,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -77913,7 +77913,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -77943,7 +77943,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -77975,7 +77975,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -78005,7 +78005,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -78037,7 +78037,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -78046,7 +78046,7 @@ "-v", "--upload-results", "--browser=release", - "--output-format=histograms" + "--output-format=chartjson" ], "isolate_name": "telemetry_perf_tests", "name": "dummy_benchmark.noisy_benchmark_1", @@ -78067,7 +78067,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -78076,7 +78076,7 @@ "-v", "--upload-results", "--browser=reference", - "--output-format=histograms", + "--output-format=chartjson", "--max-failures=5", "--output-trace-tag=_ref" ], @@ -78099,7 +78099,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -78108,7 +78108,7 @@ "-v", "--upload-results", "--browser=release", - "--output-format=histograms" + "--output-format=chartjson" ], "isolate_name": "telemetry_perf_tests", "name": "dummy_benchmark.stable_benchmark_1", @@ -78129,7 +78129,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -78138,7 +78138,7 @@ "-v", "--upload-results", "--browser=reference", - "--output-format=histograms", + "--output-format=chartjson", "--max-failures=5", "--output-trace-tag=_ref" ], @@ -78161,7 +78161,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -78191,7 +78191,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 1200, - "upload_test_results": false + "upload_test_results": true } }, { @@ -78223,7 +78223,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 1200, - "upload_test_results": false + "upload_test_results": true } }, { @@ -78253,7 +78253,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -78285,7 +78285,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -78306,7 +78306,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -78366,7 +78366,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -78398,7 +78398,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -78428,7 +78428,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -78460,7 +78460,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -78481,7 +78481,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -78511,7 +78511,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -78543,7 +78543,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -78573,7 +78573,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -78605,7 +78605,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -78635,7 +78635,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -78667,7 +78667,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -78697,7 +78697,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -78729,7 +78729,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -78759,7 +78759,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -78791,7 +78791,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -78821,7 +78821,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -78851,7 +78851,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -78883,7 +78883,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -78913,7 +78913,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -78945,7 +78945,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -78975,7 +78975,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -79007,7 +79007,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -79037,7 +79037,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -79069,7 +79069,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -79099,7 +79099,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -79131,7 +79131,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -79161,7 +79161,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -79193,7 +79193,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -79223,7 +79223,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -79255,7 +79255,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -79285,7 +79285,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -79317,7 +79317,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -79347,7 +79347,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -79379,7 +79379,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -79409,7 +79409,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -79441,7 +79441,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -79471,7 +79471,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -79503,7 +79503,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -79565,7 +79565,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -79595,7 +79595,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -79627,7 +79627,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -79657,7 +79657,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -79689,7 +79689,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -79719,7 +79719,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -79751,7 +79751,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -79781,7 +79781,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -79813,7 +79813,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -79843,7 +79843,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -79875,7 +79875,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -79905,7 +79905,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -79937,7 +79937,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -79967,7 +79967,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -79999,7 +79999,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -80061,7 +80061,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -80123,7 +80123,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -80153,7 +80153,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -80185,7 +80185,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -80215,7 +80215,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -80247,7 +80247,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -80277,7 +80277,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -80309,7 +80309,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -80371,7 +80371,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -80433,7 +80433,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -80463,7 +80463,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -80495,7 +80495,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -80525,7 +80525,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -80557,7 +80557,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -80587,7 +80587,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -80619,7 +80619,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -80649,7 +80649,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -80681,7 +80681,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -80743,7 +80743,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -80773,7 +80773,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -80805,7 +80805,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -80835,7 +80835,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -80897,7 +80897,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -80927,7 +80927,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -80959,7 +80959,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } } ] @@ -80993,7 +80993,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -81025,7 +81025,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -81055,7 +81055,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -81087,7 +81087,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -81117,7 +81117,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -81149,7 +81149,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -81179,7 +81179,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -81211,7 +81211,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -81241,7 +81241,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -81273,7 +81273,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -81303,7 +81303,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -81335,7 +81335,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -81397,7 +81397,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -81459,7 +81459,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -81489,7 +81489,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -81521,7 +81521,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -81551,7 +81551,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -81583,7 +81583,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -81613,7 +81613,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -81645,7 +81645,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -81675,7 +81675,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -81707,7 +81707,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -81737,7 +81737,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -81769,7 +81769,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -81799,7 +81799,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -81831,7 +81831,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -81861,7 +81861,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -81893,7 +81893,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -81923,7 +81923,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -81955,7 +81955,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -81985,7 +81985,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -82017,7 +82017,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -82026,7 +82026,7 @@ "-v", "--upload-results", "--browser=release_x64", - "--output-format=histograms" + "--output-format=chartjson" ], "isolate_name": "telemetry_perf_tests", "name": "dummy_benchmark.noisy_benchmark_1", @@ -82047,7 +82047,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -82056,7 +82056,7 @@ "-v", "--upload-results", "--browser=reference", - "--output-format=histograms", + "--output-format=chartjson", "--max-failures=5", "--output-trace-tag=_ref" ], @@ -82079,7 +82079,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -82088,7 +82088,7 @@ "-v", "--upload-results", "--browser=release_x64", - "--output-format=histograms" + "--output-format=chartjson" ], "isolate_name": "telemetry_perf_tests", "name": "dummy_benchmark.stable_benchmark_1", @@ -82109,7 +82109,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -82118,7 +82118,7 @@ "-v", "--upload-results", "--browser=reference", - "--output-format=histograms", + "--output-format=chartjson", "--max-failures=5", "--output-trace-tag=_ref" ], @@ -82141,7 +82141,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -82171,7 +82171,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 1200, - "upload_test_results": false + "upload_test_results": true } }, { @@ -82203,7 +82203,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 1200, - "upload_test_results": false + "upload_test_results": true } }, { @@ -82233,7 +82233,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -82265,7 +82265,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -82286,7 +82286,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -82346,7 +82346,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -82378,7 +82378,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -82408,7 +82408,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -82440,7 +82440,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -82470,7 +82470,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -82502,7 +82502,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -82532,7 +82532,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -82564,7 +82564,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -82594,7 +82594,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -82626,7 +82626,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -82656,7 +82656,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -82688,7 +82688,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -82718,7 +82718,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -82750,7 +82750,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -82801,7 +82801,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -82831,7 +82831,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -82863,7 +82863,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -82893,7 +82893,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -82925,7 +82925,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -82955,7 +82955,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -82987,7 +82987,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -83017,7 +83017,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -83049,7 +83049,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -83079,7 +83079,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -83111,7 +83111,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -83141,7 +83141,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -83173,7 +83173,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -83203,7 +83203,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -83235,7 +83235,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -83265,7 +83265,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -83297,7 +83297,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -83327,7 +83327,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -83359,7 +83359,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -83389,7 +83389,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -83421,7 +83421,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -83451,7 +83451,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -83483,7 +83483,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -83545,7 +83545,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -83575,7 +83575,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -83607,7 +83607,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -83637,7 +83637,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -83669,7 +83669,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -83699,7 +83699,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -83731,7 +83731,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -83761,7 +83761,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -83793,7 +83793,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -83823,7 +83823,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -83855,7 +83855,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -83885,7 +83885,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -83917,7 +83917,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -83947,7 +83947,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -83979,7 +83979,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -84041,7 +84041,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -84103,7 +84103,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -84133,7 +84133,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -84165,7 +84165,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -84195,7 +84195,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -84227,7 +84227,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -84257,7 +84257,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -84289,7 +84289,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -84351,7 +84351,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -84413,7 +84413,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -84443,7 +84443,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -84475,7 +84475,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -84505,7 +84505,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -84537,7 +84537,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -84567,7 +84567,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -84599,7 +84599,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -84629,7 +84629,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -84661,7 +84661,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -84723,7 +84723,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -84753,7 +84753,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -84785,7 +84785,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -84815,7 +84815,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -84877,7 +84877,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -84907,7 +84907,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -84939,7 +84939,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } } ] @@ -84973,7 +84973,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -85005,7 +85005,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -85035,7 +85035,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -85067,7 +85067,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -85097,7 +85097,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -85129,7 +85129,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -85159,7 +85159,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -85191,7 +85191,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -85221,7 +85221,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -85253,7 +85253,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -85283,7 +85283,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -85315,7 +85315,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -85377,7 +85377,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -85439,7 +85439,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -85469,7 +85469,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -85501,7 +85501,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -85531,7 +85531,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -85563,7 +85563,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -85593,7 +85593,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -85625,7 +85625,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -85655,7 +85655,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -85687,7 +85687,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -85717,7 +85717,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -85749,7 +85749,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -85779,7 +85779,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -85811,7 +85811,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -85841,7 +85841,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -85873,7 +85873,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -85903,7 +85903,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -85935,7 +85935,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -85965,7 +85965,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -85997,7 +85997,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -86006,7 +86006,7 @@ "-v", "--upload-results", "--browser=release_x64", - "--output-format=histograms" + "--output-format=chartjson" ], "isolate_name": "telemetry_perf_tests", "name": "dummy_benchmark.noisy_benchmark_1", @@ -86027,7 +86027,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -86036,7 +86036,7 @@ "-v", "--upload-results", "--browser=reference", - "--output-format=histograms", + "--output-format=chartjson", "--max-failures=5", "--output-trace-tag=_ref" ], @@ -86059,7 +86059,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -86068,7 +86068,7 @@ "-v", "--upload-results", "--browser=release_x64", - "--output-format=histograms" + "--output-format=chartjson" ], "isolate_name": "telemetry_perf_tests", "name": "dummy_benchmark.stable_benchmark_1", @@ -86089,7 +86089,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -86098,7 +86098,7 @@ "-v", "--upload-results", "--browser=reference", - "--output-format=histograms", + "--output-format=chartjson", "--max-failures=5", "--output-trace-tag=_ref" ], @@ -86121,7 +86121,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -86151,7 +86151,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 1200, - "upload_test_results": false + "upload_test_results": true } }, { @@ -86183,7 +86183,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 1200, - "upload_test_results": false + "upload_test_results": true } }, { @@ -86213,7 +86213,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -86245,7 +86245,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -86266,7 +86266,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -86326,7 +86326,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -86358,7 +86358,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -86388,7 +86388,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -86420,7 +86420,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -86441,7 +86441,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -86471,7 +86471,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -86503,7 +86503,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -86533,7 +86533,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -86565,7 +86565,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -86595,7 +86595,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -86627,7 +86627,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -86657,7 +86657,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -86689,7 +86689,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -86719,7 +86719,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -86751,7 +86751,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -86802,7 +86802,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -86832,7 +86832,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -86864,7 +86864,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -86894,7 +86894,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -86926,7 +86926,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -86956,7 +86956,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -86988,7 +86988,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -87018,7 +87018,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -87050,7 +87050,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -87080,7 +87080,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -87112,7 +87112,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -87142,7 +87142,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -87174,7 +87174,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -87204,7 +87204,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -87236,7 +87236,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -87266,7 +87266,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -87298,7 +87298,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -87328,7 +87328,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -87360,7 +87360,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -87390,7 +87390,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -87422,7 +87422,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -87452,7 +87452,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -87484,7 +87484,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -87546,7 +87546,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -87576,7 +87576,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -87608,7 +87608,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -87638,7 +87638,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -87670,7 +87670,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -87700,7 +87700,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -87732,7 +87732,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -87762,7 +87762,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -87794,7 +87794,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -87824,7 +87824,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -87856,7 +87856,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -87886,7 +87886,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -87918,7 +87918,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -87948,7 +87948,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -87980,7 +87980,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -88042,7 +88042,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -88104,7 +88104,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -88134,7 +88134,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -88166,7 +88166,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -88196,7 +88196,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -88228,7 +88228,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -88258,7 +88258,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -88290,7 +88290,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -88352,7 +88352,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -88414,7 +88414,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -88444,7 +88444,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -88476,7 +88476,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -88506,7 +88506,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -88538,7 +88538,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -88568,7 +88568,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -88600,7 +88600,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -88630,7 +88630,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -88662,7 +88662,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -88724,7 +88724,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -88754,7 +88754,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -88786,7 +88786,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -88816,7 +88816,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -88878,7 +88878,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -88908,7 +88908,7 @@ "hard_timeout": 10800, "ignore_task_failure": false, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } }, { @@ -88940,7 +88940,7 @@ "hard_timeout": 10800, "ignore_task_failure": true, "io_timeout": 600, - "upload_test_results": false + "upload_test_results": true } } ]
diff --git a/third_party/WebKit/LayoutTests/TestExpectations b/third_party/WebKit/LayoutTests/TestExpectations index b5fc9b5..3c575280 100644 --- a/third_party/WebKit/LayoutTests/TestExpectations +++ b/third_party/WebKit/LayoutTests/TestExpectations
@@ -308,12 +308,6 @@ crbug.com/635619 virtual/layout_ng/external/wpt/css/CSS2/floats/floats-wrap-bfc-003-right-overflow.xht [ Failure ] crbug.com/635619 virtual/layout_ng/external/wpt/css/CSS2/floats/floats-wrap-bfc-004.xht [ Failure ] crbug.com/635619 virtual/layout_ng/external/wpt/css/CSS2/floats/floats-wrap-bfc-006.xht [ Failure ] -crbug.com/635619 virtual/layout_ng/external/wpt/css/CSS2/floats/floats-wrap-top-below-inline-001l.xht [ Failure ] -crbug.com/635619 virtual/layout_ng/external/wpt/css/CSS2/floats/floats-wrap-top-below-inline-001r.xht [ Failure ] -crbug.com/635619 virtual/layout_ng/external/wpt/css/CSS2/floats/floats-wrap-top-below-inline-002l.xht [ Failure ] -crbug.com/635619 virtual/layout_ng/external/wpt/css/CSS2/floats/floats-wrap-top-below-inline-002r.xht [ Failure ] -crbug.com/635619 virtual/layout_ng/external/wpt/css/CSS2/floats/floats-wrap-top-below-inline-003l.xht [ Failure ] -crbug.com/635619 virtual/layout_ng/external/wpt/css/CSS2/floats/floats-wrap-top-below-inline-003r.xht [ Failure ] crbug.com/723135 virtual/layout_ng/external/wpt/css/CSS2/floats/floats-zero-height-wrap-001.xht [ Failure ] crbug.com/723135 virtual/layout_ng/external/wpt/css/CSS2/floats/floats-zero-height-wrap-002.xht [ Failure ] @@ -500,17 +494,9 @@ crbug.com/635619 virtual/layout_ng/fast/block/float/floats-and-text-indent-rl.html [ Failure ] crbug.com/635619 virtual/layout_ng/fast/block/float/floats-and-text-indent.html [ Failure ] crbug.com/635619 virtual/layout_ng/fast/block/float/floats-do-not-overhang-from-block-formatting-context.html [ Failure ] -crbug.com/635619 virtual/layout_ng/fast/block/float/floats-offset-image-quirk-line-height.html [ Failure ] -crbug.com/635619 virtual/layout_ng/fast/block/float/floats-offset-image-quirk.html [ Failure ] crbug.com/635619 virtual/layout_ng/fast/block/float/floats-offset-image-strict-line-height.html [ Failure ] -crbug.com/635619 virtual/layout_ng/fast/block/float/floats-offset-image-strict.html [ Failure ] -crbug.com/635619 virtual/layout_ng/fast/block/float/floats-offset-inline-block-quirk-line-height.html [ Failure ] crbug.com/635619 virtual/layout_ng/fast/block/float/floats-offset-inline-block-strict-line-height.html [ Failure ] crbug.com/635619 virtual/layout_ng/fast/block/float/floats-with-margin-should-not-wrap.html [ Failure ] -crbug.com/635619 virtual/layout_ng/fast/block/float/floats-wrap-inside-inline-001.htm [ Failure ] -crbug.com/635619 virtual/layout_ng/fast/block/float/floats-wrap-inside-inline-002.htm [ Failure ] -crbug.com/635619 virtual/layout_ng/fast/block/float/floats-wrap-inside-inline-003.htm [ Failure ] -crbug.com/635619 virtual/layout_ng/fast/block/float/floats-wrap-inside-inline-004.htm [ Failure ] crbug.com/635619 virtual/layout_ng/fast/block/float/independent-align-positioning.html [ Failure ] crbug.com/635619 [ Mac ] virtual/layout_ng/fast/block/float/intruding-painted-twice.html [ Failure ] crbug.com/635619 virtual/layout_ng/fast/block/float/line-break-after-white-space-crash.html [ Pass Crash Timeout ]
diff --git a/third_party/WebKit/LayoutTests/fast/canvas/OffscreenCanvas-commit-copyImage.html b/third_party/WebKit/LayoutTests/fast/canvas/OffscreenCanvas-commit-copyImage.html new file mode 100644 index 0000000..b867010 --- /dev/null +++ b/third_party/WebKit/LayoutTests/fast/canvas/OffscreenCanvas-commit-copyImage.html
@@ -0,0 +1,75 @@ +<html> +<body><canvas id="myCanvas" width="256" height="256"></canvas> + <div id="log"></div> +</body> +<script src="../../resources/testharness.js"></script> +<script src="../../resources/testharnessreport.js"></script> +<script> + +var t = async_test("CopyImageOnTransferredCanvas"); + +function main() { + assert_true(!!window.testRunner, "This test requires window.testRunner."); + + if (window.testRunner) { + initTest(); + } else { + t.done(); + } +} + +function initTest() { + var canv = document.getElementById("myCanvas"); + var off = canv.transferControlToOffscreen(); + var ctx = off.getContext("2d"); + + ctx.fillStyle = "#f00"; + ctx.fillRect(0, 0, 128, 128); + ctx.fillStyle = "#0f0"; + ctx.fillRect(128, 0, 128, 128); + ctx.fillStyle = "#00f"; + ctx.fillRect(0, 128, 128, 128); + ctx.fillStyle = "#ff0"; + ctx.fillRect(128, 128, 128, 128); + + + ctx.commit().then(runTest); +} + +function copyImage() { + testRunner.copyImageAtAndCapturePixelsAsyncThen(100, 100, completionCallback); +} + +function runTest() { + // We need setTimeout as a frame barrier for the image frame to be + // propagated to the placeholder canvas. + setTimeout(copyImage, 0); +} + +function completionCallback(width, height, snapshot) { + t.step(function() { + assert_equals(width, 256, "The copied image has a width of 256."); + assert_equals(height, 256, "The copied image has a height of 256."); + + var data = new Uint8Array(snapshot); + + var pixelLeftTop = data.subarray(0, 4); + assert_array_equals(pixelLeftTop, [255, 0, 0, 255], "The copied image's top left is red"); + + var pixelRightTop = data.subarray(4 * 128, 4* 128 + 4); + assert_array_equals(pixelRightTop, [0, 255, 0, 255], "The copied image's top right is green"); + + var pixelLeftBottom = data.subarray(4 * 256 * 128, 4 * 256 * 128 + 4); + assert_array_equals(pixelLeftBottom, [0, 0, 255, 255], "The copied image's bottom left is blue"); + + var rightBottomPixelPosition = 4 * 256 * 128 + 4 * 128; + var pixelRightBottom = data.subarray(rightBottomPixelPosition, rightBottomPixelPosition + 4); + assert_array_equals(pixelRightBottom, [255, 255, 0, 255], "The copied image's bottom right is yellow"); + + }); + t.done(); +} + +main(); + </script> +</html>
diff --git a/third_party/WebKit/LayoutTests/http/tests/devtools/components/file-path-scoring.html b/third_party/WebKit/LayoutTests/http/tests/devtools/components/file-path-scoring.html index 1916b975..d7b28e84 100644 --- a/third_party/WebKit/LayoutTests/http/tests/devtools/components/file-path-scoring.html +++ b/third_party/WebKit/LayoutTests/http/tests/devtools/components/file-path-scoring.html
@@ -40,7 +40,7 @@ var scorer = new Sources.FilePathScoreFunction(query); var bestScore = -1; var bestIndex = -1; - var filter = QuickOpen.FilteredListWidget.filterRegex(query); + var filter = String.filterRegex(query); for (var i = 0; i < paths.length; ++i) { if (!filter.test(paths[i])) continue;
diff --git a/third_party/WebKit/LayoutTests/http/tests/devtools/service-workers/service-workers-view-expected.txt b/third_party/WebKit/LayoutTests/http/tests/devtools/service-workers/service-workers-view-expected.txt index 989f2ef9..82ab15c1 100644 --- a/third_party/WebKit/LayoutTests/http/tests/devtools/service-workers/service-workers-view-expected.txt +++ b/third_party/WebKit/LayoutTests/http/tests/devtools/service-workers/service-workers-view-expected.txt
@@ -90,7 +90,6 @@ #N is redundant Clients Push -xxxxxxxxxx Test
diff --git a/third_party/WebKit/Source/core/html/HTMLCanvasElement.cpp b/third_party/WebKit/Source/core/html/HTMLCanvasElement.cpp index 80512df..103bdcf 100644 --- a/third_party/WebKit/Source/core/html/HTMLCanvasElement.cpp +++ b/third_party/WebKit/Source/core/html/HTMLCanvasElement.cpp
@@ -1194,8 +1194,12 @@ SourceDrawingBuffer source_buffer, AccelerationHint hint, SnapshotReason snapshot_reason) { + if (SurfaceLayerBridge()) + return PlaceholderFrame(); + if (!IsPaintable()) return nullptr; + if (!context_) return CreateTransparentImage(Size());
diff --git a/third_party/WebKit/Source/core/inspector/InspectorDOMSnapshotAgent.cpp b/third_party/WebKit/Source/core/inspector/InspectorDOMSnapshotAgent.cpp index c89be50..945e4c6 100644 --- a/third_party/WebKit/Source/core/inspector/InspectorDOMSnapshotAgent.cpp +++ b/third_party/WebKit/Source/core/inspector/InspectorDOMSnapshotAgent.cpp
@@ -323,9 +323,9 @@ LayoutText* layout_text = ToLayoutText(layout_object); layout_tree_node->setLayoutText(layout_text->GetText()); if (layout_text->HasTextBoxes()) { - std::unique_ptr<protocol::Array<protocol::CSS::InlineTextBox>> + std::unique_ptr<protocol::Array<protocol::DOMSnapshot::InlineTextBox>> inline_text_nodes = - protocol::Array<protocol::CSS::InlineTextBox>::create(); + protocol::Array<protocol::DOMSnapshot::InlineTextBox>::create(); for (const InlineTextBox* text_box = layout_text->FirstTextBox(); text_box; text_box = text_box->NextTextBox()) { FloatRect local_coords_text_box_rect(text_box->FrameRect()); @@ -333,7 +333,7 @@ layout_object->LocalToAbsoluteQuad(local_coords_text_box_rect) .BoundingBox(); inline_text_nodes->addItem( - protocol::CSS::InlineTextBox::create() + protocol::DOMSnapshot::InlineTextBox::create() .setStartCharacterIndex(text_box->Start()) .setNumCharacters(text_box->Len()) .setBoundingBox(
diff --git a/third_party/WebKit/Source/core/inspector/browser_protocol.json b/third_party/WebKit/Source/core/inspector/browser_protocol.json index c53133a..047ab977 100644 --- a/third_party/WebKit/Source/core/inspector/browser_protocol.json +++ b/third_party/WebKit/Source/core/inspector/browser_protocol.json
@@ -69,7 +69,6 @@ }, { "domain": "Performance", - "experimental": true, "types": [ { "id": "Metric", @@ -178,14 +177,12 @@ { "id": "ScriptIdentifier", "type": "string", - "description": "Unique script identifier.", - "experimental": true + "description": "Unique script identifier." }, { "id": "TransitionType", "type": "string", "description": "Transition type.", - "experimental": true, "enum": ["link", "typed", "auto_bookmark", "auto_subframe", "manual_subframe", "generated", "auto_toplevel", "form_submit", "reload", "keyword", "keyword_generated", "other"] }, { @@ -198,8 +195,7 @@ { "name": "userTypedURL", "type": "string", "description": "URL that the user typed in the url bar." }, { "name": "title", "type": "string", "description": "Title of the navigation history entry." }, { "name": "transitionType", "$ref": "TransitionType", "description": "Transition type." } - ], - "experimental": true + ] }, { "id": "ScreencastFrameMetadata", @@ -220,8 +216,7 @@ "id": "DialogType", "description": "Javascript dialog type.", "type": "string", - "enum": ["alert", "confirm", "prompt", "beforeunload"], - "experimental": true + "enum": ["alert", "confirm", "prompt", "beforeunload"] }, { "id": "AppManifestError", @@ -232,21 +227,12 @@ { "name": "critical", "type": "integer", "description": "If criticial, this is a non-recoverable parse error." }, { "name": "line", "type": "integer", "description": "Error line." }, { "name": "column", "type": "integer", "description": "Error column." } - ], - "experimental": true - }, - { - "id": "NavigationResponse", - "description": "Proceed: allow the navigation; Cancel: cancel the navigation; CancelAndIgnore: cancels the navigation and makes the requester of the navigation acts like the request was never made.", - "type": "string", - "enum": ["Proceed", "Cancel", "CancelAndIgnore"], - "experimental": true + ] }, { "id": "LayoutViewport", "type": "object", "description": "Layout viewport position and dimensions.", - "experimental": true, "properties": [ { "name": "pageX", "type": "integer", "description": "Horizontal offset relative to the document (CSS pixels)." }, { "name": "pageY", "type": "integer", "description": "Vertical offset relative to the document (CSS pixels)." }, @@ -258,7 +244,6 @@ "id": "VisualViewport", "type": "object", "description": "Visual viewport position, dimensions, and scale.", - "experimental": true, "properties": [ { "name": "offsetX", "type": "number", "description": "Horizontal offset relative to the layout viewport (CSS pixels)." }, { "name": "offsetY", "type": "number", "description": "Vertical offset relative to the layout viewport (CSS pixels)." }, @@ -273,7 +258,6 @@ "id": "Viewport", "type": "object", "description": "Viewport for capturing screenshot.", - "experimental": true, "properties": [ { "name": "x", "type": "number", "description": "X offset in CSS pixels." }, { "name": "y", "type": "number", "description": "Y offset in CSS pixels" }, @@ -321,16 +305,14 @@ "returns": [ { "name": "identifier", "$ref": "ScriptIdentifier", "description": "Identifier of the added script." } ], - "description": "Evaluates given script in every frame upon creation (before loading frame's scripts).", - "experimental": true + "description": "Evaluates given script in every frame upon creation (before loading frame's scripts)." }, { "name": "removeScriptToEvaluateOnNewDocument", "parameters": [ { "name": "identifier", "$ref": "ScriptIdentifier" } ], - "description": "Removes given script from the list.", - "experimental": true + "description": "Removes given script from the list." }, { "name": "setAutoAttachToCreatedPages", @@ -348,30 +330,29 @@ ], "description": "Reloads given page optionally ignoring the cache." }, - { + { "name": "setAdBlockingEnabled", "description": "Enable Chrome's experimental ad filter on all sites.", "parameters": [ { "name": "enabled", "type": "boolean", "description": "Whether to block ads." } ], - "experimental": true - }, + "experimental": true + }, { "name": "navigate", "parameters": [ { "name": "url", "type": "string", "description": "URL to navigate the page to." }, - { "name": "referrer", "type": "string", "optional": true, "experimental": true, "description": "Referrer URL." }, - { "name": "transitionType", "$ref": "TransitionType", "optional": true, "experimental": true, "description": "Intended transition type." } + { "name": "referrer", "type": "string", "optional": true, "description": "Referrer URL." }, + { "name": "transitionType", "$ref": "TransitionType", "optional": true, "description": "Intended transition type." } ], "returns": [ - { "name": "frameId", "$ref": "FrameId", "experimental": true, "description": "Frame id that will be navigated." } + { "name": "frameId", "$ref": "FrameId", "description": "Frame id that will be navigated." } ], "description": "Navigates current page to the given URL." }, { "name": "stopLoading", - "description": "Force the page stop all navigations and pending resource fetches.", - "experimental": true + "description": "Force the page stop all navigations and pending resource fetches." }, { "name": "getNavigationHistory", @@ -379,16 +360,14 @@ { "name": "currentIndex", "type": "integer", "description": "Index of the current navigation history entry." }, { "name": "entries", "type": "array", "items": { "$ref": "NavigationEntry" }, "description": "Array of navigation history entries." } ], - "description": "Returns navigation history for the current page.", - "experimental": true + "description": "Returns navigation history for the current page." }, { "name": "navigateToHistoryEntry", "parameters": [ { "name": "entryId", "type": "integer", "description": "Unique id of the entry to navigate to." } ], - "description": "Navigates current page to the given history entry.", - "experimental": true + "description": "Navigates current page to the given history entry." }, { "name": "getCookies", @@ -396,6 +375,7 @@ { "name": "cookies", "type": "array", "items": { "$ref": "Network.Cookie" }, "description": "Array of cookie objects." } ], "description": "Returns all browser cookies. Depending on the backend support, will return detailed cookie information in the <code>cookies</code> field.", + "deprecated": true, "experimental": true, "redirect": "Network" }, @@ -406,6 +386,7 @@ { "name": "url", "type": "string", "description": "URL to match cooke domain and path." } ], "description": "Deletes browser cookie with given name, domain and path.", + "deprecated": true, "experimental": true, "redirect": "Network" }, @@ -478,13 +459,15 @@ { "name": "screenOrientation", "$ref": "Emulation.ScreenOrientation", "optional": true, "description": "Screen orientation override." }, { "name": "viewport", "$ref": "Viewport", "optional": true, "description": "The viewport dimensions and scale. If not set, the override is cleared." } ], - "redirect": "Emulation", - "experimental": true + "experimental": true, + "deprecated": true, + "redirect": "Emulation" }, { "name": "clearDeviceMetricsOverride", "description": "Clears the overriden device metrics.", "redirect": "Emulation", + "deprecated": true, "experimental": true }, { @@ -495,12 +478,14 @@ { "name": "longitude", "type": "number", "optional": true, "description": "Mock longitude"}, { "name": "accuracy", "type": "number", "optional": true, "description": "Mock accuracy"} ], - "redirect": "Emulation" + "redirect": "Emulation", + "deprecated": true }, { "name": "clearGeolocationOverride", "description": "Clears the overriden Geolocation Position and Error.", - "redirect": "Emulation" + "redirect": "Emulation", + "deprecated": true }, { "name": "setDeviceOrientationOverride", @@ -511,12 +496,14 @@ { "name": "gamma", "type": "number", "description": "Mock gamma"} ], "redirect": "DeviceOrientation", + "deprecated": true, "experimental": true }, { "name": "clearDeviceOrientationOverride", "description": "Clears the overridden Device Orientation.", "redirect": "DeviceOrientation", + "deprecated": true, "experimental": true }, { @@ -527,6 +514,7 @@ ], "description": "Toggles mouse event-based touch event emulation.", "experimental": true, + "deprecated": true, "redirect": "Emulation" }, { @@ -535,13 +523,12 @@ "parameters": [ { "name": "format", "type": "string", "optional": true, "enum": ["jpeg", "png"], "description": "Image compression format (defaults to png)." }, { "name": "quality", "type": "integer", "optional": true, "description": "Compression quality from range [0..100] (jpeg only)." }, - { "name": "clip", "$ref": "Viewport", "optional": true, "description": "Capture the screenshot of a given region only.", "experimental": true }, + { "name": "clip", "$ref": "Viewport", "optional": true, "description": "Capture the screenshot of a given region only." }, { "name": "fromSurface", "type": "boolean", "optional": true, "description": "Capture the screenshot from the surface, rather than the view. Defaults to true.", "experimental": true } ], "returns": [ { "name": "data", "type": "string", "description": "Base64-encoded image data." } - ], - "experimental": true + ] }, { "name": "printToPDF", @@ -562,8 +549,7 @@ ], "returns": [ { "name": "data", "type": "string", "description": "Base64-encoded pdf data." } - ], - "experimental": true + ] }, { "name": "startScreencast", @@ -600,7 +586,6 @@ }, { "name": "getAppManifest", - "experimental": true, "returns": [ { "name": "url", "type": "string", "description": "Manifest location." }, { "name": "errors", "type": "array", "items": { "$ref": "AppManifestError" } }, @@ -614,7 +599,6 @@ { "name": "getLayoutMetrics", "description": "Returns metrics relating to the layouting of the page, such as viewport bounds/scale.", - "experimental": true, "returns": [ { "name": "layoutViewport", "$ref": "LayoutViewport", "description": "Metrics relating to the layout viewport." }, { "name": "visualViewport", "$ref": "VisualViewport", "description": "Metrics relating to the visual viewport." }, @@ -624,7 +608,6 @@ { "name": "createIsolatedWorld", "description": "Creates an isolated world for the given frame.", - "experimental": true, "parameters": [ { "name": "frameId", "$ref": "FrameId", "description": "Id of the frame in which the isolated world should be created." }, { "name": "worldName", "type": "string", "optional": true, "description": "An optional name which is reported in the Execution Context." }, @@ -676,7 +659,7 @@ "parameters": [ { "name": "frameId", "$ref": "FrameId", "description": "Id of the frame that has been attached." }, { "name": "parentFrameId", "$ref": "FrameId", "description": "Parent frame identifier." }, - { "name": "stack", "$ref": "Runtime.StackTrace", "optional": true, "description": "JavaScript stack trace of when frame was attached, only set if frame initiated from script.", "experimental": true } + { "name": "stack", "$ref": "Runtime.StackTrace", "optional": true, "description": "JavaScript stack trace of when frame was attached, only set if frame initiated from script." } ] }, { @@ -715,8 +698,8 @@ "parameters": [ { "name": "frameId", "$ref": "FrameId", "description": "Id of the frame that has scheduled a navigation." }, { "name": "delay", "type": "number", "description": "Delay (in seconds) until the navigation is scheduled to begin. The navigation is not guaranteed to start." }, - { "name": "reason", "type": "string", "experimental": true, "enum": ["formSubmissionGet", "formSubmissionPost", "httpHeaderRefresh", "scriptInitiated", "metaTagRefresh", "pageBlockInterstitial", "reload"], "description": "The reason for the navigation." }, - { "name": "url", "type": "string", "experimental": true, "description": "The destination URL for the scheduled navigation." } + { "name": "reason", "type": "string", "enum": ["formSubmissionGet", "formSubmissionPost", "httpHeaderRefresh", "scriptInitiated", "metaTagRefresh", "pageBlockInterstitial", "reload"], "description": "The reason for the navigation." }, + { "name": "url", "type": "string", "description": "The destination URL for the scheduled navigation." } ], "experimental": true }, @@ -784,8 +767,7 @@ { "name": "windowName", "type": "string", "description": "Window name passed to window.open()."}, { "name": "windowFeatures", "type": "string", "description": "Window features passed to window.open()."}, { "name": "userGesture", "type": "boolean", "description": "Whether or not window.open() was triggered by user gesture."} - ], - "experimental": true + ] } ] }, @@ -1043,7 +1025,6 @@ { "name": "setScriptExecutionDisabled", "description": "Switches script execution in the page.", - "experimental": true, "parameters": [ { "name": "value", "type": "boolean", "description": "Whether script execution should be disabled in the page." } ] @@ -1051,7 +1032,6 @@ { "name": "setGeolocationOverride", "description": "Overrides the Geolocation Position or Error. Omitting any of the parameters emulates position unavailable.", - "experimental": true, "parameters": [ { "name": "latitude", "type": "number", "optional": true, "description": "Mock latitude"}, { "name": "longitude", "type": "number", "optional": true, "description": "Mock longitude"}, @@ -1060,8 +1040,7 @@ }, { "name": "clearGeolocationOverride", - "description": "Clears the overriden Geolocation Position and Error.", - "experimental": true + "description": "Clears the overriden Geolocation Position and Error." }, { "name": "setTouchEmulationEnabled", @@ -1099,8 +1078,7 @@ "description": "Tells whether emulation is supported.", "returns": [ { "name": "result", "type": "boolean", "description": "True if emulation is supported." } - ], - "experimental": true + ] }, { "name": "setVirtualTimePolicy", @@ -1125,8 +1103,7 @@ "description": "Sets or clears an override of the default background color of the frame. This override is used if the content does not specify one.", "parameters": [ { "name": "color", "$ref": "DOM.RGBA", "optional": true, "description": "RGBA of the default background color. If not specified, any existing override will be cleared." } - ], - "experimental": true + ] } ], "events": [ @@ -1156,7 +1133,6 @@ { "domain": "Security", "description": "Security", - "experimental": true, "types": [ { "id": "CertificateId", @@ -1414,8 +1390,7 @@ "id": "BlockedReason", "type": "string", "description": "The reason why request was blocked.", - "enum": ["csp", "mixed-content", "origin", "inspector", "subresource-filter", "other"], - "experimental": true + "enum": ["csp", "mixed-content", "origin", "inspector", "subresource-filter", "other"] }, { "id": "Response", @@ -1432,8 +1407,8 @@ { "name": "requestHeadersText", "type": "string", "optional": true, "description": "HTTP request headers text." }, { "name": "connectionReused", "type": "boolean", "description": "Specifies whether physical connection was actually reused for this request." }, { "name": "connectionId", "type": "number", "description": "Physical connection id that was actually used for this request." }, - { "name": "remoteIPAddress", "type": "string", "optional": true, "experimental": true, "description": "Remote IP address." }, - { "name": "remotePort", "type": "integer", "optional": true, "experimental": true, "description": "Remote port."}, + { "name": "remoteIPAddress", "type": "string", "optional": true, "description": "Remote IP address." }, + { "name": "remotePort", "type": "integer", "optional": true, "description": "Remote port."}, { "name": "fromDiskCache", "type": "boolean", "optional": true, "description": "Specifies that the request was served from the disk cache." }, { "name": "fromServiceWorker", "type": "boolean", "optional": true, "description": "Specifies that the request was served from the ServiceWorker." }, { "name": "encodedDataLength", "type": "number", "optional": false, "description": "Total number of bytes received for this request so far." }, @@ -1447,7 +1422,6 @@ "id": "WebSocketRequest", "type": "object", "description": "WebSocket request data.", - "experimental": true, "properties": [ { "name": "headers", "$ref": "Headers", "description": "HTTP request headers." } ] @@ -1456,7 +1430,6 @@ "id": "WebSocketResponse", "type": "object", "description": "WebSocket response data.", - "experimental": true, "properties": [ { "name": "status", "type": "integer", "description": "HTTP response status code." }, { "name": "statusText", "type": "string", "description": "HTTP response status text." }, @@ -1470,7 +1443,6 @@ "id": "WebSocketFrame", "type": "object", "description": "WebSocket frame data.", - "experimental": true, "properties": [ { "name": "opcode", "type": "number", "description": "WebSocket frame opcode." }, { "name": "mask", "type": "boolean", "description": "WebSocke frame mask." }, @@ -1514,8 +1486,7 @@ { "name": "secure", "type": "boolean", "description": "True if cookie is secure." }, { "name": "session", "type": "boolean", "description": "True in case of session cookie." }, { "name": "sameSite", "$ref": "CookieSameSite", "optional": true, "description": "Cookie SameSite type." } - ], - "experimental": true + ] }, { "id": "CookieParam", @@ -1531,8 +1502,7 @@ { "name": "httpOnly", "type": "boolean", "optional": true, "description": "True if cookie is http-only." }, { "name": "sameSite", "$ref": "CookieSameSite", "optional": true, "description": "Cookie SameSite type." }, { "name": "expires", "$ref": "TimeSinceEpoch", "optional": true, "description": "Cookie expiration date, session cookie if not set" } - ], - "experimental": true + ] }, { "id": "AuthChallenge", @@ -1652,16 +1622,14 @@ "returns": [ { "name": "cookies", "type": "array", "items": { "$ref": "Cookie" }, "description": "Array of cookie objects." } ], - "description": "Returns all browser cookies for the current URL. Depending on the backend support, will return detailed cookie information in the <code>cookies</code> field.", - "experimental": true + "description": "Returns all browser cookies for the current URL. Depending on the backend support, will return detailed cookie information in the <code>cookies</code> field." }, { "name": "getAllCookies", "returns": [ { "name": "cookies", "type": "array", "items": { "$ref": "Cookie" }, "description": "Array of cookie objects." } ], - "description": "Returns all browser cookies. Depending on the backend support, will return detailed cookie information in the <code>cookies</code> field.", - "experimental": true + "description": "Returns all browser cookies. Depending on the backend support, will return detailed cookie information in the <code>cookies</code> field." }, { "name": "deleteCookies", @@ -1671,8 +1639,7 @@ { "name": "domain", "type": "string", "optional": true, "description": "If specified, deletes only cookies with the exact domain." }, { "name": "path", "type": "string", "optional": true, "description": "If specified, deletes only cookies with the exact path." } ], - "description": "Deletes browser cookies with matching name and url or domain/path pair.", - "experimental": true + "description": "Deletes browser cookies with matching name and url or domain/path pair." }, { "name": "setCookie", @@ -1690,24 +1657,21 @@ "returns": [ { "name": "success", "type": "boolean", "description": "True if successfully set cookie." } ], - "description": "Sets a cookie with the given cookie data; may overwrite equivalent cookies if they exist.", - "experimental": true + "description": "Sets a cookie with the given cookie data; may overwrite equivalent cookies if they exist." }, { "name": "setCookies", "parameters": [ { "name": "cookies", "type": "array", "items": { "$ref": "CookieParam" }, "description": "Cookies to be set." } ], - "description": "Sets given cookies.", - "experimental": true + "description": "Sets given cookies." }, { "name": "canEmulateNetworkConditions", "description": "Tells whether emulation of network conditions is supported.", "returns": [ { "name": "result", "type": "boolean", "description": "True if emulation of network conditions is supported." } - ], - "experimental": true + ] }, { "name": "emulateNetworkConditions", @@ -1799,11 +1763,11 @@ { "name": "documentURL", "type": "string", "description": "URL of the document this request is loaded for." }, { "name": "request", "$ref": "Request", "description": "Request data." }, { "name": "timestamp", "$ref": "MonotonicTime", "description": "Timestamp." }, - { "name": "wallTime", "$ref": "TimeSinceEpoch", "experimental": true, "description": "Timestamp." }, + { "name": "wallTime", "$ref": "TimeSinceEpoch", "description": "Timestamp." }, { "name": "initiator", "$ref": "Initiator", "description": "Request initiator." }, { "name": "redirectResponse", "optional": true, "$ref": "Response", "description": "Redirect response data." }, - { "name": "type", "$ref": "Page.ResourceType", "optional": true, "experimental": true, "description": "Type of this resource." }, - { "name": "frameId", "optional": true, "$ref": "Page.FrameId", "description": "Frame identifier.", "experimental": true } + { "name": "type", "$ref": "Page.ResourceType", "optional": true, "description": "Type of this resource." }, + { "name": "frameId", "optional": true, "$ref": "Page.FrameId", "description": "Frame identifier." } ] }, { @@ -1822,7 +1786,7 @@ { "name": "timestamp", "$ref": "MonotonicTime", "description": "Timestamp." }, { "name": "type", "$ref": "Page.ResourceType", "description": "Resource type." }, { "name": "response", "$ref": "Response", "description": "Response data." }, - { "name": "frameId", "optional": true, "$ref": "Page.FrameId", "description": "Frame identifier.", "experimental": true } + { "name": "frameId", "optional": true, "$ref": "Page.FrameId", "description": "Frame identifier." } ] }, { @@ -1853,7 +1817,7 @@ { "name": "type", "$ref": "Page.ResourceType", "description": "Resource type." }, { "name": "errorText", "type": "string", "description": "User friendly error message." }, { "name": "canceled", "type": "boolean", "optional": true, "description": "True if loading was canceled." }, - { "name": "blockedReason", "$ref": "BlockedReason", "optional": true, "description": "The reason why loading was blocked, if any.", "experimental": true } + { "name": "blockedReason", "$ref": "BlockedReason", "optional": true, "description": "The reason why loading was blocked, if any." } ] }, { @@ -1862,10 +1826,9 @@ "parameters": [ { "name": "requestId", "$ref": "RequestId", "description": "Request identifier." }, { "name": "timestamp", "$ref": "MonotonicTime", "description": "Timestamp." }, - { "name": "wallTime", "$ref": "TimeSinceEpoch", "experimental": true, "description": "UTC Timestamp." }, + { "name": "wallTime", "$ref": "TimeSinceEpoch", "description": "UTC Timestamp." }, { "name": "request", "$ref": "WebSocketRequest", "description": "WebSocket request data." } - ], - "experimental": true + ] }, { "name": "webSocketHandshakeResponseReceived", @@ -1874,8 +1837,7 @@ { "name": "requestId", "$ref": "RequestId", "description": "Request identifier." }, { "name": "timestamp", "$ref": "MonotonicTime", "description": "Timestamp." }, { "name": "response", "$ref": "WebSocketResponse", "description": "WebSocket response data." } - ], - "experimental": true + ] }, { "name": "webSocketCreated", @@ -1884,8 +1846,7 @@ { "name": "requestId", "$ref": "RequestId", "description": "Request identifier." }, { "name": "url", "type": "string", "description": "WebSocket request URL." }, { "name": "initiator", "$ref": "Initiator", "optional": true, "description": "Request initiator." } - ], - "experimental": true + ] }, { "name": "webSocketClosed", @@ -1893,8 +1854,7 @@ "parameters": [ { "name": "requestId", "$ref": "RequestId", "description": "Request identifier." }, { "name": "timestamp", "$ref": "MonotonicTime", "description": "Timestamp." } - ], - "experimental": true + ] }, { "name": "webSocketFrameReceived", @@ -1903,8 +1863,7 @@ { "name": "requestId", "$ref": "RequestId", "description": "Request identifier." }, { "name": "timestamp", "$ref": "MonotonicTime", "description": "Timestamp." }, { "name": "response", "$ref": "WebSocketFrame", "description": "WebSocket response data." } - ], - "experimental": true + ] }, { "name": "webSocketFrameError", @@ -1913,8 +1872,7 @@ { "name": "requestId", "$ref": "RequestId", "description": "Request identifier." }, { "name": "timestamp", "$ref": "MonotonicTime", "description": "Timestamp." }, { "name": "errorMessage", "type": "string", "description": "WebSocket frame error message." } - ], - "experimental": true + ] }, { "name": "webSocketFrameSent", @@ -1923,8 +1881,7 @@ { "name": "requestId", "$ref": "RequestId", "description": "Request identifier." }, { "name": "timestamp", "$ref": "MonotonicTime", "description": "Timestamp." }, { "name": "response", "$ref": "WebSocketFrame", "description": "WebSocket response data." } - ], - "experimental": true + ] }, { "name": "eventSourceMessageReceived", @@ -1935,8 +1892,7 @@ { "name": "eventName", "type": "string", "description": "Message type." }, { "name": "eventId", "type": "string", "description": "Message identifier." }, { "name": "data", "type": "string", "description": "Message content." } - ], - "experimental": true + ] }, { "name": "requestIntercepted", @@ -2477,8 +2433,7 @@ { "id": "BackendNodeId", "type": "integer", - "description": "Unique DOM node identifier used to reference a node that may not have been pushed to the front-end.", - "experimental": true + "description": "Unique DOM node identifier used to reference a node that may not have been pushed to the front-end." }, { "id": "BackendNode", @@ -2488,7 +2443,6 @@ { "name": "nodeName", "type": "string", "description": "<code>Node</code>'s nodeName." }, { "name": "backendNodeId", "$ref": "BackendNodeId" } ], - "experimental": true, "description": "Backend node with a friendly name." }, { @@ -2524,8 +2478,8 @@ "type": "object", "properties": [ { "name": "nodeId", "$ref": "NodeId", "description": "Node identifier that is passed into the rest of the DOM messages as the <code>nodeId</code>. Backend will only push node with given <code>id</code> once. It is aware of all requested nodes and will only fire DOM events for nodes known to the client." }, - { "name": "parentId", "$ref": "NodeId", "optional": true, "description": "The id of the parent node if any.", "experimental": true }, - { "name": "backendNodeId", "$ref": "BackendNodeId", "description": "The BackendNodeId for this node.", "experimental": true }, + { "name": "parentId", "$ref": "NodeId", "optional": true, "description": "The id of the parent node if any." }, + { "name": "backendNodeId", "$ref": "BackendNodeId", "description": "The BackendNodeId for this node." }, { "name": "nodeType", "type": "integer", "description": "<code>Node</code>'s nodeType." }, { "name": "nodeName", "type": "string", "description": "<code>Node</code>'s nodeName." }, { "name": "localName", "type": "string", "description": "<code>Node</code>'s localName." }, @@ -2534,7 +2488,7 @@ { "name": "children", "type": "array", "optional": true, "items": { "$ref": "Node" }, "description": "Child nodes of this node when requested with children." }, { "name": "attributes", "type": "array", "optional": true, "items": { "type": "string" }, "description": "Attributes of the <code>Element</code> node in the form of flat array <code>[name1, value1, name2, value2]</code>." }, { "name": "documentURL", "type": "string", "optional": true, "description": "Document URL that <code>Document</code> or <code>FrameOwner</code> node points to." }, - { "name": "baseURL", "type": "string", "optional": true, "description": "Base URL that <code>Document</code> or <code>FrameOwner</code> node uses for URL completion.", "experimental": true }, + { "name": "baseURL", "type": "string", "optional": true, "description": "Base URL that <code>Document</code> or <code>FrameOwner</code> node uses for URL completion." }, { "name": "publicId", "type": "string", "optional": true, "description": "<code>DocumentType</code>'s publicId." }, { "name": "systemId", "type": "string", "optional": true, "description": "<code>DocumentType</code>'s systemId." }, { "name": "internalSubset", "type": "string", "optional": true, "description": "<code>DocumentType</code>'s internalSubset." }, @@ -2543,14 +2497,14 @@ { "name": "value", "type": "string", "optional": true, "description": "<code>Attr</code>'s value." }, { "name": "pseudoType", "$ref": "PseudoType", "optional": true, "description": "Pseudo element type for this node." }, { "name": "shadowRootType", "$ref": "ShadowRootType", "optional": true, "description": "Shadow root type." }, - { "name": "frameId", "$ref": "Page.FrameId", "optional": true, "description": "Frame ID for frame owner elements.", "experimental": true }, + { "name": "frameId", "$ref": "Page.FrameId", "optional": true, "description": "Frame ID for frame owner elements." }, { "name": "contentDocument", "$ref": "Node", "optional": true, "description": "Content document for frame owner elements." }, - { "name": "shadowRoots", "type": "array", "optional": true, "items": { "$ref": "Node" }, "description": "Shadow root list for given element host.", "experimental": true }, - { "name": "templateContent", "$ref": "Node", "optional": true, "description": "Content document fragment for template elements.", "experimental": true }, - { "name": "pseudoElements", "type": "array", "items": { "$ref": "Node" }, "optional": true, "description": "Pseudo elements associated with this node.", "experimental": true }, + { "name": "shadowRoots", "type": "array", "optional": true, "items": { "$ref": "Node" }, "description": "Shadow root list for given element host." }, + { "name": "templateContent", "$ref": "Node", "optional": true, "description": "Content document fragment for template elements." }, + { "name": "pseudoElements", "type": "array", "items": { "$ref": "Node" }, "optional": true, "description": "Pseudo elements associated with this node." }, { "name": "importedDocument", "$ref": "Node", "optional": true, "description": "Import document for the HTMLImport links." }, - { "name": "distributedNodes", "type": "array", "items": { "$ref": "BackendNode" }, "optional": true, "description": "Distributed nodes for given insertion point.", "experimental": true }, - { "name": "isSVG", "type": "boolean", "optional": true, "description": "Whether the node is SVG.", "experimental": true } + { "name": "distributedNodes", "type": "array", "items": { "$ref": "BackendNode" }, "optional": true, "description": "Distributed nodes for given insertion point." }, + { "name": "isSVG", "type": "boolean", "optional": true, "description": "Whether the node is SVG." } ], "description": "DOM interaction is implemented in terms of mirror objects that represent the actual DOM nodes. DOMNode is a base node mirror type." }, @@ -2571,13 +2525,11 @@ "items": { "type": "number" }, "minItems": 8, "maxItems": 8, - "description": "An array of quad vertices, x immediately followed by y for each point, points clock-wise.", - "experimental": true + "description": "An array of quad vertices, x immediately followed by y for each point, points clock-wise." }, { "id": "BoxModel", "type": "object", - "experimental": true, "properties": [ { "name": "content", "$ref": "Quad", "description": "Content box" }, { "name": "padding", "$ref": "Quad", "description": "Padding box" }, @@ -2592,7 +2544,6 @@ { "id": "ShapeOutsideInfo", "type": "object", - "experimental": true, "properties": [ { "name": "bounds", "$ref": "Quad", "description": "Shape bounds" }, { "name": "shape", "type": "array", "items": { "type": "any"}, "description": "Shape coordinate details" }, @@ -2603,7 +2554,6 @@ { "id": "Rect", "type": "object", - "experimental": true, "properties": [ { "name": "x", "type": "number", "description": "X coordinate" }, { "name": "y", "type": "number", "description": "Y coordinate" }, @@ -2625,8 +2575,8 @@ { "name": "getDocument", "parameters": [ - { "name": "depth", "type": "integer", "optional": true, "description": "The maximum depth at which children should be retrieved, defaults to 1. Use -1 for the entire subtree or provide an integer larger than 0.", "experimental": true }, - { "name": "pierce", "type": "boolean", "optional": true, "description": "Whether or not iframes and shadow roots should be traversed when returning the subtree (default is false).", "experimental": true } + { "name": "depth", "type": "integer", "optional": true, "description": "The maximum depth at which children should be retrieved, defaults to 1. Use -1 for the entire subtree or provide an integer larger than 0." }, + { "name": "pierce", "type": "boolean", "optional": true, "description": "Whether or not iframes and shadow roots should be traversed when returning the subtree (default is false)." } ], "returns": [ { "name": "root", "$ref": "Node", "description": "Resulting node." } @@ -2636,8 +2586,8 @@ { "name": "getFlattenedDocument", "parameters": [ - { "name": "depth", "type": "integer", "optional": true, "description": "The maximum depth at which children should be retrieved, defaults to 1. Use -1 for the entire subtree or provide an integer larger than 0.", "experimental": true }, - { "name": "pierce", "type": "boolean", "optional": true, "description": "Whether or not iframes and shadow roots should be traversed when returning the subtree (default is false).", "experimental": true } + { "name": "depth", "type": "integer", "optional": true, "description": "The maximum depth at which children should be retrieved, defaults to 1. Use -1 for the entire subtree or provide an integer larger than 0." }, + { "name": "pierce", "type": "boolean", "optional": true, "description": "Whether or not iframes and shadow roots should be traversed when returning the subtree (default is false)." } ], "returns": [ { "name": "nodes", "type": "array", "items": { "$ref": "Node" }, "description": "Resulting node." } @@ -2659,8 +2609,8 @@ "name": "requestChildNodes", "parameters": [ { "name": "nodeId", "$ref": "NodeId", "description": "Id of the node to get children for." }, - { "name": "depth", "type": "integer", "optional": true, "description": "The maximum depth at which children should be retrieved, defaults to 1. Use -1 for the entire subtree or provide an integer larger than 0.", "experimental": true }, - { "name": "pierce", "type": "boolean", "optional": true, "description": "Whether or not iframes and shadow roots should be traversed when returning the sub-tree (default is false).", "experimental": true } + { "name": "depth", "type": "integer", "optional": true, "description": "The maximum depth at which children should be retrieved, defaults to 1. Use -1 for the entire subtree or provide an integer larger than 0." }, + { "name": "pierce", "type": "boolean", "optional": true, "description": "Whether or not iframes and shadow roots should be traversed when returning the sub-tree (default is false)." } ], "description": "Requests that children of the node with given id are returned to the caller in form of <code>setChildNodes</code> events where not only immediate children are retrieved, but all children down to the specified depth." }, @@ -2762,7 +2712,7 @@ "name": "performSearch", "parameters": [ { "name": "query", "type": "string", "description": "Plain text or query selector or XPath search query." }, - { "name": "includeUserAgentShadowDOM", "type": "boolean", "optional": true, "description": "True to search in user agent shadow DOM.", "experimental": true } + { "name": "includeUserAgentShadowDOM", "type": "boolean", "optional": true, "description": "True to search in user agent shadow DOM." } ], "returns": [ { "name": "searchId", "type": "string", "description": "Unique search session identifier." }, @@ -2916,8 +2866,7 @@ { "name": "backendNodeId", "$ref": "BackendNodeId", "optional": true, "description": "Identifier of the backend node." }, { "name": "objectId", "$ref": "Runtime.RemoteObjectId", "optional": true, "description": "JavaScript object id of the node wrapper." } ], - "description": "Focuses the given element.", - "experimental": true + "description": "Focuses the given element." }, { "name": "setFileInputFiles", @@ -2927,8 +2876,7 @@ { "name": "backendNodeId", "$ref": "BackendNodeId", "optional": true, "description": "Identifier of the backend node." }, { "name": "objectId", "$ref": "Runtime.RemoteObjectId", "optional": true, "description": "JavaScript object id of the node wrapper." } ], - "description": "Sets files for the given file input element.", - "experimental": true + "description": "Sets files for the given file input element." }, { "name": "getBoxModel", @@ -2940,8 +2888,7 @@ "returns": [ { "name": "model", "$ref": "BoxModel", "description": "Box model for the node." } ], - "description": "Returns boxes for the currently selected nodes.", - "experimental": true + "description": "Returns boxes for the given node." }, { "name": "getNodeForLocation", @@ -2973,8 +2920,8 @@ { "name": "nodeId", "$ref": "NodeId", "optional": true, "description": "Identifier of the node." }, { "name": "backendNodeId", "$ref": "BackendNodeId", "optional": true, "description": "Identifier of the backend node." }, { "name": "objectId", "$ref": "Runtime.RemoteObjectId", "optional": true, "description": "JavaScript object id of the node wrapper." }, - { "name": "depth", "type": "integer", "optional": true, "description": "The maximum depth at which children should be retrieved, defaults to 1. Use -1 for the entire subtree or provide an integer larger than 0.", "experimental": true }, - { "name": "pierce", "type": "boolean", "optional": true, "description": "Whether or not iframes and shadow roots should be traversed when returning the subtree (default is false).", "experimental": true } + { "name": "depth", "type": "integer", "optional": true, "description": "The maximum depth at which children should be retrieved, defaults to 1. Use -1 for the entire subtree or provide an integer larger than 0." }, + { "name": "pierce", "type": "boolean", "optional": true, "description": "Whether or not iframes and shadow roots should be traversed when returning the subtree (default is false)." } ], "returns": [ { "name": "node", "$ref": "Node", "description": "Node description." } @@ -3177,7 +3124,7 @@ { "name": "isInline", "type": "boolean", "description": "Whether this stylesheet is created for STYLE tag by parser. This flag is not set for document.written STYLE tags." }, { "name": "startLine", "type": "number", "description": "Line offset of the stylesheet within the resource (zero based)." }, { "name": "startColumn", "type": "number", "description": "Column offset of the stylesheet within the resource (zero based)." }, - { "name": "length", "type": "number", "description": "Size of the content (in characters).", "experimental": true } + { "name": "length", "type": "number", "description": "Size of the content (in characters)." } ], "description": "CSS stylesheet metainformation." }, @@ -3202,8 +3149,7 @@ { "name": "endOffset", "type": "number", "description": "Offset of the end of the rule body from the beginning of the stylesheet." }, { "name": "used", "type": "boolean", "description": "Indicates whether the rule was actually used by some element in the page." } ], - "description": "CSS coverage information.", - "experimental": true + "description": "CSS coverage information." }, { "id": "SourceRange", @@ -3269,7 +3215,7 @@ { "name": "sourceURL", "type": "string", "optional": true, "description": "URL of the document containing the media query description." }, { "name": "range", "$ref": "SourceRange", "optional": true, "description": "The associated rule (@media or @import) header range in the enclosing stylesheet (if available)." }, { "name": "styleSheetId", "$ref": "StyleSheetId", "optional": true, "description": "Identifier of the stylesheet containing this object (if exists)." }, - { "name": "mediaList", "type": "array", "items": { "$ref": "MediaQuery" }, "optional": true, "experimental": true, "description": "Array of media queries." } + { "name": "mediaList", "type": "array", "items": { "$ref": "MediaQuery" }, "optional": true, "description": "Array of media queries." } ], "description": "CSS media rule descriptor." }, @@ -3280,8 +3226,7 @@ { "name": "expressions", "type": "array", "items": { "$ref": "MediaQueryExpression" }, "description": "Array of media query expressions." }, { "name": "active", "type": "boolean", "description": "Whether the media query condition is satisfied." } ], - "description": "Media query descriptor.", - "experimental": true + "description": "Media query descriptor." }, { "id": "MediaQueryExpression", @@ -3293,8 +3238,7 @@ { "name": "valueRange", "$ref": "SourceRange", "optional": true, "description": "The associated range of the value text in the enclosing stylesheet (if available)." }, { "name": "computedLength", "type": "number", "optional": true, "description": "Computed length of media query expression (if applicable)."} ], - "description": "Media query expression descriptor.", - "experimental": true + "description": "Media query expression descriptor." }, { "id": "PlatformFontUsage", @@ -3304,8 +3248,7 @@ { "name": "isCustomFont", "type": "boolean", "description": "Indicates if the font was downloaded or resolved locally."}, { "name": "glyphCount", "type": "number", "description": "Amount of glyphs that were rendered with this font."} ], - "description": "Information about amount of glyphs that were rendered with given font.", - "experimental": true + "description": "Information about amount of glyphs that were rendered with given font." }, { "id": "CSSKeyframesRule", @@ -3336,17 +3279,6 @@ { "name": "text", "type": "string", "description": "New style text."} ], "description": "A descriptor of operation to mutate style declaration text." - }, - { - "id": "InlineTextBox", - "type": "object", - "properties": [ - { "name": "boundingBox", "$ref": "DOM.Rect", "description": "The absolute position bounding box." }, - { "name": "startCharacterIndex", "type": "integer", "description": "The starting index in characters, for this post layout textbox substring." }, - { "name": "numCharacters", "type": "integer", "description": "The number of characters in this post layout textbox substring." } - ], - "description": "Details of post layout rendered text positions. The exact layout should not be regarded as stable and may change between versions.", - "experimental": true } ], "commands": [ @@ -3402,8 +3334,7 @@ "returns": [ { "name": "fonts", "type": "array", "items": { "$ref": "PlatformFontUsage" }, "description": "Usage statistics for every employed platform font." } ], - "description": "Requests information about platform fonts which we used to render child TextNodes in the given node.", - "experimental": true + "description": "Requests information about platform fonts which we used to render child TextNodes in the given node." }, { "name": "getStyleSheetText", @@ -3423,8 +3354,7 @@ "returns": [ {"name": "classNames", "type": "array", "items": { "type": "string" }, "description": "Class name list." } ], - "description": "Returns all class names from specified stylesheet.", - "experimental": true + "description": "Returns all class names from specified stylesheet." }, { "name": "setStyleSheetText", @@ -3518,8 +3448,7 @@ "returns": [ { "name": "medias", "type": "array", "items": { "$ref": "CSSMedia" } } ], - "description": "Returns all media queries parsed by the rendering engine.", - "experimental": true + "description": "Returns all media queries parsed by the rendering engine." }, { "name": "setEffectivePropertyValueForNode", @@ -3528,8 +3457,7 @@ { "name": "propertyName", "type": "string"}, { "name": "value", "type": "string"} ], - "description": "Find a rule with the given active property for the given node and set the new value for this property", - "experimental": true + "description": "Find a rule with the given active property for the given node and set the new value for this property" }, { "name": "getBackgroundColors", @@ -3542,29 +3470,25 @@ { "name": "computedFontWeight", "type": "string", "description": "The computed font weight for this node, as a CSS computed value string (e.g. 'normal' or '100').", "optional": true }, { "name": "computedBodyFontSize", "type": "string", "description": "The computed font size for the document body, as a computed CSS value string (e.g. '16px').", "optional": true } - ], - "experimental": true + ] }, { "name": "startRuleUsageTracking", - "description": "Enables the selector recording.", - "experimental": true + "description": "Enables the selector recording." }, { "name": "takeCoverageDelta", "description": "Obtain list of rules that became used since last call to this method (or since start of coverage instrumentation)", "returns": [ { "name": "coverage", "type": "array", "items": { "$ref": "RuleUsage" } } - ], - "experimental": true + ] }, { "name": "stopRuleUsageTracking", "returns": [ { "name": "ruleUsage", "type": "array", "items": { "$ref": "RuleUsage" } } ], - "description": "The list of rules with an indication of whether these were used", - "experimental": true + "description": "The list of rules with an indication of whether these were used" } ], "events": [ @@ -3637,13 +3561,23 @@ "description": "A Node in the DOM tree." }, { + "id": "InlineTextBox", + "type": "object", + "properties": [ + { "name": "boundingBox", "$ref": "DOM.Rect", "description": "The absolute position bounding box." }, + { "name": "startCharacterIndex", "type": "integer", "description": "The starting index in characters, for this post layout textbox substring." }, + { "name": "numCharacters", "type": "integer", "description": "The number of characters in this post layout textbox substring." } + ], + "description": "Details of post layout rendered text positions. The exact layout should not be regarded as stable and may change between versions." + }, + { "id": "LayoutTreeNode", "type": "object", "properties": [ { "name": "domNodeIndex", "type": "integer", "description": "The index of the related DOM node in the <code>domNodes</code> array returned by <code>getSnapshot</code>." }, { "name": "boundingBox", "$ref": "DOM.Rect", "description": "The absolute position bounding box." }, { "name": "layoutText", "type": "string", "optional": true, "description": "Contents of the LayoutText, if any." }, - { "name": "inlineTextNodes", "type": "array", "optional": true, "items": { "$ref": "CSS.InlineTextBox" }, "description": "The post-layout inline text nodes, if any." }, + { "name": "inlineTextNodes", "type": "array", "optional": true, "items": { "$ref": "InlineTextBox" }, "description": "The post-layout inline text nodes, if any." }, { "name": "styleIndex", "type": "integer", "optional": true, "description": "Index into the <code>computedStyles</code> array returned by <code>getSnapshot</code>." } ], "description": "Details of an element in the DOM tree with a LayoutObject." @@ -3684,7 +3618,6 @@ { "domain": "IO", "description": "Input/Output operations for streams produced by DevTools.", - "experimental": true, "types": [ { "id": "StreamHandle", @@ -3752,8 +3685,7 @@ { "name": "handler", "$ref": "Runtime.RemoteObject", "optional": true, "description": "Event handler function value." }, { "name": "originalHandler", "$ref": "Runtime.RemoteObject", "optional": true, "description": "Event original handler function value." }, { "name": "backendNodeId", "$ref": "DOM.BackendNodeId", "optional": true, "description": "Node the listener is added to (if any)." } - ], - "experimental": true + ] } ], "commands": [ @@ -3821,11 +3753,10 @@ }, { "name": "getEventListeners", - "experimental": true, "parameters": [ { "name": "objectId", "$ref": "Runtime.RemoteObjectId", "description": "Identifier of the object to return listeners for." }, - { "name": "depth", "type": "integer", "optional": true, "description": "The maximum depth at which Node children should be retrieved, defaults to 1. Use -1 for the entire subtree or provide an integer larger than 0.", "experimental": true }, - { "name": "pierce", "type": "boolean", "optional": true, "description": "Whether or not iframes and shadow roots should be traversed when returning the subtree (default is false). Reports listeners for all contexts if pierce is enabled.", "experimental": true } + { "name": "depth", "type": "integer", "optional": true, "description": "The maximum depth at which Node children should be retrieved, defaults to 1. Use -1 for the entire subtree or provide an integer larger than 0." }, + { "name": "pierce", "type": "boolean", "optional": true, "description": "Whether or not iframes and shadow roots should be traversed when returning the subtree (default is false). Reports listeners for all contexts if pierce is enabled." } ], "returns": [ { "name": "listeners", "type": "array", "items": { "$ref": "EventListener" }, "description": "Array of relevant listeners." } @@ -3837,7 +3768,6 @@ { "domain": "Target", "description": "Supports additional targets discovery and allows to attach to them.", - "experimental": true, "types": [ { "id": "TargetID", @@ -3850,7 +3780,8 @@ }, { "id": "BrowserContextID", - "type": "string" + "type": "string", + "experimental": true }, { "id": "TargetInfo", @@ -3870,7 +3801,8 @@ "properties": [ { "name": "host", "type": "string" }, { "name": "port", "type": "integer" } - ] + ], + "experimental": true } ], "commands": [ @@ -3893,14 +3825,16 @@ "name": "setAttachToFrames", "parameters": [ { "name": "value", "type": "boolean", "description": "Whether to attach to frames." } - ] + ], + "experimental": true }, { "name": "setRemoteLocations", "description": "Enables target discovery for the specified locations, when <code>setDiscoverTargets</code> was set to <code>true</code>.", "parameters": [ { "name": "locations", "type": "array", "items": { "$ref": "RemoteLocation" }, "description": "List of remote locations." } - ] + ], + "experimental": true }, { "name": "sendMessageToTarget", @@ -3961,7 +3895,8 @@ "description": "Creates a new empty BrowserContext. Similar to an incognito profile but you can have more than one.", "returns": [ { "name": "browserContextId", "$ref": "BrowserContextID", "description": "The id of the context created." } - ] + ], + "experimental": true }, { "name": "disposeBrowserContext", @@ -3971,7 +3906,8 @@ ], "returns": [ { "name": "success", "type": "boolean" } - ] + ], + "experimental": true }, { "name": "createTarget", @@ -4251,7 +4187,6 @@ { "id": "TouchPoint", "type": "object", - "experimental": true, "properties": [ { "name": "x", "type": "number", "description": "X coordinate of the event relative to the main frame's viewport in CSS pixels."}, { "name": "y", "type": "number", "description": "Y coordinate of the event relative to the main frame's viewport in CSS pixels. 0 refers to the top of the viewport and Y increases as it proceeds towards the bottom of the viewport."}, @@ -4298,7 +4233,7 @@ { "name": "autoRepeat", "type": "boolean", "optional": true, "description": "Whether the event was generated from auto repeat (default: false)." }, { "name": "isKeypad", "type": "boolean", "optional": true, "description": "Whether the event was generated from the keypad (default: false)." }, { "name": "isSystemKey", "type": "boolean", "optional": true, "description": "Whether the event was a system key event (default: false)." }, - { "name": "location", "type": "integer", "optional": true, "experimental": true, "description": "Whether the event was from the left or right side of the keyboard. 1=Left, 2=Right (default: 0)." } + { "name": "location", "type": "integer", "optional": true, "description": "Whether the event was from the left or right side of the keyboard. 1=Left, 2=Right (default: 0)." } ], "description": "Dispatches a key event to the page." }, @@ -4319,7 +4254,6 @@ }, { "name": "dispatchTouchEvent", - "experimental": true, "parameters": [ { "name": "type", "type": "string", "enum": ["touchStart", "touchEnd", "touchMove", "touchCancel"], "description": "Type of the touch event. TouchEnd and TouchCancel must not contain any touch points, while TouchStart and TouchMove must contains at least one." }, { "name": "touchPoints", "type": "array", "items": { "$ref": "TouchPoint" }, "description": "Active touch points on the touch device. One event per any changed point (compared to previous touch event in a sequence) is generated, emulating pressing/moving/releasing points one by one." }, @@ -5088,7 +5022,6 @@ "domain": "Log", "description": "Provides access to log entries.", "dependencies": ["Runtime", "Network"], - "experimental": true, "types": [ { "id": "LogEntry", @@ -5227,17 +5160,18 @@ { "domain": "Browser", "description": "The Browser domain defines methods and events for browser managing.", - "experimental": true, "types": [ { "id": "WindowID", - "type": "integer" + "type": "integer", + "experimental": true }, { "id": "WindowState", "type": "string", "enum": ["normal", "minimized", "maximized", "fullscreen"], - "description": "The state of the browser window." + "description": "The state of the browser window.", + "experimental": true }, { "id": "Bounds", @@ -5249,7 +5183,8 @@ { "name": "width", "type": "integer", "optional": true, "description": "The window width in pixels."}, { "name": "height", "type": "integer", "optional": true, "description": "The window height in pixels."}, { "name": "windowState", "$ref": "WindowState", "optional": true, "description": "The window state. Default to normal."} - ] + ], + "experimental": true } ], "commands": [ @@ -5266,7 +5201,8 @@ "returns": [ { "name": "windowId", "$ref": "WindowID", "description": "Browser window id." }, { "name": "bounds", "$ref": "Bounds", "description": "Bounds information of the window. When window state is 'minimized', the restored window position and size are returned." } - ] + ], + "experimental": true }, { "name": "getVersion", @@ -5285,7 +5221,8 @@ "parameters": [ { "name": "windowId", "$ref": "WindowID", "description": "Browser window id." }, { "name": "bounds", "$ref": "Bounds", "description": "New window bounds. The 'minimized', 'maximized' and 'fullscreen' states cannot be combined with 'left', 'top', 'width' or 'height'. Leaves unspecified fields unchanged." } - ] + ], + "experimental": true }, { "name": "getWindowBounds", @@ -5295,7 +5232,8 @@ ], "returns": [ { "name": "bounds", "$ref": "Bounds", "description": "Bounds information of the window. When window state is 'minimized', the restored window position and size are returned." } - ] + ], + "experimental": true } ] }]
diff --git a/third_party/WebKit/Source/core/layout/ng/inline/ng_inline_item.cc b/third_party/WebKit/Source/core/layout/ng/inline/ng_inline_item.cc index eea654c..647df5f 100644 --- a/third_party/WebKit/Source/core/layout/ng/inline/ng_inline_item.cc +++ b/third_party/WebKit/Source/core/layout/ng/inline/ng_inline_item.cc
@@ -17,6 +17,33 @@ "Text", "Control", "AtomicInline", "OpenTag", "CloseTag", "Floating", "OutOfFlowPositioned", "BidiControl"}; +// Returns true if this item is "empty", i.e. if the node contains only empty +// items it will produce a single zero block-size line box. +static bool IsEmptyItem(NGInlineItem::NGInlineItemType type, + const ComputedStyle* style) { + if (type == NGInlineItem::kAtomicInline || type == NGInlineItem::kControl || + type == NGInlineItem::kText) + return false; + + if (type == NGInlineItem::kOpenTag) { + DCHECK(style); + + if (!style->MarginStart().IsZero() || style->BorderStart().NonZero() || + !style->PaddingStart().IsZero()) + return false; + } + + if (type == NGInlineItem::kCloseTag) { + DCHECK(style); + + if (!style->MarginEnd().IsZero() || style->BorderEnd().NonZero() || + !style->PaddingEnd().IsZero()) + return false; + } + + return true; +} + } // namespace NGInlineItem::NGInlineItem(NGInlineItemType type, @@ -31,7 +58,8 @@ layout_object_(layout_object), type_(type), bidi_level_(UBIDI_LTR), - shape_options_(kPreContext | kPostContext) { + shape_options_(kPreContext | kPostContext), + is_empty_item_(::blink::IsEmptyItem(type, style)) { DCHECK_GE(end, start); }
diff --git a/third_party/WebKit/Source/core/layout/ng/inline/ng_inline_item.h b/third_party/WebKit/Source/core/layout/ng/inline/ng_inline_item.h index 0aebb14..252c7e8 100644 --- a/third_party/WebKit/Source/core/layout/ng/inline/ng_inline_item.h +++ b/third_party/WebKit/Source/core/layout/ng/inline/ng_inline_item.h
@@ -65,6 +65,9 @@ return static_cast<NGLayoutInlineShapeOptions>(shape_options_); } + // If this item is "empty" for the purpose of empty block calculation. + bool IsEmptyItem() const { return is_empty_item_; } + unsigned StartOffset() const { return start_offset_; } unsigned EndOffset() const { return end_offset_; } unsigned Length() const { return end_offset_ - start_offset_; } @@ -111,6 +114,7 @@ unsigned type_ : 4; unsigned bidi_level_ : 8; // UBiDiLevel is defined as uint8_t. unsigned shape_options_ : 2; + unsigned is_empty_item_ : 1; friend class NGInlineNode; };
diff --git a/third_party/WebKit/Source/core/layout/ng/inline/ng_inline_item_result.cc b/third_party/WebKit/Source/core/layout/ng/inline/ng_inline_item_result.cc index 8b047cac..7df7e62 100644 --- a/third_party/WebKit/Source/core/layout/ng/inline/ng_inline_item_result.cc +++ b/third_party/WebKit/Source/core/layout/ng/inline/ng_inline_item_result.cc
@@ -48,9 +48,11 @@ } void NGLineInfo::SetLineBfcOffset(NGBfcOffset line_bfc_offset, - LayoutUnit available_width) { + LayoutUnit available_width, + LayoutUnit width) { line_bfc_offset_ = line_bfc_offset; available_width_ = available_width; + width_ = width; } void NGLineInfo::SetLineEndShapeResult(
diff --git a/third_party/WebKit/Source/core/layout/ng/inline/ng_inline_item_result.h b/third_party/WebKit/Source/core/layout/ng/inline/ng_inline_item_result.h index 4040bcc69..84b0bf8 100644 --- a/third_party/WebKit/Source/core/layout/ng/inline/ng_inline_item_result.h +++ b/third_party/WebKit/Source/core/layout/ng/inline/ng_inline_item_result.h
@@ -131,8 +131,10 @@ NGBfcOffset LineBfcOffset() const { return line_bfc_offset_; } LayoutUnit AvailableWidth() const { return available_width_; } + LayoutUnit Width() const { return width_; } void SetLineBfcOffset(NGBfcOffset line_bfc_offset, - LayoutUnit available_width); + LayoutUnit available_width, + LayoutUnit width); // Start/end text offset of this line. unsigned StartOffset() const { return start_offset_; } @@ -162,6 +164,7 @@ NGBfcOffset line_bfc_offset_; LayoutUnit available_width_; + LayoutUnit width_; LayoutUnit text_indent_; unsigned start_offset_;
diff --git a/third_party/WebKit/Source/core/layout/ng/inline/ng_inline_items_builder.cc b/third_party/WebKit/Source/core/layout/ng/inline/ng_inline_items_builder.cc index 82586410..c53552d 100644 --- a/third_party/WebKit/Source/core/layout/ng/inline/ng_inline_items_builder.cc +++ b/third_party/WebKit/Source/core/layout/ng/inline/ng_inline_items_builder.cc
@@ -106,33 +106,6 @@ after_style); } -// Returns true if this item is "empty", i.e. if the node contains only empty -// items it will produce a single zero block-size line box. -static bool IsItemEmpty(NGInlineItem::NGInlineItemType type, - const ComputedStyle* style) { - if (type == NGInlineItem::kAtomicInline || type == NGInlineItem::kControl || - type == NGInlineItem::kText) - return false; - - if (type == NGInlineItem::kOpenTag) { - DCHECK(style); - - if (!style->MarginStart().IsZero() || style->BorderStart().NonZero() || - !style->PaddingStart().IsZero()) - return false; - } - - if (type == NGInlineItem::kCloseTag) { - DCHECK(style); - - if (!style->MarginEnd().IsZero() || style->BorderEnd().NonZero() || - !style->PaddingEnd().IsZero()) - return false; - } - - return true; -} - static void AppendItem(Vector<NGInlineItem>* items, NGInlineItem::NGInlineItemType type, unsigned start, @@ -250,7 +223,7 @@ if (last_collapsible_space_ == CollapsibleSpace::kSpace && !style->AutoWrap()) last_collapsible_space_ = CollapsibleSpace::kSpaceNoWrap; - is_empty_inline_ &= IsItemEmpty(NGInlineItem::kText, style); + is_empty_inline_ &= items_->back().IsEmptyItem(); } } @@ -278,7 +251,7 @@ AppendItem(items_, NGInlineItem::kText, start_offset, text_.length(), style, layout_object); - is_empty_inline_ &= IsItemEmpty(NGInlineItem::kText, style); + is_empty_inline_ &= items_->back().IsEmptyItem(); start = end; } @@ -339,7 +312,7 @@ unsigned end_offset = text_.length(); AppendItem(items_, type, end_offset - 1, end_offset, style, layout_object); - is_empty_inline_ &= IsItemEmpty(type, style); + is_empty_inline_ &= items_->back().IsEmptyItem(); last_collapsible_space_ = CollapsibleSpace::kNone; } @@ -363,7 +336,7 @@ unsigned end_offset = text_.length(); AppendItem(items_, type, end_offset - 1, end_offset, style, layout_object); - is_empty_inline_ &= IsItemEmpty(type, nullptr); + is_empty_inline_ &= items_->back().IsEmptyItem(); } template <typename OffsetMappingBuilder> @@ -374,7 +347,7 @@ unsigned end_offset = text_.length(); AppendItem(items_, type, end_offset, end_offset, style, layout_object); - is_empty_inline_ &= IsItemEmpty(type, style); + is_empty_inline_ &= items_->back().IsEmptyItem(); } // Removes the collapsible newline at the end of |text_| if exists and the
diff --git a/third_party/WebKit/Source/core/layout/ng/inline/ng_inline_layout_algorithm.cc b/third_party/WebKit/Source/core/layout/ng/inline/ng_inline_layout_algorithm.cc index 8489fb6..f69bdb1 100644 --- a/third_party/WebKit/Source/core/layout/ng/inline/ng_inline_layout_algorithm.cc +++ b/third_party/WebKit/Source/core/layout/ng/inline/ng_inline_layout_algorithm.cc
@@ -523,54 +523,122 @@ } scoped_refptr<NGLayoutResult> NGInlineLayoutAlgorithm::Layout() { - if (Node().IsEmptyInline()) - return LayoutEmptyInline(); - - DCHECK(ConstraintSpace().UnpositionedFloats().IsEmpty()); - DCHECK(ConstraintSpace().MarginStrut().IsEmpty()); - container_builder_.SetBfcOffset(ConstraintSpace().BfcOffset()); - - scoped_refptr<NGInlineBreakToken> break_token = BreakToken(); - - // Copy the state stack from the unfinished break token if provided. This - // enforces the layout inputs immutability constraint. If we weren't provided - // with a break token we just create an empty state stack. - box_states_ = - break_token - ? WTF::MakeUnique<NGInlineLayoutStateStack>(break_token->StateStack()) - : WTF::MakeUnique<NGInlineLayoutStateStack>(); - - std::unique_ptr<NGExclusionSpace> exclusion_space( + std::unique_ptr<NGExclusionSpace> initial_exclusion_space( WTF::MakeUnique<NGExclusionSpace>(ConstraintSpace().ExclusionSpace())); - NGLineInfo line_info; - NGLineBreaker line_breaker(Node(), constraint_space_, &positioned_floats_, - &unpositioned_floats_, break_token.get()); - // TODO(ikilpatrick): Does this always succeed when we aren't an empty inline? - if (line_breaker.NextLine(*exclusion_space, &line_info)) { - CreateLine(&line_info, line_breaker.ExclusionSpace()); + bool is_empty_inline = Node().IsEmptyInline(); + + if (!is_empty_inline) { + DCHECK(ConstraintSpace().UnpositionedFloats().IsEmpty()); + DCHECK(ConstraintSpace().MarginStrut().IsEmpty()); + container_builder_.SetBfcOffset(ConstraintSpace().BfcOffset()); + } + + // In order to get the correct list of layout opportunities, we need to + // position any "leading" items (floats) within the exclusion space first. + unsigned handled_item_index = + PositionLeadingItems(initial_exclusion_space.get()); + + // If we are an empty inline, we don't have to run the full algorithm, we can + // return now as we should have positioned all of our floats. + if (is_empty_inline) { + DCHECK_EQ(handled_item_index, Node().Items().size()); + + container_builder_.SwapPositionedFloats(&positioned_floats_); + container_builder_.SwapUnpositionedFloats(&unpositioned_floats_); + container_builder_.SetEndMarginStrut(ConstraintSpace().MarginStrut()); + container_builder_.SetExclusionSpace(std::move(initial_exclusion_space)); + + Vector<NGOutOfFlowPositionedDescendant> descendant_candidates; + container_builder_.GetAndClearOutOfFlowDescendantCandidates( + &descendant_candidates); + for (auto& descendant : descendant_candidates) + container_builder_.AddOutOfFlowDescendant(descendant); + + return container_builder_.ToLineBoxFragment(); + } + + DCHECK(container_builder_.BfcOffset()); + + // We query all the layout opportunities on the initial exclusion space up + // front, as if the line breaker may add floats and change the opportunities. + Vector<NGLayoutOpportunity> opportunities = + initial_exclusion_space->AllLayoutOpportunities( + ConstraintSpace().BfcOffset(), ConstraintSpace().AvailableSize()); + + Vector<NGPositionedFloat> positioned_floats; + DCHECK(unpositioned_floats_.IsEmpty()); + + std::unique_ptr<NGExclusionSpace> exclusion_space; + NGInlineBreakToken* break_token = BreakToken(); + + for (const auto& opportunity : opportunities) { + // Copy the state stack from the unfinished break token if provided. This + // enforces the layout inputs immutability constraint. If we weren't + // provided with a break token we just create an empty state stack. + box_states_ = break_token ? WTF::MakeUnique<NGInlineLayoutStateStack>( + break_token->StateStack()) + : WTF::MakeUnique<NGInlineLayoutStateStack>(); + + // Reset any state that may have been modified in a previous pass. + positioned_floats.clear(); + unpositioned_floats_.clear(); + container_builder_.Reset(); + exclusion_space = + WTF::MakeUnique<NGExclusionSpace>(*initial_exclusion_space); + + NGLineInfo line_info; + NGLineBreaker line_breaker(Node(), constraint_space_, &positioned_floats, + &unpositioned_floats_, exclusion_space.get(), + handled_item_index, break_token); + + // TODO(ikilpatrick): Does this always succeed when we aren't an empty + // inline? + if (!line_breaker.NextLine(opportunity, &line_info)) + break; + + // If this fragment will be larger than the inline-size of the opportunity, + // *and* the opportunity is smaller than the available inline-size, + // continue to the next opportunity. + if (line_info.Width() > opportunity.InlineSize() && + opportunity.InlineSize() != + ConstraintSpace().AvailableSize().inline_size) + continue; + + CreateLine(&line_info, exclusion_space.get()); + + // We now can check the block-size of the fragment, and it fits within the + // opportunity. + LayoutUnit block_size = container_builder_.ComputeBlockSize(); + if (block_size > opportunity.BlockSize()) + continue; + + LayoutUnit line_height = + container_builder_.Metrics().LineHeight().ClampNegativeToZero(); + + // Success! + positioned_floats_.AppendVector(positioned_floats); container_builder_.SetBreakToken( line_breaker.CreateBreakToken(std::move(box_states_))); - exclusion_space = - WTF::MakeUnique<NGExclusionSpace>(*line_breaker.ExclusionSpace()); + // Place any remaining floats which couldn't fit on the line. + PositionPendingFloats(line_height, exclusion_space.get()); + + // A <br clear=both> will strech the line-box height, such that the + // block-end edge will clear any floats. + // TODO(ikilpatrick): Move this into ng_block_layout_algorithm. + container_builder_.SetBlockSize( + ComputeContentSize(line_info, *exclusion_space, line_height)); + + break; } - // Place any remaining floats which couldn't fit on the line. - LayoutUnit content_size = - container_builder_.Metrics().LineHeight().ClampNegativeToZero(); - PositionPendingFloats(content_size, exclusion_space.get()); - - // A <br clear=both> will strech the line-box height, such that the block-end - // edge will clear any floats. - container_builder_.SetBlockSize(ComputeContentSize( - line_info, *exclusion_space, - container_builder_.Metrics().LineHeight().ClampNegativeToZero())); - // We shouldn't have any unpositioned floats if we aren't empty. DCHECK(unpositioned_floats_.IsEmpty()); container_builder_.SwapPositionedFloats(&positioned_floats_); - container_builder_.SetExclusionSpace(std::move(exclusion_space)); + container_builder_.SetExclusionSpace( + exclusion_space ? std::move(exclusion_space) + : std::move(initial_exclusion_space)); Vector<NGOutOfFlowPositionedDescendant> descendant_candidates; container_builder_.GetAndClearOutOfFlowDescendantCandidates( @@ -580,11 +648,19 @@ return container_builder_.ToLineBoxFragment(); } -scoped_refptr<NGLayoutResult> NGInlineLayoutAlgorithm::LayoutEmptyInline() { +// This positions any "leading" floats within the given exclusion space. +// If we are also an empty inline, it will add any out-of-flow descendants. +// TODO(ikilpatrick): Do we need to always add the OOFs here? +unsigned NGInlineLayoutAlgorithm::PositionLeadingItems( + NGExclusionSpace* exclusion_space) { const Vector<NGInlineItem>& items = Node().Items(); + bool is_empty_inline = Node().IsEmptyInline(); LayoutUnit bfc_line_offset = ConstraintSpace().BfcOffset().line_offset; - for (const auto& item : items) { + unsigned index = BreakToken() ? BreakToken()->ItemIndex() : 0; + for (; index < items.size(); ++index) { + const auto& item = items[index]; + if (item.Type() == NGInlineItem::kFloating) { NGBlockNode node(ToLayoutBox(item.GetLayoutObject())); NGBoxStrut margins = @@ -594,36 +670,24 @@ ConstraintSpace().AvailableSize(), ConstraintSpace().PercentageResolutionSize(), bfc_line_offset, bfc_line_offset, margins, node, /* break_token */ nullptr)); - } else if (item.Type() == NGInlineItem::kOutOfFlowPositioned) { + } else if (is_empty_inline && + item.Type() == NGInlineItem::kOutOfFlowPositioned) { NGBlockNode node(ToLayoutBox(item.GetLayoutObject())); container_builder_.AddOutOfFlowChildCandidate( node, NGLogicalOffset(), CurrentDirection(node.Style().Direction())); - } else { - DCHECK_NE(item.Type(), NGInlineItem::kAtomicInline); - DCHECK_NE(item.Type(), NGInlineItem::kControl); - DCHECK_NE(item.Type(), NGInlineItem::kText); + } + + // Abort if we've found something that makes this a non-empty inline. + if (!item.IsEmptyItem()) { + DCHECK(!is_empty_inline); + break; } } - std::unique_ptr<NGExclusionSpace> exclusion_space( - WTF::MakeUnique<NGExclusionSpace>(ConstraintSpace().ExclusionSpace())); + if (ConstraintSpace().FloatsBfcOffset() || container_builder_.BfcOffset()) + PositionPendingFloats(/* content_size */ LayoutUnit(), exclusion_space); - // The content_size is zero for an empty inline. - if (ConstraintSpace().FloatsBfcOffset()) - PositionPendingFloats(/* content_size */ LayoutUnit(), - exclusion_space.get()); - - container_builder_.SwapPositionedFloats(&positioned_floats_); - container_builder_.SwapUnpositionedFloats(&unpositioned_floats_); - container_builder_.SetEndMarginStrut(ConstraintSpace().MarginStrut()); - container_builder_.SetExclusionSpace(std::move(exclusion_space)); - - Vector<NGOutOfFlowPositionedDescendant> descendant_candidates; - container_builder_.GetAndClearOutOfFlowDescendantCandidates( - &descendant_candidates); - for (auto& descendant : descendant_candidates) - container_builder_.AddOutOfFlowDescendant(descendant); - return container_builder_.ToLineBoxFragment(); + return index; } void NGInlineLayoutAlgorithm::PositionPendingFloats(
diff --git a/third_party/WebKit/Source/core/layout/ng/inline/ng_inline_layout_algorithm.h b/third_party/WebKit/Source/core/layout/ng/inline/ng_inline_layout_algorithm.h index ebb64fb8..7fe6cee 100644 --- a/third_party/WebKit/Source/core/layout/ng/inline/ng_inline_layout_algorithm.h +++ b/third_party/WebKit/Source/core/layout/ng/inline/ng_inline_layout_algorithm.h
@@ -46,8 +46,7 @@ scoped_refptr<NGLayoutResult> Layout() override; private: - scoped_refptr<NGLayoutResult> LayoutEmptyInline(); - + unsigned PositionLeadingItems(NGExclusionSpace*); void PositionPendingFloats(LayoutUnit content_size, NGExclusionSpace*); bool IsHorizontalWritingMode() const { return is_horizontal_writing_mode_; } @@ -96,7 +95,6 @@ unsigned is_horizontal_writing_mode_ : 1; unsigned quirks_mode_ : 1; - std::unique_ptr<NGExclusionSpace> exclusion_space_; Vector<NGPositionedFloat> positioned_floats_; Vector<scoped_refptr<NGUnpositionedFloat>> unpositioned_floats_; };
diff --git a/third_party/WebKit/Source/core/layout/ng/inline/ng_inline_node.cc b/third_party/WebKit/Source/core/layout/ng/inline/ng_inline_node.cc index 40473c64..1d5a570 100644 --- a/third_party/WebKit/Source/core/layout/ng/inline/ng_inline_node.cc +++ b/third_party/WebKit/Source/core/layout/ng/inline/ng_inline_node.cc
@@ -600,8 +600,13 @@ LayoutUnit result; while (!break_token || !break_token->IsFinished()) { NGLineBreaker line_breaker(node, *space, &positioned_floats, - &unpositioned_floats, break_token.get()); - if (!line_breaker.NextLine(empty_exclusion_space, &line_info)) + &unpositioned_floats, &empty_exclusion_space, 0u, + break_token.get()); + if (!line_breaker.NextLine( + NGLayoutOpportunity( + NGBfcOffset(), + NGLogicalSize({available_inline_size, NGSizeIndefinite})), + &line_info)) break; break_token = line_breaker.CreateBreakToken(nullptr);
diff --git a/third_party/WebKit/Source/core/layout/ng/inline/ng_line_box_fragment_builder.cc b/third_party/WebKit/Source/core/layout/ng/inline/ng_line_box_fragment_builder.cc index 732ed34..fbfdd92 100644 --- a/third_party/WebKit/Source/core/layout/ng/inline/ng_line_box_fragment_builder.cc +++ b/third_party/WebKit/Source/core/layout/ng/inline/ng_line_box_fragment_builder.cc
@@ -9,6 +9,7 @@ #include "core/layout/ng/inline/ng_inline_node.h" #include "core/layout/ng/inline/ng_physical_line_box_fragment.h" #include "core/layout/ng/ng_exclusion_space.h" +#include "core/layout/ng/ng_fragment.h" #include "core/layout/ng/ng_layout_result.h" #include "core/layout/ng/ng_positioned_float.h" @@ -24,10 +25,31 @@ NGLineBoxFragmentBuilder::~NGLineBoxFragmentBuilder() {} +void NGLineBoxFragmentBuilder::Reset() { + children_.clear(); + offsets_.clear(); + metrics_ = NGLineHeightMetrics(); + inline_size_ = LayoutUnit(); +} + NGLogicalSize NGLineBoxFragmentBuilder::Size() const { return {inline_size_, metrics_.LineHeight().ClampNegativeToZero()}; } +LayoutUnit NGLineBoxFragmentBuilder::ComputeBlockSize() const { + LayoutUnit block_size; + NGWritingMode writing_mode( + FromPlatformWritingMode(node_.Style().GetWritingMode())); + + for (size_t i = 0; i < children_.size(); ++i) { + block_size = std::max( + block_size, offsets_[i].block_offset + + NGFragment(writing_mode, *children_[i]).BlockSize()); + } + + return block_size; +} + const NGPhysicalFragment* NGLineBoxFragmentBuilder::Child::PhysicalFragment() const { return layout_result ? layout_result->PhysicalFragment().get()
diff --git a/third_party/WebKit/Source/core/layout/ng/inline/ng_line_box_fragment_builder.h b/third_party/WebKit/Source/core/layout/ng/inline/ng_line_box_fragment_builder.h index 0abac47..9c25eb6 100644 --- a/third_party/WebKit/Source/core/layout/ng/inline/ng_line_box_fragment_builder.h +++ b/third_party/WebKit/Source/core/layout/ng/inline/ng_line_box_fragment_builder.h
@@ -29,7 +29,10 @@ TextDirection); ~NGLineBoxFragmentBuilder() override; + void Reset(); + NGLogicalSize Size() const final; + LayoutUnit ComputeBlockSize() const; void SetMetrics(const NGLineHeightMetrics&); const NGLineHeightMetrics& Metrics() const { return metrics_; }
diff --git a/third_party/WebKit/Source/core/layout/ng/inline/ng_line_breaker.cc b/third_party/WebKit/Source/core/layout/ng/inline/ng_line_breaker.cc index d975046d..79afe87 100644 --- a/third_party/WebKit/Source/core/layout/ng/inline/ng_line_breaker.cc +++ b/third_party/WebKit/Source/core/layout/ng/inline/ng_line_breaker.cc
@@ -23,14 +23,18 @@ const NGConstraintSpace& space, Vector<NGPositionedFloat>* positioned_floats, Vector<scoped_refptr<NGUnpositionedFloat>>* unpositioned_floats, + NGExclusionSpace* exclusion_space, + unsigned handled_float_index, const NGInlineBreakToken* break_token) : node_(node), constraint_space_(space), positioned_floats_(positioned_floats), unpositioned_floats_(unpositioned_floats), + exclusion_space_(exclusion_space), break_iterator_(node.Text()), shaper_(node.Text().Characters16(), node.Text().length()), spacing_(node.Text()), + handled_floats_end_item_index_(handled_float_index), base_direction_(node_.BaseDirection()) { if (break_token) { item_index_ = break_token->ItemIndex(); @@ -65,7 +69,7 @@ } // Initialize internal states for the next line. -void NGLineBreaker::PrepareNextLine(const NGExclusionSpace& exclusion_space, +void NGLineBreaker::PrepareNextLine(const NGLayoutOpportunity& opportunity, NGLineInfo* line_info) { NGInlineItemResults* item_results = &line_info->Results(); item_results->clear(); @@ -83,18 +87,17 @@ // regardless of 'text-indent'. line_.position = line_info->TextIndent(); - line_.exclusion_space = WTF::MakeUnique<NGExclusionSpace>(exclusion_space); - - // We are only able to calculate our available_width if our container has - // been positioned in the BFC coordinate space yet. - FindNextLayoutOpportunity(); + line_.opportunity = opportunity; + line_.line_left_bfc_offset = opportunity.LineStartOffset(); + line_.line_right_bfc_offset = opportunity.LineEndOffset(); + bfc_block_offset_ = opportunity.BlockStartOffset(); } -bool NGLineBreaker::NextLine(const NGExclusionSpace& exclusion_space, +bool NGLineBreaker::NextLine(const NGLayoutOpportunity& opportunity, NGLineInfo* line_info) { bfc_block_offset_ = constraint_space_.BfcOffset().block_offset; - PrepareNextLine(exclusion_space, line_info); + PrepareNextLine(opportunity, line_info); BreakLine(line_info); line_info->SetEndOffset(offset_); @@ -190,52 +193,8 @@ line_info->SetIsLastLine(true); } -// @return if there are floats that affect current line. -// This is different from the clearance offset in that floats outside of the -// current layout opportunities, such as floats in margin/padding, or floats -// below such floats, are not included. -bool NGLineBreaker::HasFloatsAffectingCurrentLine() const { - return line_.opportunity.InlineSize() != - constraint_space_.AvailableSize().inline_size; -} - -// Update the inline size of the first layout opportunity from the given -// content_offset. -void NGLineBreaker::FindNextLayoutOpportunity() { - NGBfcOffset origin_offset = {constraint_space_.BfcOffset().line_offset, - bfc_block_offset_}; - - line_.opportunity = line_.exclusion_space->FindLayoutOpportunity( - origin_offset, constraint_space_.AvailableSize(), - /* minimum_size */ NGLogicalSize()); - - // When floats/exclusions occupies the entire line (e.g., float: left; width: - // 100%), zero-inline-size opportunities are not included in the iterator. - // Instead, the block offset of the first opportunity is pushed down to avoid - // such floats/exclusions. Set the line box location to it. - bfc_block_offset_ = line_.opportunity.BlockStartOffset(); -} - -// Finds a layout opportunity that has the given minimum inline size, or the one -// without floats/exclusions (and that there will not be wider oppotunities than -// that,) and moves |bfc_block_offset_| down to it. -// -// Used to move lines down when no break opportunities can fit in a line that -// has floats. -void NGLineBreaker::FindNextLayoutOpportunityWithMinimumInlineSize( - LayoutUnit min_inline_size) { - NGBfcOffset origin_offset = {constraint_space_.BfcOffset().line_offset, - bfc_block_offset_}; - - NGLogicalSize minimum_size(min_inline_size, LayoutUnit()); - line_.opportunity = line_.exclusion_space->FindLayoutOpportunity( - origin_offset, constraint_space_.AvailableSize(), minimum_size); - - bfc_block_offset_ = line_.opportunity.BlockStartOffset(); -} - void NGLineBreaker::ComputeLineLocation(NGLineInfo* line_info) const { - LayoutUnit line_bfc_offset = line_.opportunity.LineStartOffset(); + LayoutUnit bfc_line_offset = line_.line_left_bfc_offset; LayoutUnit available_width = line_.AvailableWidth(); // Indenting should move the current position to compute the size of @@ -245,12 +204,12 @@ // Move the line box by indent. Negative indents are ink overflow, let the // line box overflow from the container box. if (IsLtr(line_info->BaseDirection())) - line_bfc_offset += text_indent; + bfc_line_offset += text_indent; available_width -= text_indent; } - line_info->SetLineBfcOffset({line_bfc_offset, bfc_block_offset_}, - available_width); + line_info->SetLineBfcOffset({bfc_line_offset, bfc_block_offset_}, + available_width, line_.position); } bool NGLineBreaker::IsFirstBreakOpportunity(unsigned offset, @@ -499,13 +458,10 @@ // twice. // Ideally rewind can take floats out of floats list, but the difference is // sutble compared to the complexity. - // TODO(kojii): Keep a list of floats in a separate vector, then "commit" them - // inside NGLineLayoutAlgorithm. if (item_index_ < handled_floats_end_item_index_) { MoveToNextOf(item); return ComputeIsBreakableAfter(item_result); } - handled_floats_end_item_index_ = item_index_ + 1; NGBlockNode node(ToLayoutBox(item.GetLayoutObject())); @@ -523,30 +479,52 @@ margins, node, /* break_token */ nullptr); - LayoutUnit inline_size = ComputeInlineSizeForUnpositionedFloat( - constraint_space_, unpositioned_float.get()); + LayoutUnit inline_margin_size = + (ComputeInlineSizeForUnpositionedFloat(constraint_space_, + unpositioned_float.get()) + + margins.InlineSum()) + .ClampNegativeToZero(); - // We can only determine if our float will fit if we have an available_width - // I.e. we may not have come across any text yet, in order to be able to - // resolve the BFC position. - bool float_does_not_fit = !line_.CanFit(inline_size + margins.InlineSum()); + // The float should be positioned after the current line if: + // - It can't fit. + // - It will be moved down due to block-start edge alignment. + // - It will be moved down due to clearance. + bool float_after_line = + !line_.CanFit(inline_margin_size) || + exclusion_space_->LastFloatBlockStart() > bfc_block_offset_ || + exclusion_space_->ClearanceOffset(float_style.Clear()) > + bfc_block_offset_; // Check if we already have a pending float. That's because a float cannot be // higher than any block or floated box generated before. - if (!unpositioned_floats_->IsEmpty() || float_does_not_fit) { + if (!unpositioned_floats_->IsEmpty() || float_after_line) { unpositioned_floats_->push_back(std::move(unpositioned_float)); } else { LayoutUnit origin_block_offset = bfc_block_offset_; NGPositionedFloat positioned_float = PositionFloat( origin_block_offset, constraint_space_.BfcOffset().block_offset, - unpositioned_float.get(), constraint_space_, - line_.exclusion_space.get()); + unpositioned_float.get(), constraint_space_, exclusion_space_); positioned_floats_->push_back(positioned_float); - // We need to recalculate the available_width as the float probably - // consumed space on the line. - FindNextLayoutOpportunity(); + DCHECK_EQ(positioned_float.bfc_offset.block_offset, + bfc_block_offset_ + margins.block_start); + + if (float_style.Floating() == EFloat::kLeft) { + line_.line_left_bfc_offset = std::max( + line_.line_left_bfc_offset, + positioned_float.bfc_offset.line_offset + inline_margin_size - + margins.LineLeft(TextDirection::kLtr)); + } else { + line_.line_right_bfc_offset = + std::min(line_.line_right_bfc_offset, + positioned_float.bfc_offset.line_offset - + margins.LineLeft(TextDirection::kLtr)); + } + + DCHECK_GE(line_.line_left_bfc_offset, LayoutUnit()); + DCHECK_GE(line_.line_right_bfc_offset, LayoutUnit()); + DCHECK_GE(line_.AvailableWidth(), LayoutUnit()); } MoveToNextOf(item); @@ -697,23 +675,6 @@ // Reaching here means that the rewind point was not found. - // When the first break opportunity overflows and if the current line has - // floats or intruding floats, we need to find the next layout opportunity - // which will fit the first break opportunity. - // Doing so will move the line down to where there are narrower floats (and - // thus wider available width,) or no floats. - if (HasFloatsAffectingCurrentLine()) { - FindNextLayoutOpportunityWithMinimumInlineSize(line_.position); - // Moving the line down widened the available width. Need to rewind items - // that depend on old available width, but it's not trivial to rewind all - // the states. For the simplicity, rewind to the beginning of the line. - Rewind(line_info, 0); - SetCurrentStyle(line_info->LineStyle()); - line_.position = line_info->TextIndent(); - BreakLine(line_info); - return; - } - // Let this line overflow. // If there was a break opporunity, the overflow should stop there. if (break_before) @@ -726,7 +687,7 @@ NGInlineItemResults* item_results = &line_info->Results(); DCHECK_LT(new_end, item_results->size()); - // TODO(ikilpatrick): Add rewinding of exclusions. + // TODO(ikilpatrick): Add DCHECK that we never rewind past any floats. if (new_end) { // Use |results[new_end - 1].end_offset| because it may have been truncated @@ -741,8 +702,6 @@ // TODO(kojii): Should we keep results for the next line? We don't need to // re-layout atomic inlines. - // TODO(kojii): Removing processed floats is likely a problematic. Keep - // floats in this line, or keep it for the next line. item_results->Shrink(new_end); line_info->SetIsLastLine(false);
diff --git a/third_party/WebKit/Source/core/layout/ng/inline/ng_line_breaker.h b/third_party/WebKit/Source/core/layout/ng/inline/ng_line_breaker.h index bd47cd3..adb5afe 100644 --- a/third_party/WebKit/Source/core/layout/ng/inline/ng_line_breaker.h +++ b/third_party/WebKit/Source/core/layout/ng/inline/ng_line_breaker.h
@@ -34,19 +34,19 @@ const NGConstraintSpace&, Vector<NGPositionedFloat>*, Vector<scoped_refptr<NGUnpositionedFloat>>*, + NGExclusionSpace*, + unsigned handled_float_index, const NGInlineBreakToken* = nullptr); ~NGLineBreaker() {} // Compute the next line break point and produces NGInlineItemResults for // the line. - bool NextLine(const NGExclusionSpace&, NGLineInfo*); + bool NextLine(const NGLayoutOpportunity&, NGLineInfo*); // Create an NGInlineBreakToken for the last line returned by NextLine(). scoped_refptr<NGInlineBreakToken> CreateBreakToken( std::unique_ptr<const NGInlineLayoutStateStack>) const; - NGExclusionSpace* ExclusionSpace() { return line_.exclusion_space.get(); } - private: // This struct holds information for the current line. struct LineData { @@ -59,7 +59,8 @@ // The current opportunity. NGLayoutOpportunity opportunity; - std::unique_ptr<NGExclusionSpace> exclusion_space; + LayoutUnit line_left_bfc_offset; + LayoutUnit line_right_bfc_offset; // We don't create "certain zero-height line boxes". // https://drafts.csswg.org/css2/visuren.html#phantom-line-box @@ -72,7 +73,10 @@ // the next line. bool is_after_forced_break = false; - LayoutUnit AvailableWidth() const { return opportunity.InlineSize(); } + LayoutUnit AvailableWidth() const { + DCHECK_GE(line_right_bfc_offset, line_left_bfc_offset); + return line_right_bfc_offset - line_left_bfc_offset; + } bool CanFit() const { return position <= AvailableWidth(); } bool CanFit(LayoutUnit extra) const { return position + extra <= AvailableWidth(); @@ -81,11 +85,7 @@ void BreakLine(NGLineInfo*); - void PrepareNextLine(const NGExclusionSpace&, NGLineInfo*); - - bool HasFloatsAffectingCurrentLine() const; - void FindNextLayoutOpportunity(); - void FindNextLayoutOpportunityWithMinimumInlineSize(LayoutUnit); + void PrepareNextLine(const NGLayoutOpportunity&, NGLineInfo*); void ComputeLineLocation(NGLineInfo*) const; @@ -142,9 +142,12 @@ const NGConstraintSpace& constraint_space_; Vector<NGPositionedFloat>* positioned_floats_; Vector<scoped_refptr<NGUnpositionedFloat>>* unpositioned_floats_; + NGExclusionSpace* exclusion_space_; + unsigned item_index_ = 0; unsigned offset_ = 0; bool previous_line_had_forced_break_ = false; + LayoutUnit bfc_line_offset_; LayoutUnit bfc_block_offset_; LazyLineBreakIterator break_iterator_; HarfBuzzShaper shaper_; @@ -152,7 +155,7 @@ const Hyphenation* hyphenation_ = nullptr; // Keep track of handled float items. See HandleFloat(). - unsigned handled_floats_end_item_index_ = 0; + unsigned handled_floats_end_item_index_; // The current base direction for the bidi algorithm. // This is copied from NGInlineNode, then updated after each forced line break
diff --git a/third_party/WebKit/Source/core/layout/ng/inline/ng_line_breaker_test.cc b/third_party/WebKit/Source/core/layout/ng/inline/ng_line_breaker_test.cc index 631172fd..b5b37a7d3 100644 --- a/third_party/WebKit/Source/core/layout/ng/inline/ng_line_breaker_test.cc +++ b/third_party/WebKit/Source/core/layout/ng/inline/ng_line_breaker_test.cc
@@ -49,8 +49,13 @@ NGLineInfo line_info; while (!break_token || !break_token->IsFinished()) { NGLineBreaker line_breaker(node, *space, &positioned_floats, - &unpositioned_floats, break_token.get()); - if (!line_breaker.NextLine(exclusion_space, &line_info)) + &unpositioned_floats, &exclusion_space, 0u, + break_token.get()); + if (!line_breaker.NextLine( + NGLayoutOpportunity( + NGBfcOffset(), + NGLogicalSize({available_width, NGSizeIndefinite})), + &line_info)) break; break_token = line_breaker.CreateBreakToken(nullptr);
diff --git a/third_party/WebKit/Source/core/layout/ng/ng_exclusion_space.cc b/third_party/WebKit/Source/core/layout/ng/ng_exclusion_space.cc index c279426..58b959d 100644 --- a/third_party/WebKit/Source/core/layout/ng/ng_exclusion_space.cc +++ b/third_party/WebKit/Source/core/layout/ng/ng_exclusion_space.cc
@@ -51,6 +51,22 @@ return NGLayoutOpportunity(); } +Vector<NGLayoutOpportunity> NGExclusionSpace::AllLayoutOpportunities( + const NGBfcOffset& offset, + const NGLogicalSize& available_size) const { + Vector<NGLayoutOpportunity> opportunities; + NGLayoutOpportunityIterator opportunity_iter(*this, available_size, offset); + + while (true) { + opportunities.push_back(opportunity_iter.Next()); + + if (opportunity_iter.IsAtEnd()) + break; + } + + return opportunities; +} + LayoutUnit NGExclusionSpace::ClearanceOffset(EClear clear_type) const { switch (clear_type) { case EClear::kNone:
diff --git a/third_party/WebKit/Source/core/layout/ng/ng_exclusion_space.h b/third_party/WebKit/Source/core/layout/ng/ng_exclusion_space.h index 759febe..e4de411 100644 --- a/third_party/WebKit/Source/core/layout/ng/ng_exclusion_space.h +++ b/third_party/WebKit/Source/core/layout/ng/ng_exclusion_space.h
@@ -36,6 +36,10 @@ const NGLogicalSize& available_size, const NGLogicalSize& minimum_size) const; + Vector<NGLayoutOpportunity> AllLayoutOpportunities( + const NGBfcOffset& offset, + const NGLogicalSize& available_size) const; + // Returns the clearance offset based on the provided {@code clear_type}. LayoutUnit ClearanceOffset(EClear clear_type) const;
diff --git a/third_party/WebKit/Source/devtools/front_end/application_test_runner/ServiceWorkersTestRunner.js b/third_party/WebKit/Source/devtools/front_end/application_test_runner/ServiceWorkersTestRunner.js index 6b90250..edf9e14 100644 --- a/third_party/WebKit/Source/devtools/front_end/application_test_runner/ServiceWorkersTestRunner.js +++ b/third_party/WebKit/Source/devtools/front_end/application_test_runner/ServiceWorkersTestRunner.js
@@ -43,7 +43,8 @@ ApplicationTestRunner.dumpServiceWorkersView = function() { var swView = UI.panels.resources.visibleView; - return swView._reportView._sectionList.childTextNodes() + return swView._currentWorkersView._sectionList.childTextNodes() + .concat(swView._otherWorkersView._sectionList.childTextNodes()) .map(function(node) { return node.textContent.replace(/Received.*/, 'Received').replace(/#\d+/, '#N'); })
diff --git a/third_party/WebKit/Source/devtools/front_end/common/ParsedURL.js b/third_party/WebKit/Source/devtools/front_end/common/ParsedURL.js index 31e7fa1c..c7ff183 100644 --- a/third_party/WebKit/Source/devtools/front_end/common/ParsedURL.js +++ b/third_party/WebKit/Source/devtools/front_end/common/ParsedURL.js
@@ -158,7 +158,9 @@ */ static extractName(url) { var index = url.lastIndexOf('/'); - return index !== -1 ? url.substr(index + 1) : url; + var pathAndQuery = index !== -1 ? url.substr(index + 1) : url; + index = pathAndQuery.indexOf('?'); + return index < 0 ? pathAndQuery : pathAndQuery.substr(0, index); } /**
diff --git a/third_party/WebKit/Source/devtools/front_end/platform/utilities.js b/third_party/WebKit/Source/devtools/front_end/platform/utilities.js index dca1766..817fa42 100644 --- a/third_party/WebKit/Source/devtools/front_end/platform/utilities.js +++ b/third_party/WebKit/Source/devtools/front_end/platform/utilities.js
@@ -126,6 +126,24 @@ }; /** + * @param {string} query + * @return {!RegExp} + */ +String.filterRegex = function(query) { + const toEscape = String.regexSpecialCharacters(); + var regexString = ''; + for (var i = 0; i < query.length; ++i) { + var c = query.charAt(i); + if (toEscape.indexOf(c) !== -1) + c = '\\' + c; + if (i) + regexString += '[^\\0' + c + ']*'; + regexString += c; + } + return new RegExp(regexString, 'i'); +}; + +/** * @return {string} */ String.prototype.escapeHTML = function() {
diff --git a/third_party/WebKit/Source/devtools/front_end/quick_open/FilteredListWidget.js b/third_party/WebKit/Source/devtools/front_end/quick_open/FilteredListWidget.js index 0d964529..b1595f8e 100644 --- a/third_party/WebKit/Source/devtools/front_end/quick_open/FilteredListWidget.js +++ b/third_party/WebKit/Source/devtools/front_end/quick_open/FilteredListWidget.js
@@ -54,24 +54,6 @@ } /** - * @param {string} query - * @return {!RegExp} - */ - static filterRegex(query) { - const toEscape = String.regexSpecialCharacters(); - var regexString = ''; - for (var i = 0; i < query.length; ++i) { - var c = query.charAt(i); - if (toEscape.indexOf(c) !== -1) - c = '\\' + c; - if (i) - regexString += '[^\\0' + c + ']*'; - regexString += c; - } - return new RegExp(regexString, 'i'); - } - - /** * @param {!Element} element * @param {string} query * @param {boolean=} caseInsensitive @@ -346,7 +328,7 @@ var query = this._provider.rewriteQuery(this._cleanValue()); this._query = query; - var filterRegex = query ? QuickOpen.FilteredListWidget.filterRegex(query) : null; + var filterRegex = query ? String.filterRegex(query) : null; var filteredItems = [];
diff --git a/third_party/WebKit/Source/devtools/front_end/resources/ServiceWorkersView.js b/third_party/WebKit/Source/devtools/front_end/resources/ServiceWorkersView.js index ec78eb7..71a5843 100644 --- a/third_party/WebKit/Source/devtools/front_end/resources/ServiceWorkersView.js +++ b/third_party/WebKit/Source/devtools/front_end/resources/ServiceWorkersView.js
@@ -7,11 +7,14 @@ Resources.ServiceWorkersView = class extends UI.VBox { constructor() { super(true); + this.registerRequiredCSS('resources/serviceWorkersView.css'); - this._reportView = new UI.ReportView(Common.UIString('Service Workers')); - this._reportView.show(this.contentElement); + this._currentWorkersView = new UI.ReportView(Common.UIString('Service Workers')); + this.contentElement.classList.add('service-worker-list'); + this._currentWorkersView.show(this.contentElement); + this._currentWorkersView.element.classList.add('service-workers-this-origin'); - this._toolbar = this._reportView.createToolbar(); + this._toolbar = this._currentWorkersView.createToolbar(); this._toolbar.makeWrappable(false, true); /** @type {!Map<!SDK.ServiceWorkerRegistration, !Resources.ServiceWorkersView.Section>} */ @@ -22,6 +25,29 @@ /** @type {?SDK.SecurityOriginManager} */ this._securityOriginManager = null; + this._filterThrottler = new Common.Throttler(300); + + this._otherWorkers = this.contentElement.createChild('div', 'service-workers-other-origin'); + var filterElement = this._otherWorkers.createChild('div', 'service-worker-filter'); + this._checkboxElement = filterElement.createChild('input', 'service-worker-filter-show-all-checkbox'); + this._checkboxElement.type = 'checkbox'; + this._checkboxElement.setAttribute('id', 'expand-all'); + this._textElement = filterElement.createChild('label', 'service-worker-filter-label'); + this._textElement.textContent = Common.UIString('Service workers from other domains'); + this._textElement.setAttribute('for', 'expand-all'); + this._checkboxElement.addEventListener('change', () => this._filterChanged()); + + var toolbar = new UI.Toolbar('service-worker-filter-toolbar', filterElement); + this._filter = new UI.ToolbarInput('Filter', 1); + this._filter.addEventListener(UI.ToolbarInput.Event.TextChanged, () => this._filterChanged()); + toolbar.appendToolbarItem(this._filter); + + this._otherWorkersView = new UI.ReportView(); + this._otherWorkersView.show(this._otherWorkers); + this._otherWorkersView.element.classList.add('service-workers-for-other-origins'); + + this._updateCollapsedStyle(); + this._toolbar.appendToolbarItem(MobileThrottling.throttlingManager().createOfflineToolbarCheckbox()); var updateOnReloadSetting = Common.settings.createSetting('serviceWorkerUpdateOnReload', false); updateOnReloadSetting.setTitle(Common.UIString('Update on reload')); @@ -33,11 +59,6 @@ var fallbackToNetwork = new UI.ToolbarSettingCheckbox( bypassServiceWorkerSetting, Common.UIString('Bypass Service Worker and load resources from the network')); this._toolbar.appendToolbarItem(fallbackToNetwork); - this._showAllCheckbox = new UI.ToolbarCheckbox( - Common.UIString('Show all'), Common.UIString('Show all Service Workers regardless of the origin')); - this._showAllCheckbox.setRightAligned(true); - this._showAllCheckbox.inputElement.addEventListener('change', this._updateSectionVisibility.bind(this), false); - this._toolbar.appendToolbarItem(this._showAllCheckbox); /** @type {!Map<!SDK.ServiceWorkerManager, !Array<!Common.EventTarget.EventDescriptor>>}*/ this._eventListeners = new Map(); @@ -84,27 +105,37 @@ } _updateSectionVisibility() { - var securityOrigins = new Set(this._securityOriginManager.securityOrigins()); - var matchingSections = new Set(); + var hasOthers = false; + var hasThis = false; + var movedSections = []; for (var section of this._sections.values()) { - if (securityOrigins.has(section._registration.securityOrigin)) - matchingSections.add(section._section); + var expectedView = this._getReportViewForOrigin(section._registration.securityOrigin); + hasOthers |= expectedView === this._otherWorkersView; + hasThis |= expectedView === this._currentWorkersView; + if (section._section.parentWidget() !== expectedView) + movedSections.push(section); } - this._reportView.sortSections((a, b) => { - var aMatching = matchingSections.has(a); - var bMatching = matchingSections.has(b); - if (aMatching === bMatching) - return a.title().localeCompare(b.title()); - return aMatching ? -1 : 1; - }); + for (var section of movedSections) { + var registration = section._registration; + this._removeRegistrationFromList(registration); + this._updateRegistration(registration, true); + } + var scorer = new Sources.FilePathScoreFunction(this._filter.value()); + this._otherWorkersView.sortSections((a, b) => { + var cmp = scorer.score(b.title(), null) - scorer.score(a.title(), null); + return cmp === 0 ? a.title().localeCompare(b.title()) : cmp; + }); for (var section of this._sections.values()) { - if (this._showAllCheckbox.checked() || securityOrigins.has(section._registration.securityOrigin)) + if (section._section.parentWidget() === this._currentWorkersView || + this._isRegistrationVisible(section._registration)) section._section.showWidget(); else section._section.hideWidget(); } + this.contentElement.classList.toggle('service-worker-has-current', hasThis); + this._otherWorkers.classList.toggle('hidden', !hasOthers); } /** @@ -120,8 +151,7 @@ var hasNonDeletedRegistrations = false; var securityOrigins = new Set(this._securityOriginManager.securityOrigins()); for (var registration of this._manager.registrations().values()) { - var visible = this._showAllCheckbox.checked() || securityOrigins.has(registration.securityOrigin); - if (!visible) + if (!securityOrigins.has(registration.securityOrigin) && !this._isRegistrationVisible(registration)) continue; if (!registration.canBeRemoved()) { hasNonDeletedRegistrations = true; @@ -133,24 +163,38 @@ return; for (var registration of this._manager.registrations().values()) { - var visible = this._showAllCheckbox.checked() || securityOrigins.has(registration.securityOrigin); - if (visible && registration.canBeRemoved()) + var visible = securityOrigins.has(registration.securityOrigin) || this._isRegistrationVisible(registration); + if (!visible && registration.canBeRemoved()) this._removeRegistrationFromList(registration); } } /** - * @param {!SDK.ServiceWorkerRegistration} registration + * @param {string} origin + * @return {!UI.ReportView} */ - _updateRegistration(registration) { + _getReportViewForOrigin(origin) { + if (this._securityOriginManager.securityOrigins().includes(origin)) + return this._currentWorkersView; + else + return this._otherWorkersView; + } + + /** + * @param {!SDK.ServiceWorkerRegistration} registration + * @param {boolean=} skipUpdate + */ + _updateRegistration(registration, skipUpdate) { var section = this._sections.get(registration); if (!section) { + var title = Resources.ServiceWorkersView._displayScopeURL(registration.scopeURL); section = new Resources.ServiceWorkersView.Section( /** @type {!SDK.ServiceWorkerManager} */ (this._manager), - this._reportView.appendSection(Resources.ServiceWorkersView._displayScopeURL(registration.scopeURL)), - registration); + this._getReportViewForOrigin(registration.securityOrigin).appendSection(title), registration); this._sections.set(registration, section); } + if (skipUpdate) + return; this._updateSectionVisibility(); section._scheduleUpdate(); } @@ -171,6 +215,35 @@ if (section) section._section.detach(); this._sections.delete(registration); + this._updateSectionVisibility(); + } + + /** + * @param {!SDK.ServiceWorkerRegistration} registration + * @return {boolean} + */ + _isRegistrationVisible(registration) { + var filterString = this._filter.value(); + if (!filterString || !registration.scopeURL) + return true; + + var regex = String.filterRegex(filterString); + return registration.scopeURL.match(regex); + } + + _filterChanged() { + this._updateCollapsedStyle(); + this._filterThrottler.schedule(() => Promise.resolve(this._updateSectionVisibility())); + } + + _updateCollapsedStyle() { + var collapsed = !this._checkboxElement.checked; + this._otherWorkers.classList.toggle('service-worker-filter-collapsed', collapsed); + if (collapsed) + this._otherWorkersView.hideWidget(); + else + this._otherWorkersView.showWidget(); + this._otherWorkersView.setHeaderVisible(false); } /**
diff --git a/third_party/WebKit/Source/devtools/front_end/resources/module.json b/third_party/WebKit/Source/devtools/front_end/resources/module.json index 49a4afa..b3490207 100644 --- a/third_party/WebKit/Source/devtools/front_end/resources/module.json +++ b/third_party/WebKit/Source/devtools/front_end/resources/module.json
@@ -25,7 +25,8 @@ "object_ui", "perf_ui", "mobile_throttling", - "network" + "network", + "sources" ], "scripts": [ "ApplicationCacheModel.js",
diff --git a/third_party/WebKit/Source/devtools/front_end/resources/serviceWorkersView.css b/third_party/WebKit/Source/devtools/front_end/resources/serviceWorkersView.css index 9f1a05a..01a18631 100644 --- a/third_party/WebKit/Source/devtools/front_end/resources/serviceWorkersView.css +++ b/third_party/WebKit/Source/devtools/front_end/resources/serviceWorkersView.css
@@ -111,3 +111,73 @@ /** Simulate CodeMirror that is shown above */ padding: 4px; } + +.service-worker-list { + background-color: #f9f9f9; +} + +.service-workers-this-origin { + flex-shrink: 0; + flex-grow: 0; +} + +.service-workers-other-origin { + display: flex; + flex-direction: column; + flex-grow: 1; + flex-shrink: 1; +} + +.service-worker-has-current .service-workers-other-origin { + margin-top: 16px; + border-top: 1px solid rgb(230, 230, 230) +} + +.service-worker-filter{ + padding: 16px 20px 12px 12px; + flex-grow: 0; + flex-shrink: 0; + background-color: white; + border-bottom: solid 1px rgb(230, 230, 230); +} + +.service-worker-filter-show-all-checkbox { + height: 1px; + width: 1px; + margin: 0; +} + +.service-worker-filter-label { + cursor: pointer; + margin-left: 4px; +} + +.service-worker-filter-label::before { + -webkit-user-select: none; + -webkit-mask-image: url(Images/treeoutlineTriangles.png); + -webkit-mask-size: 32px 24px; + content: "aa"; + color: transparent; + background-color: rgb(110, 110, 110); + text-shadow: none; + height: 12px; +} + +@media (-webkit-min-device-pixel-ratio: 1.1) { +.service-worker-filter-label::before { + -webkit-mask-image: url(Images/treeoutlineTriangles_2x.png); +} +} /* media */ + +.service-worker-filter-show-all-checkbox:checked + .service-worker-filter-label::before { + -webkit-mask-position: -16px 0; +} + +.service-worker-filter-toolbar { + margin: 8px 10px 0 12px; + max-width: 530px; +} + +.service-worker-filter-collapsed .service-worker-filter-toolbar { + display: none; +}
diff --git a/third_party/WebKit/Source/devtools/front_end/ui/ReportView.js b/third_party/WebKit/Source/devtools/front_end/ui/ReportView.js index 6e21799..d66ea3b 100644 --- a/third_party/WebKit/Source/devtools/front_end/ui/ReportView.js +++ b/third_party/WebKit/Source/devtools/front_end/ui/ReportView.js
@@ -6,7 +6,7 @@ */ UI.ReportView = class extends UI.VBox { /** - * @param {string} title + * @param {string=} title */ constructor(title) { super(true); @@ -85,6 +85,13 @@ for (var section of sections) section.show(this._sectionList); } + + /** + * @param {boolean} visible + */ + setHeaderVisible(visible) { + this._headerElement.classList.toggle('hidden', !visible); + } }; /**
diff --git a/tools/mb/mb_config.pyl b/tools/mb/mb_config.pyl index ee18e1e..94509ba 100644 --- a/tools/mb/mb_config.pyl +++ b/tools/mb/mb_config.pyl
@@ -248,9 +248,6 @@ 'Site Isolation Android': 'android_release_bot_minimal_symbols_arm64', 'Site Isolation Linux': 'release_trybot', 'Site Isolation Win': 'release_trybot_x86', - 'WebKit Linux - RandomOrder': 'release_trybot', - 'WebKit Mac - RandomOrder': 'release_trybot', - 'WebKit Win - RandomOrder': 'release_bot_x86_minimal_symbols', 'Win 10 Fast Ring': 'release_trybot', 'Windows deterministic': 'release_bot_x86_minimal_symbols', 'Windows Clang deterministic': 'clang_release_bot_minimal_symbols_x86',
diff --git a/tools/metrics/histograms/enums.xml b/tools/metrics/histograms/enums.xml index 731474d..661c3fd 100644 --- a/tools/metrics/histograms/enums.xml +++ b/tools/metrics/histograms/enums.xml
@@ -37698,6 +37698,10 @@ </enum> <enum name="SRTPromptUsage"> + <obsolete> + Deprecated as of 2017-11-01. Replaced with + SoftwareReporterPromptDialogResponse. + </obsolete> <int value="0" label="Shown"/> <int value="1" label="Accepted"/> <int value="2" label="Denied"/> @@ -38656,21 +38660,21 @@ </enum> <enum name="SwReporterStep"> - <int value="0" label="Explicit request"/> - <int value="1" label="Startup retry"/> - <int value="2" label="Retried too many times"/> + <int value="0" label="Explicit request (deprecated)"/> + <int value="1" label="Startup retry (deprecated)"/> + <int value="2" label="Retried too many times (deprecated)"/> <int value="3" label="Start execution"/> <int value="4" label="Failed to start"/> - <int value="5" label="Registry exit code"/> - <int value="6" label="Reset retries"/> + <int value="5" label="Registry exit code (deprecated)"/> + <int value="6" label="Reset retries (deprecated)"/> <int value="7" label="Begin SRT download"/> <int value="8" label="No browser to show prompt"/> - <int value="9" label="No local state"/> + <int value="9" label="No local state (deprecated)"/> <int value="10" label="No prompt needed"/> <int value="11" label="No prompt field trial"/> <int value="12" label="Already prompted"/> - <int value="13" label="Daily run"/> - <int value="14" label="Added to menu"/> + <int value="13" label="Daily run (deprecated)"/> + <int value="14" label="Added to menu (deprecated)"/> </enum> <enum name="SyncAttachmentStoreResult">
diff --git a/tools/metrics/histograms/histograms.xml b/tools/metrics/histograms/histograms.xml index edcbfa4..7becba43 100644 --- a/tools/metrics/histograms/histograms.xml +++ b/tools/metrics/histograms/histograms.xml
@@ -80452,6 +80452,10 @@ </histogram> <histogram name="SoftwareReporter.PromptUsage" enum="SRTPromptUsage"> + <obsolete> + Deprecated as of 2017-11-01. Replaced with + SoftwareReporter.PromptDialogResponse. + </obsolete> <owner>mad@chromium.org</owner> <summary>Usage of the Software Removal Tool (SRT) Prompt.</summary> </histogram>
diff --git a/tools/perf/core/perf_data_generator.py b/tools/perf/core/perf_data_generator.py index 1cf72e62..7f9b902 100755 --- a/tools/perf/core/perf_data_generator.py +++ b/tools/perf/core/perf_data_generator.py
@@ -611,41 +611,12 @@ 'ignore_task_failure': ignore_task_failure, 'io_timeout': io_timeout if io_timeout else 600, # 10 minutes 'dimension_sets': swarming_dimensions, - 'upload_test_results': False, + 'upload_test_results': True, } - if step_name in BENCHMARKS_TO_UPLOAD_TO_FLAKINESS_DASHBOARD: - result['swarming']['upload_test_results'] = True return result -# Manually curated for now. System health is in here because it's an important -# benchmark. Others are semi randomly chosen; they've failed on the waterfall -# recently, so should be useful to upload. -BENCHMARKS_TO_UPLOAD_TO_FLAKINESS_DASHBOARD = [ - 'battor.trivial_pages', - 'blink_perf.layout', - 'blink_perf.owp_storage', - 'loading.desktop', - 'performance_browser_tests', - 'service_worker.service_worker', - 'smoothness.top_25_smooth', - 'smoothness.tough_texture_upload_cases', - 'smoothness.tough_webgl_ad_cases', - 'system_health.common_desktop', - 'system_health.common_mobile', - 'system_health.memory_desktop', - 'system_health.memory_mobile', - 'v8.browsing_desktop', - 'v8.browsing_mobile', - 'v8.runtimestats.browsing_desktop', - 'v8.runtimestats.browsing_mobile', -] - - -BENCHMARKS_TO_OUTPUT_HISTOGRAMS = [ - 'dummy_benchmark.noisy_benchmark_1', - 'dummy_benchmark.stable_benchmark_1', -] +BENCHMARKS_TO_OUTPUT_HISTOGRAMS = [] def generate_telemetry_test(swarming_dimensions, benchmark_name, browser):
diff --git a/tools/perf/core/perf_data_generator_unittest.py b/tools/perf/core/perf_data_generator_unittest.py index f03f6f7..22a7977 100644 --- a/tools/perf/core/perf_data_generator_unittest.py +++ b/tools/perf/core/perf_data_generator_unittest.py
@@ -92,7 +92,7 @@ 'can_use_on_swarming_builders': True, 'expiration': 36000, 'io_timeout': 600, - 'upload_test_results': False, + 'upload_test_results': True, }, 'name': 'speedometer', 'isolate_name': 'telemetry_perf_tests', @@ -116,7 +116,7 @@ 'can_use_on_swarming_builders': True, 'expiration': 36000, 'io_timeout': 600, - 'upload_test_results': False, + 'upload_test_results': True, }, 'name': 'speedometer.reference', 'isolate_name': 'telemetry_perf_tests', @@ -150,28 +150,6 @@ '--webview-embedder-apk=../../out/Release/apks/SystemWebViewShell.apk']) self.assertEquals(test['isolate_name'], 'telemetry_perf_webview_tests') - def testGenerateTelemetryTestsWithUploadToFlakinessDashboard(self): - swarming_dimensions = [{'os': 'SkyNet', 'id': 'T-850', 'pool': 'T-RIP'}] - test = perf_data_generator.generate_telemetry_test( - swarming_dimensions, 'system_health.common_desktop', 'release') - expected_generated_test = { - 'override_compile_targets': ['telemetry_perf_tests'], - 'args': ['system_health.common_desktop', '-v', '--upload-results', - '--browser=release', '--output-format=chartjson'], - 'swarming': { - 'ignore_task_failure': False, - 'dimension_sets': [{'os': 'SkyNet', 'id': 'T-850', 'pool': 'T-RIP'}], - 'hard_timeout': 10800, - 'can_use_on_swarming_builders': True, - 'expiration': 36000, - 'io_timeout': 600, - 'upload_test_results': True, - }, - 'name': 'system_health.common_desktop', - 'isolate_name': 'telemetry_perf_tests', - } - self.assertEquals(test, expected_generated_test) - def testGenerateTelemetryTestsBlacklistedReferenceBuildTest(self): class BlacklistedBenchmark(benchmark.Benchmark): @classmethod @@ -337,7 +315,6 @@ def testListsAlphabetical(self): keys = [ - 'BENCHMARKS_TO_UPLOAD_TO_FLAKINESS_DASHBOARD', 'BENCHMARK_REF_BUILD_BLACKLIST', 'SVELTE_DEVICE_LIST' ]
diff --git a/ui/gfx/geometry/insets_f.h b/ui/gfx/geometry/insets_f.h index 30c2ff2..3230287 100644 --- a/ui/gfx/geometry/insets_f.h +++ b/ui/gfx/geometry/insets_f.h
@@ -75,6 +75,11 @@ return InsetsF(-top_, -left_, -bottom_, -right_); } + InsetsF Scale(float scale) const { + return InsetsF(scale * top(), scale * left(), scale * bottom(), + scale * right()); + } + // Returns a string representation of the insets. std::string ToString() const;
diff --git a/ui/views/BUILD.gn b/ui/views/BUILD.gn index d63c16b..8a40819 100644 --- a/ui/views/BUILD.gn +++ b/ui/views/BUILD.gn
@@ -2,12 +2,14 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. +import("//build/buildflag_header.gni") import("//build/config/features.gni") import("//build/config/ui.gni") +import("//components/vector_icons/vector_icons.gni") import("//testing/test.gni") import("//ui/base/ui_features.gni") import("//ui/ozone/ozone.gni") -import("//components/vector_icons/vector_icons.gni") +import("//ui/views/features.gni") config("flags") { defines = [ "TOOLKIT_VIEWS=1" ] @@ -30,6 +32,12 @@ ] } +buildflag_header("features") { + header = "features.h" + flags = + [ "ENABLE_NATIVE_WINDOW_NAV_BUTTONS=$enable_native_window_nav_buttons" ] +} + component("views") { all_dependent_configs = [ ":flags" ] @@ -231,7 +239,6 @@ "window/frame_background.h", "window/frame_buttons.h", "window/native_frame_view.h", - "window/nav_button_provider.h", "window/non_client_view.h", "window/window_button_order_provider.h", "window/window_resources.h", @@ -433,6 +440,7 @@ defines = [ "VIEWS_IMPLEMENTATION" ] deps = [ + ":features", "//base:i18n", "//base/third_party/dynamic_annotations", "//cc/paint",
diff --git a/ui/views/features.gni b/ui/views/features.gni new file mode 100644 index 0000000..e5222f8 --- /dev/null +++ b/ui/views/features.gni
@@ -0,0 +1,13 @@ +# Copyright 2017 The Chromium Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +import("//build/config/linux/gtk/gtk.gni") +import("//build/config/ui.gni") + +declare_args() { + # Whether we should draw the minimize, maximize/restore, and close + # buttons using the system theme. Only used on Linux with GTK3. + enable_native_window_nav_buttons = + use_aura && !use_ozone && is_desktop_linux && use_gtk3 +}
diff --git a/ui/views/linux_ui/linux_ui.h b/ui/views/linux_ui/linux_ui.h index 82ac466..d86cf22 100644 --- a/ui/views/linux_ui/linux_ui.h +++ b/ui/views/linux_ui/linux_ui.h
@@ -8,12 +8,14 @@ #include <string> #include "base/callback.h" +#include "build/buildflag.h" #include "third_party/skia/include/core/SkColor.h" #include "ui/base/ime/linux/linux_input_method_context_factory.h" #include "ui/base/ime/linux/text_edit_key_bindings_delegate_auralinux.h" #include "ui/gfx/linux_font_delegate.h" #include "ui/shell_dialogs/shell_dialog_linux.h" #include "ui/views/controls/button/button.h" +#include "ui/views/features.h" #include "ui/views/linux_ui/status_icon_linux.h" #include "ui/views/views_export.h" @@ -41,9 +43,12 @@ class DeviceScaleFactorObserver; class LabelButton; class LabelButtonBorder; -class NavButtonProvider; class WindowButtonOrderObserver; +#if BUILDFLAG(ENABLE_NATIVE_WINDOW_NAV_BUTTONS) +class NavButtonProvider; +#endif + // Adapter class with targets to render like different toolkits. Set by any // project that wants to do linux desktop native rendering. // @@ -167,9 +172,11 @@ virtual void RemoveDeviceScaleFactorObserver( DeviceScaleFactorObserver* observer) = 0; +#if BUILDFLAG(ENABLE_NATIVE_WINDOW_NAV_BUTTONS) // Returns a new NavButtonProvider, or nullptr if the underlying // toolkit does not support drawing client-side navigation buttons. virtual std::unique_ptr<NavButtonProvider> CreateNavButtonProvider() = 0; +#endif }; } // namespace views