From 33c62aa3f0272068cda748b87d18d76ce7258975 Mon Sep 17 00:00:00 2001 From: Clark DuVall Date: Thu, 18 Mar 2021 17:16:17 +0000 Subject: [PATCH] Remove isolated splits synthetic field trial This was launched in M89 and there are no plans for more experiments in newer milestones. Bug: 1126301 Change-Id: I3c9a19f54af45eebfcc203f336468b00e0521a55 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2768858 Reviewed-by: Yaron Friedman Reviewed-by: Nate Fischer Commit-Queue: Clark DuVall Cr-Commit-Position: refs/heads/master@{#864295} --- android_webview/browser/aw_browser_main_parts.cc | 13 ------------- base/android/bundle_utils.cc | 5 ----- base/android/bundle_utils.h | 3 --- .../java/src/org/chromium/base/BundleUtils.java | 1 - chrome/browser/chrome_browser_field_trials.cc | 12 ------------ 5 files changed, 34 deletions(-) diff --git a/android_webview/browser/aw_browser_main_parts.cc b/android_webview/browser/aw_browser_main_parts.cc index 028d911881896f..26957372e4b2b8 100644 --- a/android_webview/browser/aw_browser_main_parts.cc +++ b/android_webview/browser/aw_browser_main_parts.cc @@ -153,19 +153,6 @@ void AwBrowserMainParts::RegisterSyntheticTrials() { } AwMetricsServiceAccessor::RegisterSyntheticFieldTrial( metrics, kWebViewApkTypeTrial, apk_type_string); - - // If isolated splits are enabled at build time, Monochrome and Trichrome will - // have a different bundle layout, so measure N+ even though isolated splits - // are only supported by Android in O+. - if (apk_type == ApkType::MONOCHROME && - base::android::BuildInfo::GetInstance()->sdk_int() >= - base::android::SDK_VERSION_NOUGAT) { - static constexpr char kIsolatedSplitsTrial[] = "IsolatedSplitsSynthetic"; - AwMetricsServiceAccessor::RegisterSyntheticFieldTrial( - metrics, kIsolatedSplitsTrial, - base::android::BundleUtils::IsolatedSplitsEnabled() ? "Enabled" - : "Disabled"); - } } int AwBrowserMainParts::PreMainMessageLoopRun() { diff --git a/base/android/bundle_utils.cc b/base/android/bundle_utils.cc index 745606d045a96f..0135fc53800a1f 100644 --- a/base/android/bundle_utils.cc +++ b/base/android/bundle_utils.cc @@ -69,11 +69,6 @@ bool BundleUtils::IsBundle() { return Java_BundleUtils_isBundleForNative(AttachCurrentThread()); } -// static -bool BundleUtils::IsolatedSplitsEnabled() { - return Java_BundleUtils_isolatedSplitsEnabled(AttachCurrentThread()); -} - // static void* BundleUtils::DlOpenModuleLibraryPartition(const std::string& library_name, const std::string& partition, diff --git a/base/android/bundle_utils.h b/base/android/bundle_utils.h index 76593254e33f0e..2efb54b51349dc 100644 --- a/base/android/bundle_utils.h +++ b/base/android/bundle_utils.h @@ -18,9 +18,6 @@ class BASE_EXPORT BundleUtils { // Returns true if the current build is a bundle. static bool IsBundle(); - // Returns true if isolated splits are enabled. - static bool IsolatedSplitsEnabled(); - // Helper function asking Java to resolve a library path. This is required for // resolving a module library made available via SplitCompat, rather than in // its eventual fully-installed state. diff --git a/base/android/java/src/org/chromium/base/BundleUtils.java b/base/android/java/src/org/chromium/base/BundleUtils.java index 3981fa37c78821..5f16497d405021 100644 --- a/base/android/java/src/org/chromium/base/BundleUtils.java +++ b/base/android/java/src/org/chromium/base/BundleUtils.java @@ -77,7 +77,6 @@ public static void setIsBundle(boolean isBundle) { sIsBundle = isBundle; } - @CalledByNative public static boolean isolatedSplitsEnabled() { return BuildConfig.ISOLATED_SPLITS_ENABLED; } diff --git a/chrome/browser/chrome_browser_field_trials.cc b/chrome/browser/chrome_browser_field_trials.cc index 17cf846fa0b4ea..9e3f48f2368989 100644 --- a/chrome/browser/chrome_browser_field_trials.cc +++ b/chrome/browser/chrome_browser_field_trials.cc @@ -176,18 +176,6 @@ void ChromeBrowserFieldTrials::RegisterSyntheticTrials() { ChromeMetricsServiceAccessor::RegisterSyntheticFieldTrial( kBackgroundThreadPoolTrial, group_name); } - - // If isolated splits are enabled at build time, Monochrome and Trichrome will - // have a different bundle layout, so measure N+ even though isolated splits - // are only supported by Android in O+. - if (base::android::BuildInfo::GetInstance()->sdk_int() >= - base::android::SDK_VERSION_NOUGAT) { - static constexpr char kIsolatedSplitsTrial[] = "IsolatedSplitsSynthetic"; - ChromeMetricsServiceAccessor::RegisterSyntheticFieldTrial( - kIsolatedSplitsTrial, - base::android::BundleUtils::IsolatedSplitsEnabled() ? "Enabled" - : "Disabled"); - } #endif // defined(OS_ANDROID) }