diff --git a/DEPS b/DEPS index d347a37..617003d 100644 --- a/DEPS +++ b/DEPS
@@ -304,15 +304,15 @@ # 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': 'fd25f851dff70185ec7545ceec46bab10e1b2f75', + 'skia_revision': 'a464a6881f3c111b3ca7203256f6cd704d9ba2bf', # Three lines of non-changing comments so that # the commit queue can handle CLs rolling V8 # and whatever else without interference from each other. - 'v8_revision': '04fbed56972ca13624cc79888782d68df8cf2dc8', + 'v8_revision': 'b9cea479b078155e8e50b40011eaee623178787e', # Three lines of non-changing comments so that # the commit queue can handle CLs rolling ANGLE # and whatever else without interference from each other. - 'angle_revision': '410d8ba51f953c87881a7ad131c8a6a30a9de26f', + 'angle_revision': '30d02a5a047ea59480a80f66b918ea7b919e6538', # Three lines of non-changing comments so that # the commit queue can handle CLs rolling SwiftShader # and whatever else without interference from each other. @@ -383,7 +383,7 @@ # Three lines of non-changing comments so that # the commit queue can handle CLs rolling devtools-frontend # and whatever else without interference from each other. - 'devtools_frontend_revision': 'c2538226e57af5b1fbdb06c8d6ec95c9f9bb1b6c', + 'devtools_frontend_revision': 'b1c18a8a7f37c3af452abb0035f723f0b5d40674', # Three lines of non-changing comments so that # the commit queue can handle CLs rolling libprotobuf-mutator # and whatever else without interference from each other. @@ -419,7 +419,7 @@ # Three lines of non-changing comments so that # the commit queue can handle CLs rolling feed # and whatever else without interference from each other. - 'dawn_revision': '46e3e213b0464d7c0ecb99fcb30701d69fa9fe24', + 'dawn_revision': '65985d870fc783ea9ec3c6a0567c51074f546a11', # Three lines of non-changing comments so that # the commit queue can handle CLs rolling feed # and whatever else without interference from each other. @@ -770,12 +770,12 @@ 'src/clank': { 'url': 'https://chrome-internal.googlesource.com/clank/internal/apps.git' + '@' + - '39a67061f3ffd643e5e45c14e8b75ce9eed937a3', + '7bf53fcc365d10b8c028e9d18ef4298d8fcbd00c', 'condition': 'checkout_android and checkout_src_internal', }, 'src/docs/website': { - 'url': Var('chromium_git') + '/website.git' + '@' + '04def8d89a48b711a1bf6fb1ad9025790db9d81d', + 'url': Var('chromium_git') + '/website.git' + '@' + 'ad23b1146c54f7f34226fd4c8750067439026004', }, 'src/ios/third_party/earl_grey2/src': { @@ -1210,7 +1210,7 @@ Var('chromium_git') + '/devtools/devtools-frontend' + '@' + Var('devtools_frontend_revision'), 'src/third_party/devtools-frontend-internal': { - 'url': 'https://chrome-internal.googlesource.com/devtools/devtools-internal.git' + '@' + '0f04a93b0bb143fda37a853eda0474d264ac3ec8', + 'url': 'https://chrome-internal.googlesource.com/devtools/devtools-internal.git' + '@' + '4731801789a377828bc4797dbc8e9f6f3c87516c', 'condition': 'checkout_src_internal', }, @@ -1684,7 +1684,7 @@ 'packages': [ { 'package': 'chromium/third_party/r8', - 'version': 'vdv6U6eqEpSfYd1WXV7qxTIcmuomTRqvSw9ifLK_-bIC', + 'version': 'haRbS4QoarHRjXQOZrl3EhIQinN95VFOrJhZT7cCQvsC', }, ], 'condition': 'checkout_android', @@ -1826,10 +1826,10 @@ Var('chromium_git') + '/external/khronosgroup/webgl.git' + '@' + 'd1b65aa5a88f6efd900604dfcda840154e9f16e2', 'src/third_party/webgpu-cts/src': - Var('chromium_git') + '/external/github.com/gpuweb/cts.git' + '@' + '23b86094941100a68c8beaa9acee043035b19a1e', + Var('chromium_git') + '/external/github.com/gpuweb/cts.git' + '@' + '941695197d924f38b942327e64b87766854d16b4', 'src/third_party/webrtc': - Var('webrtc_git') + '/src.git' + '@' + '47d4be732f237eb41f701b29caf8f17c71c862b1', + Var('webrtc_git') + '/src.git' + '@' + '9337ac8650f95e4ac7a66c4ac5ade84e05276bf6', # Wuffs' canonical repository is at github.com/google/wuffs, but we use # Skia's mirror of Wuffs, the same as in upstream Skia's DEPS file. @@ -1899,7 +1899,7 @@ Var('chromium_git') + '/v8/v8.git' + '@' + Var('v8_revision'), 'src-internal': { - 'url': 'https://chrome-internal.googlesource.com/chrome/src-internal.git@b1c24345a11f616f6e236b9649b344fc7b3d2328', + 'url': 'https://chrome-internal.googlesource.com/chrome/src-internal.git@8a9e4d7b87db8a2abaf784861f3c9da3efa44206', 'condition': 'checkout_src_internal', }, @@ -1951,7 +1951,7 @@ 'packages': [ { 'package': 'chromeos_internal/apps/projector_app/app', - 'version': 'qkGXBPoitols873ljJcDBgZrwIyyefjvP8QkEeeTh2EC', + 'version': 'scFKvRZhv2JMa74L-gIKU8rV682p_yL1Yl2BhEtnBncC', }, ], 'condition': 'checkout_chromeos and checkout_src_internal', @@ -3841,12 +3841,6 @@ '+third_party/icu/source/i18n/unicode', '+url', - # PSM libraries usages must be allowlisted explicitly for now. That - # is because it does not support component build. - # TODO(crbug.com/1241832): Support component build for PSM libraries. - '-third_party/shell-encryption', - '-third_party/private_membership', - # Abseil features are allowlisted explicitly. See # //styleguide/c++/c++-features.md. '-absl',
diff --git a/WATCHLISTS b/WATCHLISTS index a3216776..0cd65af 100644 --- a/WATCHLISTS +++ b/WATCHLISTS
@@ -1069,10 +1069,6 @@ 'chrome/browser/ash/web_applications/face_ml_system_web_app_info.*|' \ 'chrome/browser/ash/web_applications/face_ml/' }, - 'feature_policy': { - 'filepath': 'third_party/blink/renderer/platform/feature_policy/|' \ - 'third_party/blink/renderer/bindings/core/v8/origin_trial_features', - }, 'feed': { 'filepath': 'chrome/android/feed|' \ 'chrome/browser/feed/|' \ @@ -1660,6 +1656,10 @@ '|chrome/browser/content_settings/permission'\ '|permission_context', }, + 'permissions_policy': { + 'filepath': 'third_party/blink/renderer/core/permissions_policy/|' \ + 'third_party/blink/public/(common|mojom)/permissions_policy/' + }, 'phonehub': { 'filepath': 'ash/system/phonehub/'\ '|chrome/browser/ash/phonehub/'\ @@ -1672,8 +1672,8 @@ 'filepath': 'chrome/browser/resources/plugin_metadata/' }, 'policy_features': { - 'filepath' : 'third_party/blink/renderer/core/feature_policy/document_policy_features.json5|'\ - 'third_party/blink/renderer/core/feature_policy/feature_policy_features.json5' + 'filepath' : 'third_party/blink/renderer/core/permissions_policy/document_policy_features.json5|'\ + 'third_party/blink/renderer/core/permissions_policy/permissions_policy_features.json5' }, 'polymer': { 'filepath': 'third_party/polymer/|'\ @@ -2680,9 +2680,6 @@ 'extension': ['chromium-apps-reviews@chromium.org', 'extensions-reviews@chromium.org'], 'face_ml': ['eora-dc-eng+crrev-watch@google.com'], - 'feature_policy': ['loonybear@chromium.org', - 'iclelland+watch@chromium.org', - 'jmedley+watch@chromium.org'], 'feed': ['carlosk+watch@chromium.org', 'dewittj+watch@chromium.org', 'dimich+watch@chromium.org', @@ -2893,6 +2890,9 @@ 'teravest+watch@chromium.org'], 'permissions': ['dominickn+watch-permissions@chromium.org', 'permissions-reviews@chromium.org'], + 'permissions_policy': ['loonybear@chromium.org', + 'iclelland+watch@chromium.org', + 'jmedley+watch@chromium.org'], 'phonehub': ['crisrael+watch-phonehub@google.com', 'hansberry+watch-phonehub@chromium.org', 'jonmann+watch-phonehub@chromium.org',
diff --git a/ash/webui/camera_app_ui/resources/js/device/preview.ts b/ash/webui/camera_app_ui/resources/js/device/preview.ts index 7aa31c8..b7976ac8 100644 --- a/ash/webui/camera_app_ui/resources/js/device/preview.ts +++ b/ash/webui/camera_app_ui/resources/js/device/preview.ts
@@ -312,6 +312,10 @@ this.watchdog = setInterval(() => { if (!this.isStreamAlive()) { this.clearWatchdog(); + const deviceOperator = DeviceOperator.getInstance(); + if (deviceOperator !== null && this.deviceId !== null) { + deviceOperator.dropConnection(this.deviceId); + } this.onNewStreamNeeded(); } }, 100);
diff --git a/base/BUILD.gn b/base/BUILD.gn index 16bc334..33e99b1 100644 --- a/base/BUILD.gn +++ b/base/BUILD.gn
@@ -4085,6 +4085,7 @@ "android/java/src/org/chromium/base/MemoryPressureListener.java", "android/java/src/org/chromium/base/PathService.java", "android/java/src/org/chromium/base/PathUtils.java", + "android/java/src/org/chromium/base/PiiElider.java", "android/java/src/org/chromium/base/PowerMonitor.java", "android/java/src/org/chromium/base/RadioUtils.java", "android/java/src/org/chromium/base/SysUtils.java",
diff --git a/base/allocator/partition_allocator/partition_alloc_forward.h b/base/allocator/partition_allocator/partition_alloc_forward.h index fd62e11..ab93272 100644 --- a/base/allocator/partition_allocator/partition_alloc_forward.h +++ b/base/allocator/partition_allocator/partition_alloc_forward.h
@@ -7,11 +7,12 @@ #include <algorithm> #include <cstddef> +#include <type_traits> #include "base/allocator/partition_allocator/partition_alloc_base/compiler_specific.h" #include "base/allocator/partition_allocator/partition_alloc_base/component_export.h" #include "base/allocator/partition_allocator/partition_alloc_base/debug/debugging_buildflags.h" -#include "base/allocator/partition_allocator/partition_alloc_buildflags.h" +#include "base/allocator/partition_allocator/partition_alloc_config.h" namespace partition_alloc { @@ -44,6 +45,32 @@ void CheckThatSlotOffsetIsZero(uintptr_t address); #endif +// This type trait verifies a type can be used as a pointer offset. +// +// We support pointer offsets in signed (ptrdiff_t) or unsigned (size_t) values. +// Smaller types are also allowed. +template <typename Z> +static constexpr bool offset_type = + std::is_integral_v<Z> && sizeof(Z) <= sizeof(ptrdiff_t); + +template <typename Z, typename = std::enable_if_t<offset_type<Z>, void>> +struct PtrDelta { + Z delta_in_bytes; +#if PA_CONFIG(USE_OOB_POISON) + // Size of the element type referenced by the pointer + size_t type_size; +#endif + + constexpr PtrDelta(Z delta_in_bytes, size_t type_size) + : delta_in_bytes(delta_in_bytes) +#if PA_CONFIG(USE_OOB_POISON) + , + type_size(type_size) +#endif + { + } +}; + } // namespace internal class PartitionStatsDumper;
diff --git a/base/allocator/partition_allocator/partition_alloc_unittest.cc b/base/allocator/partition_allocator/partition_alloc_unittest.cc index 7e3e46cf..2c96a606 100644 --- a/base/allocator/partition_allocator/partition_alloc_unittest.cc +++ b/base/allocator/partition_allocator/partition_alloc_unittest.cc
@@ -1452,62 +1452,101 @@ } uintptr_t address = UntagPtr(ptr); - EXPECT_EQ(PartitionAllocIsValidPtrDelta(address, -kFarFarAwayDelta), - PtrPosWithinAlloc::kFarOOB); - EXPECT_EQ(PartitionAllocIsValidPtrDelta(address, -kSuperPageSize), - PtrPosWithinAlloc::kFarOOB); - EXPECT_EQ(PartitionAllocIsValidPtrDelta(address, -1), - PtrPosWithinAlloc::kFarOOB); - EXPECT_EQ(PartitionAllocIsValidPtrDelta(address, 0), - PtrPosWithinAlloc::kInBounds); - EXPECT_EQ(PartitionAllocIsValidPtrDelta(address, requested_size / 2), - PtrPosWithinAlloc::kInBounds); -#if PA_CONFIG(USE_OOB_POISON) - EXPECT_EQ(PartitionAllocIsValidPtrDelta(address, requested_size), - PtrPosWithinAlloc::kAllocEnd); -#else - EXPECT_EQ(PartitionAllocIsValidPtrDelta(address, requested_size), - PtrPosWithinAlloc::kInBounds); -#endif - EXPECT_EQ(PartitionAllocIsValidPtrDelta(address, requested_size + 1), - PtrPosWithinAlloc::kFarOOB); EXPECT_EQ(PartitionAllocIsValidPtrDelta(address, - requested_size + kSuperPageSize), - PtrPosWithinAlloc::kFarOOB); - EXPECT_EQ(PartitionAllocIsValidPtrDelta( - address, requested_size + kFarFarAwayDelta), - PtrPosWithinAlloc::kFarOOB); - EXPECT_EQ(PartitionAllocIsValidPtrDelta(address + requested_size, - kFarFarAwayDelta), - PtrPosWithinAlloc::kFarOOB); - EXPECT_EQ(PartitionAllocIsValidPtrDelta(address + requested_size, - kSuperPageSize), - PtrPosWithinAlloc::kFarOOB); - EXPECT_EQ(PartitionAllocIsValidPtrDelta(address + requested_size, 1), - PtrPosWithinAlloc::kFarOOB); -#if PA_CONFIG(USE_OOB_POISON) - EXPECT_EQ(PartitionAllocIsValidPtrDelta(address + requested_size, 0), - PtrPosWithinAlloc::kAllocEnd); -#else - EXPECT_EQ(PartitionAllocIsValidPtrDelta(address + requested_size, 0), - PtrPosWithinAlloc::kInBounds); -#endif - EXPECT_EQ(PartitionAllocIsValidPtrDelta(address + requested_size, - -(requested_size / 2)), - PtrPosWithinAlloc::kInBounds); - EXPECT_EQ(PartitionAllocIsValidPtrDelta(address + requested_size, - -requested_size), - PtrPosWithinAlloc::kInBounds); - EXPECT_EQ(PartitionAllocIsValidPtrDelta(address + requested_size, - -requested_size - 1), - PtrPosWithinAlloc::kFarOOB); - EXPECT_EQ(PartitionAllocIsValidPtrDelta(address + requested_size, - -requested_size - kSuperPageSize), + PtrDelta(-kFarFarAwayDelta, 0)), PtrPosWithinAlloc::kFarOOB); EXPECT_EQ( - PartitionAllocIsValidPtrDelta(address + requested_size, - -requested_size - kFarFarAwayDelta), + PartitionAllocIsValidPtrDelta(address, PtrDelta(-kSuperPageSize, 0)), PtrPosWithinAlloc::kFarOOB); + EXPECT_EQ(PartitionAllocIsValidPtrDelta(address, PtrDelta(-1, 0)), + PtrPosWithinAlloc::kFarOOB); + EXPECT_EQ(PartitionAllocIsValidPtrDelta(address, PtrDelta(0, 0)), + PtrPosWithinAlloc::kInBounds); + EXPECT_EQ(PartitionAllocIsValidPtrDelta(address, + PtrDelta(requested_size / 2, 0)), + PtrPosWithinAlloc::kInBounds); +#if PA_CONFIG(USE_OOB_POISON) + EXPECT_EQ(PartitionAllocIsValidPtrDelta(address, + PtrDelta(requested_size - 1, 1)), + PtrPosWithinAlloc::kInBounds); + EXPECT_EQ( + PartitionAllocIsValidPtrDelta(address, PtrDelta(requested_size, 1)), + PtrPosWithinAlloc::kAllocEnd); + EXPECT_EQ(PartitionAllocIsValidPtrDelta(address, + PtrDelta(requested_size - 4, 4)), + PtrPosWithinAlloc::kInBounds); + for (size_t subtrahend = 0; subtrahend < 4; subtrahend++) { + EXPECT_EQ(PartitionAllocIsValidPtrDelta( + address, PtrDelta(requested_size - subtrahend, 4)), + PtrPosWithinAlloc::kAllocEnd); + } +#else + EXPECT_EQ( + PartitionAllocIsValidPtrDelta(address, PtrDelta(requested_size, 0)), + PtrPosWithinAlloc::kInBounds); +#endif + EXPECT_EQ(PartitionAllocIsValidPtrDelta(address, + PtrDelta(requested_size + 1, 0)), + PtrPosWithinAlloc::kFarOOB); + EXPECT_EQ(PartitionAllocIsValidPtrDelta( + address, PtrDelta(requested_size + kSuperPageSize, 0)), + PtrPosWithinAlloc::kFarOOB); + EXPECT_EQ(PartitionAllocIsValidPtrDelta( + address, PtrDelta(requested_size + kFarFarAwayDelta, 0)), + PtrPosWithinAlloc::kFarOOB); + EXPECT_EQ(PartitionAllocIsValidPtrDelta(address + requested_size, + PtrDelta(kFarFarAwayDelta, 0)), + PtrPosWithinAlloc::kFarOOB); + EXPECT_EQ(PartitionAllocIsValidPtrDelta(address + requested_size, + PtrDelta(kSuperPageSize, 0)), + PtrPosWithinAlloc::kFarOOB); + EXPECT_EQ(PartitionAllocIsValidPtrDelta(address + requested_size, + PtrDelta(1, 0)), + PtrPosWithinAlloc::kFarOOB); +#if PA_CONFIG(USE_OOB_POISON) + EXPECT_EQ(PartitionAllocIsValidPtrDelta(address + requested_size - 1, + PtrDelta(0, 1)), + PtrPosWithinAlloc::kInBounds); + EXPECT_EQ(PartitionAllocIsValidPtrDelta(address + requested_size - 1, + PtrDelta(1, 1)), + PtrPosWithinAlloc::kAllocEnd); + EXPECT_EQ(PartitionAllocIsValidPtrDelta(address + requested_size, + PtrDelta(0, 1)), + PtrPosWithinAlloc::kAllocEnd); + EXPECT_EQ(PartitionAllocIsValidPtrDelta(address + requested_size - 1, + PtrDelta(1, 1)), + PtrPosWithinAlloc::kAllocEnd); + EXPECT_EQ(PartitionAllocIsValidPtrDelta(address + requested_size - 4, + PtrDelta(0, 4)), + PtrPosWithinAlloc::kInBounds); + for (size_t addend = 1; addend < 4; addend++) { + EXPECT_EQ(PartitionAllocIsValidPtrDelta(address + requested_size - 4, + PtrDelta(addend, 4)), + PtrPosWithinAlloc::kAllocEnd); + } +#else + EXPECT_EQ(PartitionAllocIsValidPtrDelta(address + requested_size, + PtrDelta(0, 0)), + PtrPosWithinAlloc::kInBounds); +#endif + EXPECT_EQ( + PartitionAllocIsValidPtrDelta(address + requested_size, + PtrDelta(-(requested_size / 2), 0)), + PtrPosWithinAlloc::kInBounds); + EXPECT_EQ(PartitionAllocIsValidPtrDelta(address + requested_size, + PtrDelta(-requested_size, 0)), + PtrPosWithinAlloc::kInBounds); + EXPECT_EQ(PartitionAllocIsValidPtrDelta(address + requested_size, + PtrDelta(-requested_size - 1, 0)), + PtrPosWithinAlloc::kFarOOB); + EXPECT_EQ(PartitionAllocIsValidPtrDelta( + address + requested_size, + PtrDelta(-requested_size - kSuperPageSize, 0)), + PtrPosWithinAlloc::kFarOOB); + EXPECT_EQ(PartitionAllocIsValidPtrDelta( + address + requested_size, + PtrDelta(-requested_size - kFarFarAwayDelta, 0)), + PtrPosWithinAlloc::kFarOOB); } for (void* ptr : ptrs) {
diff --git a/base/allocator/partition_allocator/partition_root.h b/base/allocator/partition_allocator/partition_root.h index 4ac4104..d2d5f80 100644 --- a/base/allocator/partition_allocator/partition_root.h +++ b/base/allocator/partition_allocator/partition_root.h
@@ -89,14 +89,6 @@ namespace partition_alloc::internal { -// This type trait verifies a type can be used as a pointer offset. -// -// We support pointer offsets in signed (ptrdiff_t) or unsigned (size_t) values. -// Smaller types are also allowed. -template <typename Z> -static constexpr bool offset_type = - std::is_integral_v<Z> && sizeof(Z) <= sizeof(ptrdiff_t); - // We want this size to be big enough that we have time to start up other // scripts _before_ we wrap around. static constexpr size_t kAllocInfoSize = 1 << 24; @@ -1047,9 +1039,9 @@ // // This isn't a general purpose function. The caller is responsible for ensuring // that the ref-count is in place for this allocation. -template <typename Z, typename = std::enable_if_t<offset_type<Z>, void>> +template <typename Z> PA_ALWAYS_INLINE PtrPosWithinAlloc -PartitionAllocIsValidPtrDelta(uintptr_t address, Z delta_in_bytes) { +PartitionAllocIsValidPtrDelta(uintptr_t address, PtrDelta<Z> delta) { // Required for pointers right past an allocation. See // |PartitionAllocGetSlotStartInBRPPool()|. uintptr_t adjusted_address = address - kPartitionPastAllocationAdjustment; @@ -1068,21 +1060,19 @@ PA_DCHECK(root->brp_enabled()); uintptr_t object_addr = root->SlotStartToObjectAddr(slot_start); - uintptr_t new_address = address + static_cast<uintptr_t>(delta_in_bytes); + uintptr_t new_address = + address + static_cast<uintptr_t>(delta.delta_in_bytes); uintptr_t object_end = object_addr + slot_span->GetUsableSize(root); + if (new_address < object_addr || object_end < new_address) { + return PtrPosWithinAlloc::kFarOOB; #if PA_CONFIG(USE_OOB_POISON) - bool below_object_end = new_address < object_end; -#else - bool below_object_end = new_address <= object_end; -#endif - if (object_addr <= new_address && below_object_end) { - return PtrPosWithinAlloc::kInBounds; -#if PA_CONFIG(USE_OOB_POISON) - } else if (new_address == object_end) { + } else if (object_end - delta.type_size < new_address) { + // Not even a single element of the type referenced by the pointer can fit + // between the pointer and the end of the object. return PtrPosWithinAlloc::kAllocEnd; #endif } else { - return PtrPosWithinAlloc::kFarOOB; + return PtrPosWithinAlloc::kInBounds; } }
diff --git a/base/android/java/src/org/chromium/base/PiiElider.java b/base/android/java/src/org/chromium/base/PiiElider.java index 78a8c95..8d32c6b 100644 --- a/base/android/java/src/org/chromium/base/PiiElider.java +++ b/base/android/java/src/org/chromium/base/PiiElider.java
@@ -7,7 +7,7 @@ import android.text.TextUtils; import android.util.Patterns; -import org.chromium.build.annotations.UsedByReflection; +import org.chromium.base.annotations.CalledByNative; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -217,7 +217,6 @@ * @param stacktrace Multiline stacktrace as a string. * @return Stacktrace with elided URLs. */ - @UsedByReflection("jni_android.cc") public static String sanitizeStacktrace(String stacktrace) { if (TextUtils.isEmpty(stacktrace)) { return ""; @@ -233,4 +232,13 @@ } return TextUtils.join("\n", frames); } + + /** + * Returns a sanitized stacktrace (per {@link #sanitizeStacktrace(String)}) for the given + * throwable. + */ + @CalledByNative + public static String getSanitizedStacktrace(Throwable throwable) { + return sanitizeStacktrace(Log.getStackTraceString(throwable)); + } }
diff --git a/base/android/jni_android.cc b/base/android/jni_android.cc index 3deb45a6..2d19dc1d 100644 --- a/base/android/jni_android.cc +++ b/base/android/jni_android.cc
@@ -10,6 +10,7 @@ #include "base/android/java_exception_reporter.h" #include "base/android/jni_string.h" #include "base/android/jni_utils.h" +#include "base/base_jni_headers/PiiElider_jni.h" #include "base/debug/debugging_buildflags.h" #include "base/lazy_instance.h" #include "base/logging.h" @@ -287,28 +288,9 @@ } std::string GetJavaExceptionInfo(JNIEnv* env, jthrowable java_throwable) { - ScopedJavaLocalRef<jclass> log_clazz = GetClass(env, "android/util/Log"); - jmethodID log_getstacktracestring = MethodID::Get<MethodID::TYPE_STATIC>( - env, log_clazz.obj(), "getStackTraceString", - "(Ljava/lang/Throwable;)Ljava/lang/String;"); - - // Call Log.getStackTraceString() - ScopedJavaLocalRef<jstring> exception_string( - env, static_cast<jstring>(env->CallStaticObjectMethod( - log_clazz.obj(), log_getstacktracestring, java_throwable))); - CheckException(env); - - ScopedJavaLocalRef<jclass> piielider_clazz = - GetClass(env, "org/chromium/base/PiiElider"); - jmethodID piielider_sanitize_stacktrace = - MethodID::Get<MethodID::TYPE_STATIC>( - env, piielider_clazz.obj(), "sanitizeStacktrace", - "(Ljava/lang/String;)Ljava/lang/String;"); - ScopedJavaLocalRef<jstring> sanitized_exception_string( - env, static_cast<jstring>(env->CallStaticObjectMethod( - piielider_clazz.obj(), piielider_sanitize_stacktrace, - exception_string.obj()))); - CheckException(env); + ScopedJavaLocalRef<jstring> sanitized_exception_string = + Java_PiiElider_getSanitizedStacktrace( + env, ScopedJavaLocalRef(env, java_throwable)); return ConvertJavaStringToUTF8(sanitized_exception_string); }
diff --git a/base/memory/raw_ptr.cc b/base/memory/raw_ptr.cc index 5ca1e2a..ed20c7d 100644 --- a/base/memory/raw_ptr.cc +++ b/base/memory/raw_ptr.cc
@@ -77,19 +77,13 @@ } template <bool AllowDangling> +template <typename Z> partition_alloc::PtrPosWithinAlloc -BackupRefPtrImpl<AllowDangling>::IsValidSignedDelta(uintptr_t address, - ptrdiff_t delta_in_bytes) { - return partition_alloc::internal::PartitionAllocIsValidPtrDelta( - address, delta_in_bytes); -} - -template <bool AllowDangling> -partition_alloc::PtrPosWithinAlloc -BackupRefPtrImpl<AllowDangling>::IsValidUnsignedDelta(uintptr_t address, - size_t delta_in_bytes) { - return partition_alloc::internal::PartitionAllocIsValidPtrDelta( - address, delta_in_bytes); +BackupRefPtrImpl<AllowDangling>::IsValidDelta( + uintptr_t address, + partition_alloc::internal::PtrDelta<Z> delta) { + return partition_alloc::internal::PartitionAllocIsValidPtrDelta(address, + delta); } // Explicitly instantiates the two BackupRefPtr variants in the .cc. This @@ -97,6 +91,23 @@ template struct BackupRefPtrImpl</*AllowDangling=*/false>; template struct BackupRefPtrImpl</*AllowDangling=*/true>; +template PA_COMPONENT_EXPORT(RAW_PTR) + partition_alloc::PtrPosWithinAlloc BackupRefPtrImpl<false>::IsValidDelta( + uintptr_t, + partition_alloc::internal::PtrDelta<size_t>); +template PA_COMPONENT_EXPORT(RAW_PTR) + partition_alloc::PtrPosWithinAlloc BackupRefPtrImpl<false>::IsValidDelta( + uintptr_t, + partition_alloc::internal::PtrDelta<ptrdiff_t>); +template PA_COMPONENT_EXPORT(RAW_PTR) + partition_alloc::PtrPosWithinAlloc BackupRefPtrImpl<true>::IsValidDelta( + uintptr_t, + partition_alloc::internal::PtrDelta<size_t>); +template PA_COMPONENT_EXPORT(RAW_PTR) + partition_alloc::PtrPosWithinAlloc BackupRefPtrImpl<true>::IsValidDelta( + uintptr_t, + partition_alloc::internal::PtrDelta<ptrdiff_t>); + #if BUILDFLAG(PA_DCHECK_IS_ON) || BUILDFLAG(ENABLE_BACKUP_REF_PTR_SLOW_CHECKS) void CheckThatAddressIsntWithinFirstPartitionPage(uintptr_t address) { if (partition_alloc::internal::IsManagedByDirectMap(address)) {
diff --git a/base/memory/raw_ptr.h b/base/memory/raw_ptr.h index f7266c9..dfa4607 100644 --- a/base/memory/raw_ptr.h +++ b/base/memory/raw_ptr.h
@@ -19,6 +19,7 @@ #include "base/allocator/partition_allocator/partition_alloc_base/debug/debugging_buildflags.h" #include "base/allocator/partition_allocator/partition_alloc_buildflags.h" #include "base/allocator/partition_allocator/partition_alloc_config.h" +#include "base/allocator/partition_allocator/partition_alloc_forward.h" #include "build/build_config.h" #include "build/buildflag.h" @@ -110,14 +111,6 @@ // These classes/structures are part of the raw_ptr implementation. // DO NOT USE THESE CLASSES DIRECTLY YOURSELF. -// This type trait verifies a type can be used as a pointer offset. -// -// We support pointer offsets in signed (ptrdiff_t) or unsigned (size_t) values. -// Smaller types are also allowed. -template <typename Z> -static constexpr bool offset_type = - std::is_integral_v<Z> && sizeof(Z) <= sizeof(ptrdiff_t); - struct RawPtrNoOpImpl { // Wraps a pointer. template <typename T> @@ -161,9 +154,11 @@ } // Advance the wrapped pointer by `delta_elems`. - template <typename T, - typename Z, - typename = std::enable_if_t<offset_type<Z>, void>> + template < + typename T, + typename Z, + typename = + std::enable_if_t<partition_alloc::internal::offset_type<Z>, void>> static PA_ALWAYS_INLINE T* Advance(T* wrapped_ptr, Z delta_elems) { return wrapped_ptr + delta_elems; } @@ -319,9 +314,11 @@ } // Advance the wrapped pointer by `delta_elems`. - template <typename T, - typename Z, - typename = std::enable_if_t<offset_type<Z>, void>> + template < + typename T, + typename Z, + typename = + std::enable_if_t<partition_alloc::internal::offset_type<Z>, void>> static PA_ALWAYS_INLINE T* Advance(T* wrapped_ptr, Z delta_elems) { return wrapped_ptr + delta_elems; } @@ -600,9 +597,11 @@ } // Advance the wrapped pointer by `delta_elems`. - template <typename T, - typename Z, - typename = std::enable_if_t<offset_type<Z>, void>> + template < + typename T, + typename Z, + typename = + std::enable_if_t<partition_alloc::internal::offset_type<Z>, void>> static PA_ALWAYS_INLINE T* Advance(T* wrapped_ptr, Z delta_elems) { #if BUILDFLAG(PUT_REF_COUNT_IN_PREVIOUS_SLOT) T* unpoisoned_ptr = UnpoisonPtr(wrapped_ptr); @@ -624,8 +623,8 @@ // TODO(bartekn): Consider adding support for non-BRP pools too (without // removing the cross-pool migration check). if (IsSupportedAndNotNull(address)) { - auto ptr_pos_within_alloc = - IsValidDelta(address, delta_elems * static_cast<Z>(sizeof(T))); + auto ptr_pos_within_alloc = IsValidDelta( + address, delta_elems * static_cast<Z>(sizeof(T)), sizeof(T)); // No need to check that |new_ptr| is in the same pool, as IsValidDeta() // checks that it's within the same allocation, so must be the same pool. PA_BASE_CHECK(ptr_pos_within_alloc != @@ -681,7 +680,7 @@ // TODO(bartekn): Consider adding support for non-BRP pool too. if (IsSupportedAndNotNull(address1)) { PA_BASE_CHECK(IsSupportedAndNotNull(address2)); - PA_BASE_CHECK(IsValidDelta(address2, address1 - address2) != + PA_BASE_CHECK(IsValidDelta(address2, address1 - address2, sizeof(T)) != partition_alloc::PtrPosWithinAlloc::kFarOOB); } else { PA_BASE_CHECK(!IsSupportedAndNotNull(address2)); @@ -723,21 +722,23 @@ bool IsPointeeAlive(uintptr_t address); static PA_COMPONENT_EXPORT(RAW_PTR) PA_NOINLINE void ReportIfDanglingInternal(uintptr_t address); - template <typename Z, typename = std::enable_if_t<offset_type<Z>, void>> - static PA_ALWAYS_INLINE partition_alloc::PtrPosWithinAlloc IsValidDelta( - uintptr_t address, - Z delta_in_bytes) { - if constexpr (std::is_signed_v<Z>) - return IsValidSignedDelta(address, ptrdiff_t{delta_in_bytes}); - else - return IsValidUnsignedDelta(address, size_t{delta_in_bytes}); + template < + typename Z, + typename = + std::enable_if_t<partition_alloc::internal::offset_type<Z>, void>> + static PA_ALWAYS_INLINE partition_alloc::PtrPosWithinAlloc + IsValidDelta(uintptr_t address, Z delta_in_bytes, size_t type_size) { + using delta_t = std::conditional_t<std::is_signed_v<Z>, ptrdiff_t, size_t>; + partition_alloc::internal::PtrDelta<delta_t> ptr_delta(delta_in_bytes, + type_size); + + return IsValidDelta(address, ptr_delta); } + template <typename Z> static PA_COMPONENT_EXPORT(RAW_PTR) PA_NOINLINE partition_alloc::PtrPosWithinAlloc - IsValidSignedDelta(uintptr_t address, ptrdiff_t delta_in_bytes); - static PA_COMPONENT_EXPORT(RAW_PTR) - PA_NOINLINE partition_alloc::PtrPosWithinAlloc - IsValidUnsignedDelta(uintptr_t address, size_t delta_in_bytes); + IsValidDelta(uintptr_t address, + partition_alloc::internal::PtrDelta<Z> delta); }; #endif // BUILDFLAG(ENABLE_BACKUP_REF_PTR_SUPPORT) @@ -816,9 +817,11 @@ } // Advance the wrapped pointer by `delta_elems`. - template <typename T, - typename Z, - typename = std::enable_if_t<offset_type<Z>, void>> + template < + typename T, + typename Z, + typename = + std::enable_if_t<partition_alloc::internal::offset_type<Z>, void>> static PA_ALWAYS_INLINE T* Advance(T* wrapped_ptr, Z delta_elems) { return wrapped_ptr + delta_elems; } @@ -900,9 +903,11 @@ } // Advance the wrapped pointer by `delta_elems`. - template <typename T, - typename Z, - typename = std::enable_if_t<offset_type<Z>, void>> + template < + typename T, + typename Z, + typename = + std::enable_if_t<partition_alloc::internal::offset_type<Z>, void>> static PA_ALWAYS_INLINE T* Advance(T* wrapped_ptr, Z delta_elems) { return wrapped_ptr + delta_elems; } @@ -1503,22 +1508,30 @@ --(*this); return result; } - template <typename Z, typename = std::enable_if_t<internal::offset_type<Z>>> + template < + typename Z, + typename = std::enable_if_t<partition_alloc::internal::offset_type<Z>>> PA_ALWAYS_INLINE raw_ptr& operator+=(Z delta_elems) { wrapped_ptr_ = Impl::Advance(wrapped_ptr_, delta_elems); return *this; } - template <typename Z, typename = std::enable_if_t<internal::offset_type<Z>>> + template < + typename Z, + typename = std::enable_if_t<partition_alloc::internal::offset_type<Z>>> PA_ALWAYS_INLINE raw_ptr& operator-=(Z delta_elems) { return *this += -delta_elems; } - template <typename Z, typename = std::enable_if_t<internal::offset_type<Z>>> + template < + typename Z, + typename = std::enable_if_t<partition_alloc::internal::offset_type<Z>>> friend PA_ALWAYS_INLINE raw_ptr operator+(const raw_ptr& p, Z delta_elems) { raw_ptr result = p; return result += delta_elems; } - template <typename Z, typename = std::enable_if_t<internal::offset_type<Z>>> + template < + typename Z, + typename = std::enable_if_t<partition_alloc::internal::offset_type<Z>>> friend PA_ALWAYS_INLINE raw_ptr operator-(const raw_ptr& p, Z delta_elems) { raw_ptr result = p; return result -= delta_elems;
diff --git a/base/memory/raw_ptr_unittest.cc b/base/memory/raw_ptr_unittest.cc index dbf758f6..ad14e44 100644 --- a/base/memory/raw_ptr_unittest.cc +++ b/base/memory/raw_ptr_unittest.cc
@@ -1561,6 +1561,21 @@ EXPECT_CHECK_DEATH(protected_ptr -= 1); EXPECT_CHECK_DEATH(--protected_ptr); +#if PA_CONFIG(USE_OOB_POISON) + // An array type that should be more than a third the size of the available + // memory for the allocation such that incrementing a pointer to this type + // twice causes it to point to a memory location that is too small to fit a + // complete element of this type. + typedef int OverThirdArray[200 / sizeof(int)]; + raw_ptr<OverThirdArray> protected_arr_ptr = + reinterpret_cast<OverThirdArray*>(ptr); + + protected_arr_ptr++; + **protected_arr_ptr = 4; + protected_arr_ptr++; + EXPECT_DEATH_IF_SUPPORTED(** protected_arr_ptr = 4, ""); +#endif + allocator.root()->Free(ptr); }
diff --git a/build/android/gyp/apkbuilder.py b/build/android/gyp/apkbuilder.py index 15c59504..3ed14c28 100755 --- a/build/android/gyp/apkbuilder.py +++ b/build/android/gyp/apkbuilder.py
@@ -9,7 +9,6 @@ import argparse import logging import os -import posixpath import shutil import sys import tempfile @@ -179,8 +178,7 @@ def _GetAssetsToAdd(path_tuples, fast_align, disable_compression=False, - allow_reads=True, - apk_root_dir=''): + allow_reads=True): """Returns the list of file_detail tuples for assets in the apk. Args: @@ -209,11 +207,7 @@ if allow_reads and compress and os.path.getsize(src_path) < 16: compress = False - if dest_path.startswith('../'): - # posixpath.join('', 'foo') == 'foo' - apk_path = posixpath.join(apk_root_dir, dest_path[3:]) - else: - apk_path = 'assets/' + dest_path + apk_path = 'assets/' + dest_path alignment = 0 if compress and not fast_align else 4 assets_to_add.append((apk_path, src_path, compress, alignment)) return assets_to_add @@ -353,14 +347,12 @@ ret = _GetAssetsToAdd(assets, fast_align, disable_compression=False, - allow_reads=allow_reads, - apk_root_dir=apk_root_dir) + allow_reads=allow_reads) ret.extend( _GetAssetsToAdd(uncompressed_assets, fast_align, disable_compression=True, - allow_reads=allow_reads, - apk_root_dir=apk_root_dir)) + allow_reads=allow_reads)) return ret libs_to_add = _GetNativeLibrariesToAdd(native_libs, options.android_abi,
diff --git a/build/android/gyp/create_app_bundle.py b/build/android/gyp/create_app_bundle.py index 8b3c797a..ba67861 100755 --- a/build/android/gyp/create_app_bundle.py +++ b/build/android/gyp/create_app_bundle.py
@@ -11,7 +11,6 @@ import json import logging import os -import posixpath import shutil import sys import zipfile @@ -132,13 +131,15 @@ # Merge all uncompressed assets into a set. uncompressed_list = [] - for entry in build_utils.ParseGnList(options.uncompressed_assets): - # Each entry has the following format: 'zipPath' or 'srcPath:zipPath' - pos = entry.find(':') - if pos >= 0: - uncompressed_list.append(entry[pos + 1:]) - else: - uncompressed_list.append(entry) + if options.uncompressed_assets: + for l in options.uncompressed_assets: + for entry in build_utils.ParseGnList(l): + # Each entry has the following format: 'zipPath' or 'srcPath:zipPath' + pos = entry.find(':') + if pos >= 0: + uncompressed_list.append(entry[pos + 1:]) + else: + uncompressed_list.append(entry) options.uncompressed_assets = set(uncompressed_list) @@ -202,9 +203,7 @@ uncompressed_globs = [ 'assets/locales#lang_*/*.pak', 'assets/fallback-locales/*.pak' ] - # normpath to allow for ../ prefix. - uncompressed_globs.extend( - posixpath.normpath('assets/' + x) for x in uncompressed_assets) + uncompressed_globs.extend('assets/' + x for x in uncompressed_assets) # NOTE: Use '**' instead of '*' to work through directories! uncompressed_globs.extend('**.' + ext for ext in _UNCOMPRESSED_FILE_EXTS) if not compress_dex:
diff --git a/build/android/gyp/write_build_config.py b/build/android/gyp/write_build_config.py index 95793a7..65ca0e1 100755 --- a/build/android/gyp/write_build_config.py +++ b/build/android/gyp/write_build_config.py
@@ -773,9 +773,10 @@ locale_paks.add(dest) def create_list(asset_map): + ret = ['%s:%s' % (src, dest) for dest, src in asset_map.items()] # Sort to ensure deterministic ordering. - items = sorted(asset_map.items()) - return [f'{src}:{dest}' for dest, src in items] + ret.sort() + return ret return create_list(compressed), create_list(uncompressed), locale_paks
diff --git a/build/fuchsia/linux_internal.sdk.sha1 b/build/fuchsia/linux_internal.sdk.sha1 index 037a55c..0389c6f 100644 --- a/build/fuchsia/linux_internal.sdk.sha1 +++ b/build/fuchsia/linux_internal.sdk.sha1
@@ -1 +1 @@ -11.20230111.1.1 +11.20230112.1.1
diff --git a/cc/base/features.cc b/cc/base/features.cc index ebc0296..c63498b 100644 --- a/cc/base/features.cc +++ b/cc/base/features.cc
@@ -104,4 +104,8 @@ base::FEATURE_DISABLED_BY_DEFAULT); #endif +BASE_FEATURE(kReclaimResourcesFlushInBackground, + "ReclaimResourceFlushInBackground", + base::FEATURE_DISABLED_BY_DEFAULT); + } // namespace features
diff --git a/cc/base/features.h b/cc/base/features.h index e092b3e..15404eddd 100644 --- a/cc/base/features.h +++ b/cc/base/features.h
@@ -97,6 +97,10 @@ // renderers. CC_BASE_EXPORT BASE_DECLARE_FEATURE(kUIEnableSharedImageCacheForGpu); +// When LayerTreeHostImpl::ReclaimResources() is called in background, trigger a +// flush to actually reclaim resources. +CC_BASE_EXPORT BASE_DECLARE_FEATURE(kReclaimResourcesFlushInBackground); + } // namespace features #endif // CC_BASE_FEATURES_H_
diff --git a/cc/trees/layer_tree_host_impl.cc b/cc/trees/layer_tree_host_impl.cc index de3d2dc4..12a1491e 100644 --- a/cc/trees/layer_tree_host_impl.cc +++ b/cc/trees/layer_tree_host_impl.cc
@@ -2175,8 +2175,12 @@ // aggressively flush here to make sure those DeleteTextures make it to the // GPU process to free up the memory. if (!visible_ && layer_tree_frame_sink_->context_provider()) { - auto* gl = layer_tree_frame_sink_->context_provider()->ContextGL(); - gl->ShallowFlushCHROMIUM(); + auto* compositor_context = layer_tree_frame_sink_->context_provider(); + compositor_context->ContextGL()->ShallowFlushCHROMIUM(); + if (base::FeatureList::IsEnabled( + features::kReclaimResourcesFlushInBackground)) { + compositor_context->ContextSupport()->FlushPendingWork(); + } } }
diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn index 44a9354..cc55daa 100644 --- a/chrome/android/BUILD.gn +++ b/chrome/android/BUILD.gn
@@ -1438,7 +1438,6 @@ "//components/browser_ui/styles/android:java", "//components/browser_ui/util/android:java", "//components/browser_ui/widget/android:java", - "//components/commerce/core/android:core_java", "//components/crash/android:java", "//components/embedder_support/android:context_menu_java", "//components/embedder_support/android:util_java", @@ -1513,11 +1512,8 @@ "$google_play_services_package:google_play_services_gcm_java", "$google_play_services_package:google_play_services_iid_java", "$google_play_services_package:google_play_services_tasks_java", - "//base:base_java", "//base:base_java_test_support", - "//base:jni_java", "//base/test:test_support_java", - "//build/android:build_java", "//cc:cc_java", "//chrome/android:chrome_java", "//chrome/android/features/keyboard_accessory/public:public_java", @@ -1832,6 +1828,8 @@ deps += feed_test_deps + deps += commerce_subscriptions_java_test_deps + if (enable_printing) { deps += [ "//printing:printing_java" ] } @@ -4077,6 +4075,7 @@ "//chrome/browser/battery/android:jni_headers", "//chrome/browser/commerce/merchant_viewer/android:jni_headers", "//chrome/browser/commerce/price_tracking/android:jni_headers", + "//chrome/browser/commerce/subscriptions/android:jni_headers", "//chrome/browser/contextmenu:jni_headers", "//chrome/browser/download/android:jni_headers", "//chrome/browser/enterprise/util:jni_headers",
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkBridge.java b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkBridge.java index 9064b9b..4a29de3f 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkBridge.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkBridge.java
@@ -23,19 +23,16 @@ import org.chromium.base.metrics.RecordHistogram; import org.chromium.base.metrics.RecordUserAction; import org.chromium.chrome.browser.commerce.ShoppingFeatures; -import org.chromium.chrome.browser.commerce.ShoppingServiceFactory; import org.chromium.chrome.browser.partnerbookmarks.PartnerBookmarksShim; import org.chromium.chrome.browser.profiles.Profile; import org.chromium.chrome.browser.read_later.ReadingListUtils; +import org.chromium.chrome.browser.subscriptions.CommerceSubscription; +import org.chromium.chrome.browser.subscriptions.CommerceSubscriptionsServiceFactory; +import org.chromium.chrome.browser.subscriptions.SubscriptionsManager; import org.chromium.chrome.browser.tab.Tab; import org.chromium.components.bookmarks.BookmarkId; import org.chromium.components.bookmarks.BookmarkItem; import org.chromium.components.bookmarks.BookmarkType; -import org.chromium.components.commerce.core.CommerceSubscription; -import org.chromium.components.commerce.core.IdentifierType; -import org.chromium.components.commerce.core.ManagementType; -import org.chromium.components.commerce.core.ShoppingService; -import org.chromium.components.commerce.core.SubscriptionsObserver; import org.chromium.components.power_bookmarks.PowerBookmarkMeta; import org.chromium.components.power_bookmarks.PowerBookmarkType; import org.chromium.components.power_bookmarks.ShoppingSpecifics; @@ -57,8 +54,8 @@ private boolean mIsNativeBookmarkModelLoaded; private final ObserverList<BookmarkModelObserver> mObservers = new ObserverList<BookmarkModelObserver>(); - private ShoppingService mShoppingService; - private SubscriptionsObserver mSubscriptionsObserver; + private SubscriptionsManager mSubscriptionManager; + private SubscriptionsManager.SubscriptionObserver mSubscriptionsObserver; /** * Handler to fetch the bookmarks, titles, urls and folder hierarchy. @@ -78,26 +75,25 @@ mNativeBookmarkBridge = nativeBookmarkBridge; mIsDoingExtensiveChanges = BookmarkBridgeJni.get().isDoingExtensiveChanges( mNativeBookmarkBridge, BookmarkBridge.this); - // TODO(crbug.com/1382191): Move this observer to native. - mSubscriptionsObserver = new SubscriptionsObserver() { + mSubscriptionsObserver = new SubscriptionsManager.SubscriptionObserver() { @Override - public void onSubscribe(List<CommerceSubscription> subscriptions, boolean succeeded) {} + public void onSubscribe(List<CommerceSubscription> subscriptions) {} @Override - public void onUnsubscribe(List<CommerceSubscription> subscriptions, boolean succeeded) { - if (!succeeded) return; + public void onUnsubscribe(List<CommerceSubscription> subscriptions) { removeExplicitShoppingSubscriptions(subscriptions); } }; if (ShoppingFeatures.isShoppingListEnabled()) { - mShoppingService = - ShoppingServiceFactory.getForProfile(Profile.getLastUsedRegularProfile()); - mShoppingService.addSubscriptionsObserver(mSubscriptionsObserver); + mSubscriptionManager = new CommerceSubscriptionsServiceFactory() + .getForLastUsedProfile() + .getSubscriptionsManager(); + mSubscriptionManager.addObserver(mSubscriptionsObserver); } } @VisibleForTesting - SubscriptionsObserver getSubscriptionObserver() { + SubscriptionsManager.SubscriptionObserver getSubscriptionObserver() { return mSubscriptionsObserver; } @@ -113,8 +109,8 @@ } mObservers.clear(); - if (mShoppingService != null) { - mShoppingService.removeSubscriptionsObserver(mSubscriptionsObserver); + if (mSubscriptionManager != null) { + mSubscriptionManager.removeObserver(mSubscriptionsObserver); } } @@ -454,14 +450,17 @@ HashSet<Long> clusterIdMap = new HashSet<>(); for (CommerceSubscription c : subscriptions) { // Ensure the subscription is explicit. - if (c == null || c.managementType != ManagementType.USER_MANAGED) { + if (c == null + || !c.getManagementType().equals( + CommerceSubscription.SubscriptionManagementType.USER_MANAGED)) { continue; } - if (c.idType == IdentifierType.OFFER_ID) { - offerIdMap.add(UnsignedLongs.parseUnsignedLong(c.id)); - } else if (c.idType == IdentifierType.PRODUCT_CLUSTER_ID) { - clusterIdMap.add(UnsignedLongs.parseUnsignedLong(c.id)); + if (c.getTrackingIdType().equals(CommerceSubscription.TrackingIdType.OFFER_ID)) { + offerIdMap.add(UnsignedLongs.parseUnsignedLong(c.getTrackingId())); + } else if (c.getTrackingIdType().equals( + CommerceSubscription.TrackingIdType.PRODUCT_CLUSTER_ID)) { + clusterIdMap.add(UnsignedLongs.parseUnsignedLong(c.getTrackingId())); } }
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkItemsAdapter.java b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkItemsAdapter.java index 2c68045..785fe7b 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkItemsAdapter.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkItemsAdapter.java
@@ -25,6 +25,7 @@ import org.chromium.chrome.browser.feature_engagement.TrackerFactory; import org.chromium.chrome.browser.flags.ChromeFeatureList; import org.chromium.chrome.browser.profiles.Profile; +import org.chromium.chrome.browser.subscriptions.CommerceSubscriptionsServiceFactory; import org.chromium.chrome.browser.sync.SyncService; import org.chromium.chrome.browser.ui.messages.snackbar.SnackbarManager; import org.chromium.chrome.browser.ui.signin.PersonalizedSigninPromoView; @@ -67,6 +68,7 @@ private String mSearchText; private BookmarkId mCurrentFolder; private SyncService mSyncService; + private CommerceSubscriptionsServiceFactory mCommerceSubscriptionsServiceFactory; // Keep track of the currently highlighted bookmark - used for "show in folder" action. private BookmarkId mHighlightedBookmark; @@ -126,6 +128,7 @@ ImageFetcherFactory.createImageFetcher(ImageFetcherConfig.IN_MEMORY_WITH_DISK_CACHE, Profile.getLastUsedRegularProfile().getProfileKey(), GlobalDiscardableReferencePool.getReferencePool()); + mCommerceSubscriptionsServiceFactory = new CommerceSubscriptionsServiceFactory(); mSnackbarManager = snackbarManager; }
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkSaveFlowCoordinator.java b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkSaveFlowCoordinator.java index 79480e3..6f7811a7 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkSaveFlowCoordinator.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkSaveFlowCoordinator.java
@@ -20,13 +20,13 @@ import org.chromium.chrome.browser.commerce.PriceTrackingUtils; import org.chromium.chrome.browser.commerce.ShoppingFeatures; import org.chromium.chrome.browser.profiles.Profile; +import org.chromium.chrome.browser.subscriptions.SubscriptionsManager; import org.chromium.chrome.browser.user_education.IPHCommandBuilder; import org.chromium.chrome.browser.user_education.UserEducationHelper; import org.chromium.components.bookmarks.BookmarkId; import org.chromium.components.browser_ui.bottomsheet.BottomSheetContent; import org.chromium.components.browser_ui.bottomsheet.BottomSheetController; import org.chromium.components.browser_ui.bottomsheet.EmptyBottomSheetObserver; -import org.chromium.components.commerce.core.ShoppingService; import org.chromium.components.feature_engagement.FeatureConstants; import org.chromium.components.power_bookmarks.PowerBookmarkMeta; import org.chromium.content_public.browser.UiThreadTaskTraits; @@ -55,12 +55,13 @@ /** * @param context The {@link Context} associated with this cooridnator. * @param bottomSheetController Allows displaying content in the bottom sheet. - * @param shoppingService Allows un/subscribing for product updates, used for + * @param subscriptionsManager Allows un/subscribing for product updates, used for * price-tracking. * @param userEducationHelper A means of triggering IPH. */ public BookmarkSaveFlowCoordinator(@NonNull Context context, - @NonNull BottomSheetController bottomSheetController, ShoppingService shoppingService, + @NonNull BottomSheetController bottomSheetController, + @Nullable SubscriptionsManager subscriptionsManager, @NonNull UserEducationHelper userEducationHelper) { mContext = context; mBottomSheetController = bottomSheetController; @@ -71,7 +72,7 @@ mBookmarkSaveFlowView = LayoutInflater.from(mContext).inflate( org.chromium.chrome.R.layout.bookmark_save_flow, /*root=*/null); mMediator = new BookmarkSaveFlowMediator( - mBookmarkModel, mPropertyModel, mContext, this::close, shoppingService); + mBookmarkModel, mPropertyModel, mContext, this::close, subscriptionsManager); mChangeProcessor = PropertyModelChangeProcessor.create(mPropertyModel, (ViewLookupCachingFrameLayout) mBookmarkSaveFlowView, new BookmarkSaveFlowViewBinder());
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkSaveFlowMediator.java b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkSaveFlowMediator.java index bd16376d..4328b8e 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkSaveFlowMediator.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkSaveFlowMediator.java
@@ -20,11 +20,10 @@ import org.chromium.chrome.browser.feature_engagement.TrackerFactory; import org.chromium.chrome.browser.price_tracking.PriceDropNotificationManagerFactory; import org.chromium.chrome.browser.profiles.Profile; +import org.chromium.chrome.browser.subscriptions.CommerceSubscription; +import org.chromium.chrome.browser.subscriptions.SubscriptionsManager; import org.chromium.components.bookmarks.BookmarkId; import org.chromium.components.bookmarks.BookmarkItem; -import org.chromium.components.commerce.core.CommerceSubscription; -import org.chromium.components.commerce.core.ShoppingService; -import org.chromium.components.commerce.core.SubscriptionsObserver; import org.chromium.components.feature_engagement.EventConstants; import org.chromium.components.power_bookmarks.PowerBookmarkMeta; import org.chromium.ui.modelutil.PropertyModel; @@ -33,7 +32,7 @@ /** Controls the bookmarks save-flow. */ public class BookmarkSaveFlowMediator - extends BookmarkModelObserver implements SubscriptionsObserver { + extends BookmarkModelObserver implements SubscriptionsManager.SubscriptionObserver { private final Context mContext; private final Runnable mCloseRunnable; @@ -43,7 +42,7 @@ private BookmarkId mBookmarkId; private PowerBookmarkMeta mPowerBookmarkMeta; private boolean mWasBookmarkMoved; - private ShoppingService mShoppingService; + private SubscriptionsManager mSubscriptionsManager; private CommerceSubscription mSubscription; private Callback<Boolean> mSubscriptionsManagerCallback; private String mFolderName; @@ -54,10 +53,11 @@ * model. * @param context The {@link Context} associated with this mediator. * @param closeRunnable A {@link Runnable} which closes the bookmark save flow. - * @param shoppingService Used to manage the price-tracking subscriptions. + * @param subscriptionsManager Used to manage the price-tracking subscriptions. */ public BookmarkSaveFlowMediator(BookmarkModel bookmarkModel, PropertyModel propertyModel, - Context context, Runnable closeRunnable, ShoppingService shoppingService) { + Context context, Runnable closeRunnable, + @Nullable SubscriptionsManager subscriptionsManager) { mBookmarkModel = bookmarkModel; mBookmarkModel.addObserver(this); @@ -65,9 +65,9 @@ mContext = context; mCloseRunnable = closeRunnable; - mShoppingService = shoppingService; - if (mShoppingService != null) { - mShoppingService.addSubscriptionsObserver(this); + mSubscriptionsManager = subscriptionsManager; + if (mSubscriptionsManager != null) { + mSubscriptionsManager.addObserver(this); } } @@ -189,8 +189,8 @@ void destroy() { mBookmarkModel.removeObserver(this); - if (mShoppingService != null) { - mShoppingService.removeSubscriptionsObserver(this); + if (mSubscriptionsManager != null) { + mSubscriptionsManager.removeObserver(this); } mBookmarkModel = null; @@ -228,16 +228,14 @@ bindBookmarkProperties(mBookmarkId, mPowerBookmarkMeta, mWasBookmarkMoved); } - // SubscriptionsObserver implementation + // SubscriptionsManager.SubscriptionObserver implementation @Override - public void onSubscribe(List<CommerceSubscription> subscriptions, boolean succeeded) { - if (!succeeded) return; + public void onSubscribe(List<CommerceSubscription> subscriptions) { setPriceTrackingToggleVisualsOnly(subscriptions.contains(mSubscription)); } @Override - public void onUnsubscribe(List<CommerceSubscription> subscriptions, boolean succeeded) { - if (!succeeded) return; + public void onUnsubscribe(List<CommerceSubscription> subscriptions) { setPriceTrackingToggleVisualsOnly(!subscriptions.contains(mSubscription)); } }
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkUtils.java b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkUtils.java index ba1ac2c..17a3e20 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkUtils.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkUtils.java
@@ -40,7 +40,7 @@ import org.chromium.chrome.browser.app.bookmarks.BookmarkEditActivity; import org.chromium.chrome.browser.app.bookmarks.BookmarkFolderSelectActivity; import org.chromium.chrome.browser.browserservices.intents.BrowserServicesIntentDataProvider.CustomTabsUiType; -import org.chromium.chrome.browser.commerce.ShoppingServiceFactory; +import org.chromium.chrome.browser.commerce.ShoppingFeatures; import org.chromium.chrome.browser.customtabs.CustomTabIntentDataProvider; import org.chromium.chrome.browser.customtabs.IncognitoCustomTabIntentDataProvider; import org.chromium.chrome.browser.document.ChromeLauncherActivity; @@ -50,6 +50,8 @@ import org.chromium.chrome.browser.preferences.SharedPreferencesManager; import org.chromium.chrome.browser.profiles.Profile; import org.chromium.chrome.browser.read_later.ReadingListUtils; +import org.chromium.chrome.browser.subscriptions.CommerceSubscriptionsServiceFactory; +import org.chromium.chrome.browser.subscriptions.SubscriptionsManager; import org.chromium.chrome.browser.tab.Tab; import org.chromium.chrome.browser.tab.TabLaunchType; import org.chromium.chrome.browser.ui.messages.snackbar.Snackbar; @@ -60,7 +62,6 @@ import org.chromium.components.bookmarks.BookmarkItem; import org.chromium.components.bookmarks.BookmarkType; import org.chromium.components.browser_ui.bottomsheet.BottomSheetController; -import org.chromium.components.commerce.core.ShoppingService; import org.chromium.components.embedder_support.util.UrlConstants; import org.chromium.components.feature_engagement.EventConstants; import org.chromium.components.profile_metrics.BrowserProfileType; @@ -141,12 +142,16 @@ return; } - ShoppingService shoppingService = - ShoppingServiceFactory.getForProfile(Profile.getLastUsedRegularProfile()); + SubscriptionsManager subscriptionService = null; + if (ShoppingFeatures.isShoppingListEnabled()) { + subscriptionService = new CommerceSubscriptionsServiceFactory() + .getForLastUsedProfile() + .getSubscriptionsManager(); + } BookmarkSaveFlowCoordinator bookmarkSaveFlowCoordinator = - new BookmarkSaveFlowCoordinator(activity, bottomSheetController, shoppingService, - new UserEducationHelper(activity, new Handler())); + new BookmarkSaveFlowCoordinator(activity, bottomSheetController, + subscriptionService, new UserEducationHelper(activity, new Handler())); bookmarkSaveFlowCoordinator.show(bookmarkId, fromExplicitTrackUi, wasBookmarkMoved); }
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/PowerBookmarkShoppingItemRow.java b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/PowerBookmarkShoppingItemRow.java index ad6b1b8..9c51496 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/PowerBookmarkShoppingItemRow.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/PowerBookmarkShoppingItemRow.java
@@ -20,12 +20,12 @@ import org.chromium.base.Callback; import org.chromium.chrome.R; import org.chromium.chrome.browser.bookmarks.PowerBookmarkMetrics.PriceTrackingState; +import org.chromium.chrome.browser.subscriptions.CommerceSubscription; import org.chromium.chrome.browser.ui.messages.snackbar.SnackbarManager; import org.chromium.components.bookmarks.BookmarkId; import org.chromium.components.bookmarks.BookmarkItem; import org.chromium.components.browser_ui.widget.RoundedCornerOutlineProvider; import org.chromium.components.browser_ui.widget.chips.ChipView; -import org.chromium.components.commerce.core.CommerceSubscription; import org.chromium.components.image_fetcher.ImageFetcher; import org.chromium.components.payments.CurrencyFormatter; import org.chromium.components.power_bookmarks.PowerBookmarkMeta;
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/PowerBookmarkUtils.java b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/PowerBookmarkUtils.java index 1891d05..1900499 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/PowerBookmarkUtils.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/PowerBookmarkUtils.java
@@ -18,16 +18,16 @@ import org.chromium.chrome.browser.commerce.ShoppingServiceFactory; import org.chromium.chrome.browser.price_tracking.PriceDropNotificationManagerFactory; import org.chromium.chrome.browser.profiles.Profile; +import org.chromium.chrome.browser.subscriptions.CommerceSubscription; +import org.chromium.chrome.browser.subscriptions.CommerceSubscription.CommerceSubscriptionType; +import org.chromium.chrome.browser.subscriptions.CommerceSubscription.PriceTrackableOffer; +import org.chromium.chrome.browser.subscriptions.CommerceSubscription.SubscriptionManagementType; +import org.chromium.chrome.browser.subscriptions.CommerceSubscription.TrackingIdType; import org.chromium.chrome.browser.tab.Tab; import org.chromium.chrome.browser.ui.messages.snackbar.Snackbar; import org.chromium.chrome.browser.ui.messages.snackbar.SnackbarManager; import org.chromium.components.bookmarks.BookmarkId; -import org.chromium.components.commerce.core.CommerceSubscription; -import org.chromium.components.commerce.core.CommerceSubscription.UserSeenOffer; -import org.chromium.components.commerce.core.IdentifierType; -import org.chromium.components.commerce.core.ManagementType; import org.chromium.components.commerce.core.ShoppingService; -import org.chromium.components.commerce.core.SubscriptionType; import org.chromium.components.power_bookmarks.PowerBookmarkMeta; import org.chromium.components.power_bookmarks.PowerBookmarkType; import org.chromium.components.power_bookmarks.ShoppingSpecifics; @@ -90,14 +90,14 @@ @NonNull PowerBookmarkMeta meta) { ShoppingSpecifics shoppingSpecifics = meta.getShoppingSpecifics(); // Use UnsignedLongs to convert ProductClusterId to avoid overflow. - UserSeenOffer seenOffer = - new UserSeenOffer(UnsignedLongs.toString(shoppingSpecifics.getOfferId()), - shoppingSpecifics.getCurrentPrice().getAmountMicros(), + PriceTrackableOffer seenOffer = + new PriceTrackableOffer(UnsignedLongs.toString(shoppingSpecifics.getOfferId()), + Long.toString(shoppingSpecifics.getCurrentPrice().getAmountMicros()), shoppingSpecifics.getCountryCode()); - return new CommerceSubscription(SubscriptionType.PRICE_TRACK, - IdentifierType.PRODUCT_CLUSTER_ID, + return new CommerceSubscription(CommerceSubscriptionType.PRICE_TRACK, UnsignedLongs.toString(shoppingSpecifics.getProductClusterId()), - ManagementType.USER_MANAGED, seenOffer); + SubscriptionManagementType.USER_MANAGED, TrackingIdType.PRODUCT_CLUSTER_ID, + seenOffer); } /**
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java b/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java index c48d1eb2..419814bf 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java
@@ -804,6 +804,7 @@ CommerceSubscriptionsServiceFactory factory = new CommerceSubscriptionsServiceFactory(); mCommerceSubscriptionsService = factory.getForLastUsedProfile(); + mCommerceSubscriptionsService.getSubscriptionsManager().queryAndUpdateWaaEnabled(); mCommerceSubscriptionsService.initDeferredStartupForActivity( mTabModelSelectorSupplier.get(), mActivityLifecycleDispatcher); }
diff --git a/chrome/android/java_sources.gni b/chrome/android/java_sources.gni index d9f9cca6be..3c71a40c 100644 --- a/chrome/android/java_sources.gni +++ b/chrome/android/java_sources.gni
@@ -49,6 +49,7 @@ chrome_junit_test_java_deps += feed_test_deps chrome_junit_test_java_sources += commerce_subscriptions_junit_test_sources chrome_junit_test_java_deps += commerce_subscriptions_junit_test_deps +chrome_test_java_sources += commerce_subscriptions_java_test_sources chrome_test_java_sources += commerce_merchant_viewer_java_test_sources if (enable_arcore) {
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/bookmarks/BookmarkBridgeTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/bookmarks/BookmarkBridgeTest.java index d740398e..f0aaacf 100644 --- a/chrome/android/javatests/src/org/chromium/chrome/browser/bookmarks/BookmarkBridgeTest.java +++ b/chrome/android/javatests/src/org/chromium/chrome/browser/bookmarks/BookmarkBridgeTest.java
@@ -21,16 +21,13 @@ import org.chromium.base.test.util.RequiresRestart; import org.chromium.chrome.browser.flags.ChromeFeatureList; import org.chromium.chrome.browser.profiles.Profile; +import org.chromium.chrome.browser.subscriptions.CommerceSubscription; import org.chromium.chrome.test.ChromeBrowserTestRule; import org.chromium.chrome.test.util.BookmarkTestUtil; import org.chromium.chrome.test.util.browser.Features; import org.chromium.components.bookmarks.BookmarkId; import org.chromium.components.bookmarks.BookmarkItem; import org.chromium.components.bookmarks.BookmarkType; -import org.chromium.components.commerce.core.CommerceSubscription; -import org.chromium.components.commerce.core.IdentifierType; -import org.chromium.components.commerce.core.ManagementType; -import org.chromium.components.commerce.core.SubscriptionType; import org.chromium.components.power_bookmarks.PowerBookmarkMeta; import org.chromium.components.power_bookmarks.ShoppingSpecifics; import org.chromium.content_public.browser.test.util.TestThreadUtils; @@ -388,10 +385,11 @@ Assert.assertTrue(originalMeta.getShoppingSpecifics().getIsPriceTracked()); ArrayList<CommerceSubscription> subscriptions = new ArrayList<>(); - subscriptions.add( - new CommerceSubscription(SubscriptionType.PRICE_TRACK, IdentifierType.OFFER_ID, - Long.toString(offerId), ManagementType.USER_MANAGED, null)); - mBookmarkBridge.getSubscriptionObserver().onUnsubscribe(subscriptions, true); + subscriptions.add(new CommerceSubscription( + CommerceSubscription.CommerceSubscriptionType.PRICE_TRACK, Long.toString(offerId), + CommerceSubscription.SubscriptionManagementType.USER_MANAGED, + CommerceSubscription.TrackingIdType.OFFER_ID)); + mBookmarkBridge.getSubscriptionObserver().onUnsubscribe(subscriptions); // The product with the unsubscribed ID should no longer be price tracked. PowerBookmarkMeta updatedMeta = mBookmarkBridge.getPowerBookmarkMeta(bookmark);
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/bookmarks/BookmarkSaveFlowTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/bookmarks/BookmarkSaveFlowTest.java index 2a3a73a..14a52abe 100644 --- a/chrome/android/javatests/src/org/chromium/chrome/browser/bookmarks/BookmarkSaveFlowTest.java +++ b/chrome/android/javatests/src/org/chromium/chrome/browser/bookmarks/BookmarkSaveFlowTest.java
@@ -41,6 +41,8 @@ import org.chromium.chrome.browser.flags.ChromeSwitches; import org.chromium.chrome.browser.partnerbookmarks.PartnerBookmarksShim; import org.chromium.chrome.browser.profiles.Profile; +import org.chromium.chrome.browser.subscriptions.CommerceSubscription; +import org.chromium.chrome.browser.subscriptions.SubscriptionsManager; import org.chromium.chrome.browser.user_education.UserEducationHelper; import org.chromium.chrome.test.ChromeActivityTestRule; import org.chromium.chrome.test.ChromeJUnit4ClassRunner; @@ -51,8 +53,6 @@ import org.chromium.components.bookmarks.BookmarkId; import org.chromium.components.browser_ui.bottomsheet.BottomSheetController; import org.chromium.components.browser_ui.bottomsheet.BottomSheetTestSupport; -import org.chromium.components.commerce.core.CommerceSubscription; -import org.chromium.components.commerce.core.ShoppingService; import org.chromium.components.power_bookmarks.PowerBookmarkMeta; import org.chromium.components.power_bookmarks.ShoppingSpecifics; import org.chromium.content_public.browser.test.util.ClickUtils; @@ -81,7 +81,7 @@ public JniMocker mJniMocker = new JniMocker(); @Mock - ShoppingService mShoppingService; + SubscriptionsManager mSubscriptionsManager; @Mock PriceTrackingUtils.Natives mMockPriceTrackingUtilsJni; @@ -107,7 +107,7 @@ cta.getRootUiCoordinatorForTesting().getBottomSheetController(); mBottomSheetTestSupport = new BottomSheetTestSupport(mBottomSheetController); mBookmarkSaveFlowCoordinator = new BookmarkSaveFlowCoordinator( - cta, mBottomSheetController, mShoppingService, mUserEducationHelper); + cta, mBottomSheetController, mSubscriptionsManager, mUserEducationHelper); mBookmarkModel = mActivityTestRule.getActivity().getBookmarkModelForTesting(); }); @@ -120,16 +120,18 @@ .setPriceTrackingStateForBookmark( any(Profile.class), anyLong(), anyBoolean(), any()); doAnswer((invocation) -> { - ((Callback<Boolean>) invocation.getArgument(1)).onResult(true); + ((Callback<Integer>) invocation.getArgument(1)) + .onResult(SubscriptionsManager.StatusCode.OK); return null; }) - .when(mShoppingService) + .when(mSubscriptionsManager) .subscribe(any(CommerceSubscription.class), any()); doAnswer((invocation) -> { - ((Callback<Boolean>) invocation.getArgument(1)).onResult(true); + ((Callback<Integer>) invocation.getArgument(1)) + .onResult(SubscriptionsManager.StatusCode.OK); return null; }) - .when(mShoppingService) + .when(mSubscriptionsManager) .unsubscribe(any(CommerceSubscription.class), any()); } @@ -232,10 +234,11 @@ .setPriceTrackingStateForBookmark( any(Profile.class), anyLong(), anyBoolean(), any()); doAnswer((invocation) -> { - ((Callback<Boolean>) invocation.getArgument(1)).onResult(false); + ((Callback<Integer>) invocation.getArgument(1)) + .onResult(SubscriptionsManager.StatusCode.NETWORK_ERROR); return null; }) - .when(mShoppingService) + .when(mSubscriptionsManager) .subscribe(any(CommerceSubscription.class), any()); onView(withId(R.id.notification_switch)).perform(click()); mRenderTestRule.render(mBookmarkSaveFlowCoordinator.getViewForTesting(),
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/bookmarks/PowerBookmarkUtilsTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/bookmarks/PowerBookmarkUtilsTest.java index 0acc3a7..0192b51 100644 --- a/chrome/android/javatests/src/org/chromium/chrome/browser/bookmarks/PowerBookmarkUtilsTest.java +++ b/chrome/android/javatests/src/org/chromium/chrome/browser/bookmarks/PowerBookmarkUtilsTest.java
@@ -19,12 +19,9 @@ import org.chromium.base.test.BaseJUnit4ClassRunner; import org.chromium.base.test.util.Batch; +import org.chromium.chrome.browser.subscriptions.CommerceSubscription; import org.chromium.components.bookmarks.BookmarkId; import org.chromium.components.bookmarks.BookmarkType; -import org.chromium.components.commerce.core.CommerceSubscription; -import org.chromium.components.commerce.core.IdentifierType; -import org.chromium.components.commerce.core.ManagementType; -import org.chromium.components.commerce.core.SubscriptionType; import org.chromium.components.power_bookmarks.PowerBookmarkMeta; import org.chromium.components.power_bookmarks.ProductPrice; import org.chromium.components.power_bookmarks.ShoppingSpecifics; @@ -58,12 +55,14 @@ CommerceSubscription subscription = PowerBookmarkUtils.createCommerceSubscriptionForPowerBookmarkMeta(meta); - Assert.assertEquals(IdentifierType.PRODUCT_CLUSTER_ID, subscription.idType); - Assert.assertEquals(ManagementType.USER_MANAGED, subscription.managementType); - Assert.assertEquals("123", subscription.id); - Assert.assertEquals("456", subscription.userSeenOffer.offerId); - Assert.assertEquals(100L, subscription.userSeenOffer.userSeenPrice); - Assert.assertEquals("us", subscription.userSeenOffer.countryCode); + Assert.assertEquals(CommerceSubscription.TrackingIdType.PRODUCT_CLUSTER_ID, + subscription.getTrackingIdType()); + Assert.assertEquals(CommerceSubscription.SubscriptionManagementType.USER_MANAGED, + subscription.getManagementType()); + Assert.assertEquals("123", subscription.getTrackingId()); + Assert.assertEquals("456", subscription.getSeenOffer().offerId); + Assert.assertEquals("100", subscription.getSeenOffer().currentPrice); + Assert.assertEquals("us", subscription.getSeenOffer().countryCode); } /** @@ -71,8 +70,9 @@ * @return A user-managed subscription with the specified ID. */ private CommerceSubscription buildSubscription(String clusterId) { - return new CommerceSubscription(SubscriptionType.PRICE_TRACK, - IdentifierType.PRODUCT_CLUSTER_ID, clusterId, ManagementType.USER_MANAGED, null); + return new CommerceSubscription(CommerceSubscription.CommerceSubscriptionType.PRICE_TRACK, + clusterId, CommerceSubscription.SubscriptionManagementType.USER_MANAGED, + CommerceSubscription.TrackingIdType.PRODUCT_CLUSTER_ID); } /**
diff --git a/chrome/android/junit/src/org/chromium/chrome/browser/bookmarks/BookmarkSaveFlowMediatorTest.java b/chrome/android/junit/src/org/chromium/chrome/browser/bookmarks/BookmarkSaveFlowMediatorTest.java index 1a885742..7606940 100644 --- a/chrome/android/junit/src/org/chromium/chrome/browser/bookmarks/BookmarkSaveFlowMediatorTest.java +++ b/chrome/android/junit/src/org/chromium/chrome/browser/bookmarks/BookmarkSaveFlowMediatorTest.java
@@ -18,8 +18,8 @@ import org.chromium.base.test.BaseRobolectricTestRunner; import org.chromium.base.test.util.Batch; import org.chromium.chrome.R; -import org.chromium.components.commerce.core.CommerceSubscription; -import org.chromium.components.commerce.core.ShoppingService; +import org.chromium.chrome.browser.subscriptions.CommerceSubscription; +import org.chromium.chrome.browser.subscriptions.SubscriptionsManager; import org.chromium.ui.modelutil.PropertyModel; import org.chromium.ui.shadows.ShadowAppCompatResources; @@ -41,7 +41,7 @@ @Mock BookmarkModel mModel; @Mock - ShoppingService mShoppingService; + SubscriptionsManager mSubscriptionsManager; @Mock CommerceSubscription mSubscription; @@ -49,7 +49,7 @@ public void setup() { MockitoAnnotations.initMocks(this); mMediator = new BookmarkSaveFlowMediator( - mModel, mPropertyModel, mContext, mCloseRunnable, mShoppingService); + mModel, mPropertyModel, mContext, mCloseRunnable, mSubscriptionsManager); mMediator.setSubscriptionForTesting(mSubscription); } @@ -62,15 +62,15 @@ (int) mPropertyModel.get( BookmarkSaveFlowProperties.NOTIFICATION_SWITCH_START_ICON_RES)); - mMediator.onSubscribe(Arrays.asList(mSubscription), true); + mMediator.onSubscribe(Arrays.asList(mSubscription)); Assert.assertTrue( mPropertyModel.get(BookmarkSaveFlowProperties.NOTIFICATION_SWITCH_TOGGLED)); Assert.assertEquals(R.drawable.price_tracking_enabled_filled, (int) mPropertyModel.get( BookmarkSaveFlowProperties.NOTIFICATION_SWITCH_START_ICON_RES)); - Mockito.verify(mShoppingService, Mockito.never()) + Mockito.verify(mSubscriptionsManager, Mockito.never()) .subscribe(Mockito.any(CommerceSubscription.class), Mockito.any()); - Mockito.verify(mShoppingService, Mockito.never()) + Mockito.verify(mSubscriptionsManager, Mockito.never()) .unsubscribe(Mockito.any(CommerceSubscription.class), Mockito.any()); } @@ -83,15 +83,15 @@ (int) mPropertyModel.get( BookmarkSaveFlowProperties.NOTIFICATION_SWITCH_START_ICON_RES)); - mMediator.onUnsubscribe(Arrays.asList(mSubscription), true); + mMediator.onUnsubscribe(Arrays.asList(mSubscription)); Assert.assertFalse( mPropertyModel.get(BookmarkSaveFlowProperties.NOTIFICATION_SWITCH_TOGGLED)); Assert.assertEquals(R.drawable.price_tracking_disabled, (int) mPropertyModel.get( BookmarkSaveFlowProperties.NOTIFICATION_SWITCH_START_ICON_RES)); - Mockito.verify(mShoppingService, Mockito.never()) + Mockito.verify(mSubscriptionsManager, Mockito.never()) .subscribe(Mockito.any(CommerceSubscription.class), Mockito.any()); - Mockito.verify(mShoppingService, Mockito.never()) + Mockito.verify(mSubscriptionsManager, Mockito.never()) .unsubscribe(Mockito.any(CommerceSubscription.class), Mockito.any()); } }
diff --git a/chrome/app/password_manager_ui_strings.grdp b/chrome/app/password_manager_ui_strings.grdp index 57194b2..107aad9 100644 --- a/chrome/app/password_manager_ui_strings.grdp +++ b/chrome/app/password_manager_ui_strings.grdp
@@ -185,4 +185,28 @@ <message name="IDS_PASSWORD_MANAGER_UI_ADD_PASSWORD_FOOTNOTE" desc="A footnote for the dialog which allows the user to add a new password."> Make sure you're saving your current password for this site </message> + <message name="IDS_PASSWORD_MANAGER_UI_PASSWORD_LEAKED" desc="Password compromise reason shown on checkup details page when a password was found in a data breach."> + Found in data breach + </message> + <message name="IDS_PASSWORD_MANAGER_UI_PASSWORD_PHISHED" desc="Password compromise reason shown on checkup details page when a password was reused on a phishing site."> + Entered on deceptive site + </message> + <message name="IDS_PASSWORD_MANAGER_UI_PASSWORD_PHISHED_AND_LEAKED" desc="Password compromise reason shown on checkup details page when a password was reused on a phishing site and found in a data breach."> + Entered on deceptive site and found in data breach + </message> + <message name="IDS_PASSWORD_MANAGER_UI_CHANGE_PASSWORD_BUTTON" desc="Button inside password check section which opens url for changing leaked password."> + Change password + </message> + <message name="IDS_PASSWORD_MANAGER_UI_MORE_ACTIONS" desc="Tooltip text (shows on hover or for screenreaders) for a button that shows a menu with more actions when clicked or tapped."> + More actions + </message> + <message name="IDS_PASSWORD_MANAGER_UI_COMPROMISED_PASSWORDS_DESCRIPTION" desc="Sub-label which is shown in the compromised passwords sub-section."> + Some of your passwords were found in a data breach. To secure your accounts, you should change these passwords now. + </message> + <message name="IDS_PASSWORD_MANAGER_UI_REUSED_PASSWORDS_DESCRIPTION" desc="Sub-label which is shown in the reused passwords sub-section."> + Use a unique password for every site or app. If someone discovers a reused password, it can be used to access your other accounts. + </message> + <message name="IDS_PASSWORD_MANAGER_UI_WEAK_PASSWORDS_DESCRIPTION" desc="Sub-label which is shown in the weak passwords sub-section."> + Weak passwords are easy to guess. Make sure you're creating strong passwords. + </message> </grit-part>
diff --git a/chrome/app/password_manager_ui_strings_grdp/IDS_PASSWORD_MANAGER_UI_CHANGE_PASSWORD_BUTTON.png.sha1 b/chrome/app/password_manager_ui_strings_grdp/IDS_PASSWORD_MANAGER_UI_CHANGE_PASSWORD_BUTTON.png.sha1 new file mode 100644 index 0000000..3d431fa --- /dev/null +++ b/chrome/app/password_manager_ui_strings_grdp/IDS_PASSWORD_MANAGER_UI_CHANGE_PASSWORD_BUTTON.png.sha1
@@ -0,0 +1 @@ +09d750b15a1e35a0f993e59ec406c8fdc769dabe \ No newline at end of file
diff --git a/chrome/app/password_manager_ui_strings_grdp/IDS_PASSWORD_MANAGER_UI_COMPROMISED_PASSWORDS_DESCRIPTION.png.sha1 b/chrome/app/password_manager_ui_strings_grdp/IDS_PASSWORD_MANAGER_UI_COMPROMISED_PASSWORDS_DESCRIPTION.png.sha1 new file mode 100644 index 0000000..aa84050 --- /dev/null +++ b/chrome/app/password_manager_ui_strings_grdp/IDS_PASSWORD_MANAGER_UI_COMPROMISED_PASSWORDS_DESCRIPTION.png.sha1
@@ -0,0 +1 @@ +706efaa44d5cdeb3cd8b9b83d3b813c61cf6f9e5 \ No newline at end of file
diff --git a/chrome/app/password_manager_ui_strings_grdp/IDS_PASSWORD_MANAGER_UI_MORE_ACTIONS.png.sha1 b/chrome/app/password_manager_ui_strings_grdp/IDS_PASSWORD_MANAGER_UI_MORE_ACTIONS.png.sha1 new file mode 100644 index 0000000..57b28136 --- /dev/null +++ b/chrome/app/password_manager_ui_strings_grdp/IDS_PASSWORD_MANAGER_UI_MORE_ACTIONS.png.sha1
@@ -0,0 +1 @@ +68b015997661d880d347a1330e4a80e1552e6b24 \ No newline at end of file
diff --git a/chrome/app/password_manager_ui_strings_grdp/IDS_PASSWORD_MANAGER_UI_PASSWORD_LEAKED.png.sha1 b/chrome/app/password_manager_ui_strings_grdp/IDS_PASSWORD_MANAGER_UI_PASSWORD_LEAKED.png.sha1 new file mode 100644 index 0000000..aa84050 --- /dev/null +++ b/chrome/app/password_manager_ui_strings_grdp/IDS_PASSWORD_MANAGER_UI_PASSWORD_LEAKED.png.sha1
@@ -0,0 +1 @@ +706efaa44d5cdeb3cd8b9b83d3b813c61cf6f9e5 \ No newline at end of file
diff --git a/chrome/app/password_manager_ui_strings_grdp/IDS_PASSWORD_MANAGER_UI_PASSWORD_PHISHED.png.sha1 b/chrome/app/password_manager_ui_strings_grdp/IDS_PASSWORD_MANAGER_UI_PASSWORD_PHISHED.png.sha1 new file mode 100644 index 0000000..75cecb7 --- /dev/null +++ b/chrome/app/password_manager_ui_strings_grdp/IDS_PASSWORD_MANAGER_UI_PASSWORD_PHISHED.png.sha1
@@ -0,0 +1 @@ +2f0aaab032bccdcc135823b758562839e7ad806d \ No newline at end of file
diff --git a/chrome/app/password_manager_ui_strings_grdp/IDS_PASSWORD_MANAGER_UI_PASSWORD_PHISHED_AND_LEAKED.png.sha1 b/chrome/app/password_manager_ui_strings_grdp/IDS_PASSWORD_MANAGER_UI_PASSWORD_PHISHED_AND_LEAKED.png.sha1 new file mode 100644 index 0000000..8dfca02 --- /dev/null +++ b/chrome/app/password_manager_ui_strings_grdp/IDS_PASSWORD_MANAGER_UI_PASSWORD_PHISHED_AND_LEAKED.png.sha1
@@ -0,0 +1 @@ +f0125d781d0ce96b88e34dffda2a870f17ff0854 \ No newline at end of file
diff --git a/chrome/app/password_manager_ui_strings_grdp/IDS_PASSWORD_MANAGER_UI_REUSED_PASSWORDS_DESCRIPTION.png.sha1 b/chrome/app/password_manager_ui_strings_grdp/IDS_PASSWORD_MANAGER_UI_REUSED_PASSWORDS_DESCRIPTION.png.sha1 new file mode 100644 index 0000000..efe1f7bc --- /dev/null +++ b/chrome/app/password_manager_ui_strings_grdp/IDS_PASSWORD_MANAGER_UI_REUSED_PASSWORDS_DESCRIPTION.png.sha1
@@ -0,0 +1 @@ +35b6e7f5ad6f7e6a334c5e7659c6c9a4f40a2855 \ No newline at end of file
diff --git a/chrome/app/password_manager_ui_strings_grdp/IDS_PASSWORD_MANAGER_UI_WEAK_PASSWORDS_DESCRIPTION.png.sha1 b/chrome/app/password_manager_ui_strings_grdp/IDS_PASSWORD_MANAGER_UI_WEAK_PASSWORDS_DESCRIPTION.png.sha1 new file mode 100644 index 0000000..3d431fa --- /dev/null +++ b/chrome/app/password_manager_ui_strings_grdp/IDS_PASSWORD_MANAGER_UI_WEAK_PASSWORDS_DESCRIPTION.png.sha1
@@ -0,0 +1 @@ +09d750b15a1e35a0f993e59ec406c8fdc769dabe \ No newline at end of file
diff --git a/chrome/app/settings_strings.grdp b/chrome/app/settings_strings.grdp index d6250a60..36164ae 100644 --- a/chrome/app/settings_strings.grdp +++ b/chrome/app/settings_strings.grdp
@@ -1883,23 +1883,17 @@ <!-- Privacy Sandbox v4 - Topics Page --> <!-- Where possible, these strings have been unified on Desktop & Android in privacy_sandox_strings.grdp. The strings here either only appear on one platform, or have platform specific requirements, e.g. the format of placeholders, and so cannot be unified. For the latter case, they have corresponding _CANONICAL representations used when consent is recorded on either platform, and so they must stay in sync --> - <message name="IDS_SETTINGS_TOPICS_PAGE_CURRENT_TOPICS_DESCRIPTION" translateable="false" desc="Section description for the current Topics list in the Topics preferences page."> - Nulla tincidunt iaculis nulla, sit amet viverra massa luctus nec. Integer eget pellentesque magna, et venenatis lorem. Integer a porta elit. + <message name="IDS_SETTINGS_TOPICS_PAGE_CURRENT_TOPICS_DESCRIPTION" desc="A description that appear beneath the 'Your topics' label. * 'You can block': There is a 'Block' button (or an X on mobile) that appears next to each topic in the list. * 'auto-deletes': this could also read 'Chrome deletes...' We included the 'auto' to reinforce that this is part of a system and the deletion is done regularly."> + You can block topics you don’t want shared with sites. Chrome also auto-deletes your topics older than 4 weeks. </message> - <message name="IDS_SETTINGS_TOPICS_PAGE_CURRENT_TOPICS_DESCRIPTION_LEARN_MORE_A11Y_LABEL" translateable="false" desc="A11y label for the clickable section of the description ('Learn more') for the current Topics list in the Topics preferences page."> - A11y label. Nulla tincidunt iaculis nulla, sit amet viverra massa luctus nec. Integer eget pellentesque magna, et venenatis lorem. Integer a porta elit. + <message name="IDS_SETTINGS_TOPICS_PAGE_CURRENT_TOPICS_DESCRIPTION_LEARN_MORE_A11Y_LABEL" desc="Read by screen readers and associated with a 'learn more' button."> + Learn more about ad topics </message> - <message name="IDS_SETTINGS_TOPICS_PAGE_CURRENT_TOPICS_DESCRIPTION_DISABLED" translateable="false" desc="Section description for the current Topics list when Topics is disabled in the Topics preferences page."> - Sed porta viverra lacus ut euismod. Integer a cursus metus, ac ultricies libero. + <message name="IDS_SETTINGS_TOPICS_PAGE_CURRENT_TOPICS_DESCRIPTION_LEARN_MORE_LINK" desc="Text read by screen readers to help users distinguish this 'Learn more' link from others that might get added to this page."> + Learn more </message> - <message name="IDS_SETTINGS_TOPICS_PAGE_CURRENT_TOPICS_DESCRIPTION_EMPTY" translateable="false" desc="Section description for the current Topics list when the Topics list is empty in the Topics preferences page."> - Curabitur sagittis sapien ut turpis interdum, vitae porttitor sem pretium. Vestibulum sem mauris, ultrices ac massa sit amet, sodales aliquet est. - </message> - <message name="IDS_SETTINGS_TOPICS_PAGE_CURRENT_TOPICS_DESCRIPTION_LEARN_MORE_LINK" translateable="false" desc="Text for the clickable section of the description ('Learn more') for the current Topics list in the Topics preferences page."> - Eget bibendum neque. - </message> - <message name="IDS_SETTINGS_TOPICS_PAGE_FOOTER" translateable="false" desc="Footer with more information at the bottom of the Topics preferences page."> - Quisque eu auctor purus, id tempus nulla. Pellentesque porta orci purus. Donec dictum, <ph name="BEGIN_LINK1"><a href="$1" target="_blank"></ph>justo nec ultricies semper<ph name="LINK_END1"></a></ph>, eros mauris varius nibh, <ph name="BEGIN_LINK2"><a href="$2" target="_blank"></ph>sit amet molestie quam<ph name="LINK_END2"></a></ph> arcu id urna. Donec vulputate dui ut lorem egestas, ac sollicitudin metus fermentum. + <message name="IDS_SETTINGS_TOPICS_PAGE_FOOTER" desc="This footer helps the user understand that this setting is just one signal among others that affect whether this user sees personalized ads on a site. We define 'personalize' as 'when Google provides recommendations and other content for users based on their data'. At a high level, there are 4 things that affect whether an ad is personalized in this context: * 'this setting' refers to the 'Ad topics' setting. The user is on this page. * 'Site-suggested ads': this is a link to the other new ad setting Chrome is launching and that sites can use to personalize ads a user sees. * 'cookie settings': this is a link to the cookies control section in Chrome settings. The Privacy Sandbox project deprecates third-party cookies, but it's a process, and we're launching new functionality that will replace important functionality of cookies. Until third-party cookies are deprecated, the two systems remain active in Chrome. * 'site you're viewing personalizes ads': When a user engages with a site, Chrome has no control over whether that site shows the user personalized ads. Imagine you visit www.interesting-site.com and they know a lot about you already based on previous visits. They can personalize content and ads to you if they like. They can use an ad-serving product, like Facebook or Google Ads to deliver personalized ads. They can also use the new Privacy Sandbox APIs (if they so choose) in order to get more information about the user that could be helpful to them in order to personalize ads. Those 2 APIs (settings, from the user's perspective), are 'Ad topics' and 'Site-suggested ads'."> + As you browse, whether an ad you see is personalized depends on this setting, <ph name="BEGIN_LINK1"><a href="$1" target="_blank"></ph>Site-suggested ads<ph name="LINK_END1"></a></ph>, your <ph name="BEGIN_LINK2"><a href="$2" target="_blank"></ph>cookie settings<ph name="LINK_END2"></a></ph>, and if the site you’re viewing personalizes ads </message> <!-- Privacy Sandbox Settings 4 - Fledge Page --> @@ -3770,8 +3764,8 @@ <message name="IDS_SETTINGS_SITE_SETTINGS_SITE_CLEAR_STORAGE_OFFLINE_DATA" desc="Text for the dialog that warns about loss of offline data when clearing all storage data."> Any offline data will be cleared </message> - <message name="IDS_SETTINGS_SITE_SETTINGS_REMOVE_SITE_AD_PERSONALIZATION" translateable="false" desc="Text for the dialog that warns about loss of the data that affects ad personalization when clearing all storage data."> - Nunc pulvinar, orci sed ullamcorper varius, nunc velit eleifend quam, a commodo lacus elit id tortor + <message name="IDS_SETTINGS_SITE_SETTINGS_REMOVE_SITE_AD_PERSONALIZATION" desc="A bullet in a list of data that gets deleted from the user's device when they choose 'Clear data' for a specific site. 1) Go to chrome://settings/content. 2) From the 'Recent activity' list, choose a site. 3) Click the 'Clear data' button. The 'Clear site data?' dialog appears. This string will appear as a new bullet at the bottom of the dialog."> + Data that affects ad personalization is deleted </message> <message name="IDS_SETTINGS_SITE_SETTINGS_SITE_CLEAR_STORAGE_APPS" desc="Text for the dialog that warns about loss of offline data for installed app when clearing all storage data for site."> Offline data in installed app will also be cleared
diff --git a/chrome/app/settings_strings_grdp/IDS_SETTINGS_SITE_SETTINGS_REMOVE_SITE_AD_PERSONALIZATION.png.sha1 b/chrome/app/settings_strings_grdp/IDS_SETTINGS_SITE_SETTINGS_REMOVE_SITE_AD_PERSONALIZATION.png.sha1 new file mode 100644 index 0000000..0c57e1a1 --- /dev/null +++ b/chrome/app/settings_strings_grdp/IDS_SETTINGS_SITE_SETTINGS_REMOVE_SITE_AD_PERSONALIZATION.png.sha1
@@ -0,0 +1 @@ +90ba646c4653ecfac3aa24d80700ae6ce72918c6 \ No newline at end of file
diff --git a/chrome/app/settings_strings_grdp/IDS_SETTINGS_TOPICS_PAGE_CURRENT_TOPICS_DESCRIPTION.png.sha1 b/chrome/app/settings_strings_grdp/IDS_SETTINGS_TOPICS_PAGE_CURRENT_TOPICS_DESCRIPTION.png.sha1 new file mode 100644 index 0000000..7f6e2ff --- /dev/null +++ b/chrome/app/settings_strings_grdp/IDS_SETTINGS_TOPICS_PAGE_CURRENT_TOPICS_DESCRIPTION.png.sha1
@@ -0,0 +1 @@ +a998cde87ae90aee405406a8515f92bfd88f5646 \ No newline at end of file
diff --git a/chrome/app/settings_strings_grdp/IDS_SETTINGS_TOPICS_PAGE_CURRENT_TOPICS_DESCRIPTION_LEARN_MORE_A11Y_LABEL.png.sha1 b/chrome/app/settings_strings_grdp/IDS_SETTINGS_TOPICS_PAGE_CURRENT_TOPICS_DESCRIPTION_LEARN_MORE_A11Y_LABEL.png.sha1 new file mode 100644 index 0000000..0457997 --- /dev/null +++ b/chrome/app/settings_strings_grdp/IDS_SETTINGS_TOPICS_PAGE_CURRENT_TOPICS_DESCRIPTION_LEARN_MORE_A11Y_LABEL.png.sha1
@@ -0,0 +1 @@ +8ef277f1a529043c5bf150a72f5b26e0e298a109 \ No newline at end of file
diff --git a/chrome/app/settings_strings_grdp/IDS_SETTINGS_TOPICS_PAGE_CURRENT_TOPICS_DESCRIPTION_LEARN_MORE_LINK.png.sha1 b/chrome/app/settings_strings_grdp/IDS_SETTINGS_TOPICS_PAGE_CURRENT_TOPICS_DESCRIPTION_LEARN_MORE_LINK.png.sha1 new file mode 100644 index 0000000..7f6e2ff --- /dev/null +++ b/chrome/app/settings_strings_grdp/IDS_SETTINGS_TOPICS_PAGE_CURRENT_TOPICS_DESCRIPTION_LEARN_MORE_LINK.png.sha1
@@ -0,0 +1 @@ +a998cde87ae90aee405406a8515f92bfd88f5646 \ No newline at end of file
diff --git a/chrome/app/settings_strings_grdp/IDS_SETTINGS_TOPICS_PAGE_FOOTER.png.sha1 b/chrome/app/settings_strings_grdp/IDS_SETTINGS_TOPICS_PAGE_FOOTER.png.sha1 new file mode 100644 index 0000000..7f6e2ff --- /dev/null +++ b/chrome/app/settings_strings_grdp/IDS_SETTINGS_TOPICS_PAGE_FOOTER.png.sha1
@@ -0,0 +1 @@ +a998cde87ae90aee405406a8515f92bfd88f5646 \ No newline at end of file
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn index c6e93e9..1891cf9c 100644 --- a/chrome/browser/BUILD.gn +++ b/chrome/browser/BUILD.gn
@@ -1005,8 +1005,6 @@ "page_load_metrics/observers/loading_predictor_page_load_metrics_observer.h", "page_load_metrics/observers/local_network_requests_page_load_metrics_observer.cc", "page_load_metrics/observers/local_network_requests_page_load_metrics_observer.h", - "page_load_metrics/observers/media_page_load_metrics_observer.cc", - "page_load_metrics/observers/media_page_load_metrics_observer.h", "page_load_metrics/observers/multi_tab_loading_page_load_metrics_observer.cc", "page_load_metrics/observers/multi_tab_loading_page_load_metrics_observer.h", "page_load_metrics/observers/omnibox_suggestion_used_page_load_metrics_observer.cc", @@ -1029,8 +1027,6 @@ "page_load_metrics/observers/service_worker_page_load_metrics_observer.h", "page_load_metrics/observers/signed_exchange_page_load_metrics_observer.cc", "page_load_metrics/observers/signed_exchange_page_load_metrics_observer.h", - "page_load_metrics/observers/tab_restore_page_load_metrics_observer.cc", - "page_load_metrics/observers/tab_restore_page_load_metrics_observer.h", "page_load_metrics/observers/third_party_metrics_observer.cc", "page_load_metrics/observers/third_party_metrics_observer.h", "page_load_metrics/observers/translate_page_load_metrics_observer.cc", @@ -3296,6 +3292,8 @@ "//chrome/browser/commerce/merchant_viewer:merchant_signal_db", "//chrome/browser/commerce/merchant_viewer:merchant_viewer_data_manager", "//chrome/browser/commerce/merchant_viewer/android:jni_headers", + "//chrome/browser/commerce/subscriptions:commerce_subscription_db", + "//chrome/browser/commerce/subscriptions/android:jni_headers", "//chrome/browser/consent_auditor/android:jni_headers", "//chrome/browser/content_creation/notes/internal/android:jni_headers", "//chrome/browser/creator/android:jni_headers",
diff --git a/chrome/browser/apps/app_service/app_service_proxy_ash.cc b/chrome/browser/apps/app_service/app_service_proxy_ash.cc index f5e33aa..115a8cf6 100644 --- a/chrome/browser/apps/app_service/app_service_proxy_ash.cc +++ b/chrome/browser/apps/app_service/app_service_proxy_ash.cc
@@ -761,4 +761,16 @@ std::move(callback)); } +IntentLaunchInfo AppServiceProxyAsh::CreateIntentLaunchInfo( + const apps::IntentPtr& intent, + const apps::IntentFilterPtr& filter, + const apps::AppUpdate& update) { + IntentLaunchInfo entry = + AppServiceProxyBase::CreateIntentLaunchInfo(intent, filter, update); + if (policy::DlpFilesController* files_controller = GetDlpFilesController()) { + entry.is_dlp_blocked = files_controller->IsLaunchBlocked(update, intent); + } + return entry; +} + } // namespace apps
diff --git a/chrome/browser/apps/app_service/app_service_proxy_ash.h b/chrome/browser/apps/app_service/app_service_proxy_ash.h index 9c0cf14..68792728b 100644 --- a/chrome/browser/apps/app_service/app_service_proxy_ash.h +++ b/chrome/browser/apps/app_service/app_service_proxy_ash.h
@@ -269,6 +269,13 @@ LoadIconCallback callback, bool install_success); + // Returns an instance of `IntentLaunchInfo` created based on `intent`, + // `filter`, and `update`. + IntentLaunchInfo CreateIntentLaunchInfo( + const apps::IntentPtr& intent, + const apps::IntentFilterPtr& filter, + const apps::AppUpdate& update) override; + SubscriberCrosapi* crosapi_subscriber_ = nullptr; std::unique_ptr<PublisherHost> publisher_host_;
diff --git a/chrome/browser/apps/app_service/app_service_proxy_base.cc b/chrome/browser/apps/app_service/app_service_proxy_base.cc index e1b61f7b..7128978 100644 --- a/chrome/browser/apps/app_service/app_service_proxy_base.cc +++ b/chrome/browser/apps/app_service/app_service_proxy_base.cc
@@ -499,7 +499,7 @@ return intent_launch_info; } - app_registry_cache_.ForEachApp([&intent_launch_info, &intent, + app_registry_cache_.ForEachApp([this, &intent_launch_info, &intent, &exclude_browsers, &exclude_browser_tab_apps]( const apps::AppUpdate& update) { if (update.Readiness() != apps::Readiness::kReady && @@ -545,13 +545,7 @@ const auto& filters = update.IntentFilters(); for (const auto& handler_entry : best_handler_map) { const IntentFilterPtr& filter = filters[handler_entry.second.index]; - IntentLaunchInfo entry; - entry.app_id = update.AppId(); - entry.activity_label = GetActivityLabel(filter, update); - entry.activity_name = filter->activity_name.value_or(""); - entry.is_generic_file_handler = - apps_util::IsGenericFileHandler(intent, filter); - entry.is_file_extension_match = filter->IsFileExtensionsFilter(); + IntentLaunchInfo entry = CreateIntentLaunchInfo(intent, filter, update); intent_launch_info.push_back(entry); } }); @@ -712,6 +706,20 @@ return false; } +IntentLaunchInfo AppServiceProxyBase::CreateIntentLaunchInfo( + const apps::IntentPtr& intent, + const apps::IntentFilterPtr& filter, + const apps::AppUpdate& update) { + IntentLaunchInfo entry; + entry.app_id = update.AppId(); + entry.activity_label = GetActivityLabel(filter, update); + entry.activity_name = filter->activity_name.value_or(""); + entry.is_generic_file_handler = + apps_util::IsGenericFileHandler(intent, filter); + entry.is_file_extension_match = filter->IsFileExtensionsFilter(); + return entry; +} + IntentLaunchInfo::IntentLaunchInfo() = default; IntentLaunchInfo::~IntentLaunchInfo() = default; IntentLaunchInfo::IntentLaunchInfo(const IntentLaunchInfo& other) = default;
diff --git a/chrome/browser/apps/app_service/app_service_proxy_base.h b/chrome/browser/apps/app_service/app_service_proxy_base.h index d244a2c..d4661a0 100644 --- a/chrome/browser/apps/app_service/app_service_proxy_base.h +++ b/chrome/browser/apps/app_service/app_service_proxy_base.h
@@ -62,6 +62,8 @@ std::string activity_label; bool is_generic_file_handler; bool is_file_extension_match; + // Whether the intent is blocked by DLP. Defaults to false. + bool is_dlp_blocked = false; }; // Singleton (per Profile) proxy and cache of an App Service's apps. @@ -395,6 +397,13 @@ IconType icon_type, LoadIconCallback callback) {} + // Returns an instance of `IntentLaunchInfo` created based on `intent`, + // `filter`, and `update`. + virtual IntentLaunchInfo CreateIntentLaunchInfo( + const apps::IntentPtr& intent, + const apps::IntentFilterPtr& filter, + const apps::AppUpdate& update); + base::flat_map<AppType, AppPublisher*> publishers_; apps::AppRegistryCache app_registry_cache_;
diff --git a/chrome/browser/ash/app_list/search/ranking/keyword_ranker.cc b/chrome/browser/ash/app_list/search/ranking/keyword_ranker.cc index 143184e..3b0e9d8 100644 --- a/chrome/browser/ash/app_list/search/ranking/keyword_ranker.cc +++ b/chrome/browser/ash/app_list/search/ranking/keyword_ranker.cc
@@ -3,6 +3,9 @@ // found in the LICENSE file. #include "chrome/browser/ash/app_list/search/ranking/keyword_ranker.h" +#include "chrome/browser/ash/app_list/search/chrome_search_result.h" +#include "chrome/browser/ash/app_list/search/common/keyword_util.h" +#include "chrome/browser/ash/app_list/search/scoring.h" namespace app_list { @@ -15,12 +18,34 @@ CategoriesList& categories) { // TODO(b/263059094): when the user start input, this function will // be called. + last_query_ = query; + + // TODO(b/263816068): Use real keyword extraction function when ready. + + // Stores the providers that match with the keyword within the input query. + matched_providers_ = ExtractKeyword(last_query_).second; } void KeywordRanker::UpdateResultRanks(ResultsMap& results, ProviderType provider) { // TODO(b/263059094): update the result by boost the scores that - // match certain keywords, the rest remain unchanged + // match certain keywords, the rest remain unchanged. + + // Return if the given provider matched a keyword in the query + // as this does not require modification of results. + if (std::find(matched_providers_.begin(), matched_providers_.end(), + provider) != matched_providers_.end()) { + return; + } + + const auto it = results.find(provider); + if (it == results.end()) { + return; + } + + for (auto& result : it->second) { + result->scoring().set_keyword_multiplier(0.9); + } } } // namespace app_list
diff --git a/chrome/browser/ash/app_list/search/ranking/keyword_ranker.h b/chrome/browser/ash/app_list/search/ranking/keyword_ranker.h index 47671c2..ab4e5b7 100644 --- a/chrome/browser/ash/app_list/search/ranking/keyword_ranker.h +++ b/chrome/browser/ash/app_list/search/ranking/keyword_ranker.h
@@ -5,6 +5,8 @@ #ifndef CHROME_BROWSER_ASH_APP_LIST_SEARCH_RANKING_KEYWORD_RANKER_H_ #define CHROME_BROWSER_ASH_APP_LIST_SEARCH_RANKING_KEYWORD_RANKER_H_ +#include <vector> + #include "chrome/browser/ash/app_list/search/ranking/ranker.h" #include "chrome/browser/ash/app_list/search/types.h" @@ -25,6 +27,10 @@ ResultsMap& results, CategoriesList& categories) override; void UpdateResultRanks(ResultsMap& results, ProviderType provider) override; + + private: + std::u16string last_query_; + std::vector<ProviderType> matched_providers_; }; } // namespace app_list
diff --git a/chrome/browser/ash/app_list/search/ranking/keyword_ranker_unittest.cc b/chrome/browser/ash/app_list/search/ranking/keyword_ranker_unittest.cc new file mode 100644 index 0000000..84a6bbd8 --- /dev/null +++ b/chrome/browser/ash/app_list/search/ranking/keyword_ranker_unittest.cc
@@ -0,0 +1,116 @@ +// Copyright 2023 The Chromium Authors +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#include "chrome/browser/ash/app_list/search/ranking/keyword_ranker.h" + +#include "chrome/browser/ash/app_list/search/chrome_search_result.h" +#include "chrome/browser/ash/app_list/search/scoring.h" +#include "chrome/browser/ash/app_list/search/test/ranking_test_util.h" +#include "chrome/browser/ash/app_list/search/test/test_result.h" +#include "chrome/browser/ash/app_list/search/types.h" +#include "testing/gtest/include/gtest/gtest.h" + +namespace app_list::test { +namespace { + +constexpr float kEps = 1e-3f; + +// Helper function that check if the results' multiplier is right. +void ExpectKeywordMultiplier(const ResultsMap& results, + ProviderType provider, + double keyword_multiplier) { + const auto it = results.find(provider); + if (it == results.end()) { + return; + } + + for (auto& result : it->second) { + EXPECT_NEAR(result->scoring().keyword_multiplier(), keyword_multiplier, + kEps); + } +} + +} // namespace + +class KeywordRankerTest : public RankerTestBase {}; + +// Test the input query does not contains keyword that match any providers. +TEST_F(KeywordRankerTest, NoMatchedKeywords) { + // Simulate a query starting. + ResultsMap results_1; + CategoriesList categories_1; + + // Input the results scores and UpdateResultRanks. + results_1[ResultType::kInstalledApp] = + MakeScoredResults({"app_a", "app_b"}, {0.7, 0.5}); + KeywordRanker ranker; + ranker.Start(u"ABC", results_1, categories_1); + ranker.UpdateResultRanks(results_1, ProviderType::kInstalledApp); + + // Check the number of result and the keyword_multiplier of the result. + ASSERT_EQ(results_1[ResultType::kInstalledApp].size(), 2u); + + // As no detection of keywords for this result type, + // therefore the keyword multiplier is down-weighted. + ExpectKeywordMultiplier(results_1, ResultType::kInstalledApp, 0.9); +} + +// Test the input query only match one provider. +TEST_F(KeywordRankerTest, OneMatchedKeyword) { + // Simulate a query starting. + ResultsMap results_1; + CategoriesList categories_1; + + // Input the results scores and UpdateResultRanks. + results_1[ResultType::kInstalledApp] = + MakeScoredResults({"app_a", "app_b"}, {0.7, 0.5}); + results_1[ResultType::kHelpApp] = + MakeScoredResults({"help_a", "help_b"}, {0.7, 0.5}); + + KeywordRanker ranker; + ranker.Start(u"explore", results_1, categories_1); + ranker.UpdateResultRanks(results_1, ProviderType::kInstalledApp); + ranker.UpdateResultRanks(results_1, ProviderType::kHelpApp); + + // Check the number of result and the keyword_multiplier of the result. + ASSERT_EQ(results_1.size(), 2u); + ASSERT_EQ(results_1[ResultType::kInstalledApp].size(), 2u); + ASSERT_EQ(results_1[ResultType::kHelpApp].size(), 2u); + + ExpectKeywordMultiplier(results_1, ResultType::kInstalledApp, 0.9); + ExpectKeywordMultiplier(results_1, ResultType::kHelpApp, 1.0); +} + +// Test the input query match multiple provider. +TEST_F(KeywordRankerTest, KeywordMatchesMultipleProviders) { + // Simulate a query starting. + ResultsMap results_1; + CategoriesList categories_1; + + // Input the results scores and UpdateResultRanks. + results_1[ResultType::kInstalledApp] = + MakeScoredResults({"app_a", "app_b"}, {0.7, 0.5}); + results_1[ResultType::kFileSearch] = + MakeScoredResults({"local_a", "local_b"}, {0.7, 0.5}); + results_1[ResultType::kDriveSearch] = + MakeScoredResults({"drive_a", "drive_b"}, {0.7, 0.5}); + + KeywordRanker ranker; + ranker.Start(u"file", results_1, categories_1); + ranker.UpdateResultRanks(results_1, ProviderType::kInstalledApp); + ranker.UpdateResultRanks(results_1, ProviderType::kFileSearch); + ranker.UpdateResultRanks(results_1, ProviderType::kDriveSearch); + + // Check the number of result and the keyword_multiplier of the result. + ASSERT_EQ(results_1.size(), 3u); + ASSERT_EQ(results_1[ResultType::kInstalledApp].size(), 2u); + ASSERT_EQ(results_1[ResultType::kFileSearch].size(), 2u); + ASSERT_EQ(results_1[ResultType::kDriveSearch].size(), 2u); + + ExpectKeywordMultiplier(results_1, ResultType::kInstalledApp, 0.9); + ExpectKeywordMultiplier(results_1, ResultType::kFileSearch, 1.0); + ExpectKeywordMultiplier(results_1, ResultType::kDriveSearch, 1.0); +} + +} // namespace app_list::test
diff --git a/chrome/browser/ash/app_list/search/scoring.cc b/chrome/browser/ash/app_list/search/scoring.cc index 46b2bce..3e65ebdb 100644 --- a/chrome/browser/ash/app_list/search/scoring.cc +++ b/chrome/browser/ash/app_list/search/scoring.cc
@@ -14,14 +14,15 @@ if (filtered_ && !override_filter_for_test_) { return -1.0; } - return ftrl_result_score_; + return ftrl_result_score_ * keyword_multiplier_; } double Scoring::BestMatchScore() const { if (filtered_) { return -1.0; } else { - return std::max(mrfu_result_score_, normalized_relevance_); + return std::max(mrfu_result_score_, normalized_relevance_) * + keyword_multiplier_; } } @@ -53,6 +54,10 @@ ftrl_result_score_ = ftrl_result_score; } +void Scoring::set_keyword_multiplier(double keyword_multiplier) { + keyword_multiplier_ = keyword_multiplier; +} + void Scoring::set_continue_rank(int continue_rank) { continue_rank_ = continue_rank; }
diff --git a/chrome/browser/ash/app_list/search/scoring.h b/chrome/browser/ash/app_list/search/scoring.h index d2721f4..40e0c24 100644 --- a/chrome/browser/ash/app_list/search/scoring.h +++ b/chrome/browser/ash/app_list/search/scoring.h
@@ -36,6 +36,9 @@ void set_ftrl_result_score(double ftrl_result_score); double ftrl_result_score() const { return ftrl_result_score_; } + void set_keyword_multiplier(double keyword_multiplier); + double keyword_multiplier() const { return keyword_multiplier_; } + void set_continue_rank(int continue_rank); int continue_rank() const { return continue_rank_; } @@ -58,6 +61,7 @@ // due to a race condition with the test beginning before the // RemovedResultsRanker is initialized. bool override_filter_for_test_ = false; + double keyword_multiplier_ = 1.0; // Used only for results in the Continue section. Continue results are first // ordered by |continue_rank|, and then by their display score. -1 indicates
diff --git a/chrome/browser/ash/drive/drive_integration_service.cc b/chrome/browser/ash/drive/drive_integration_service.cc index cebffc5..3cc85d5 100644 --- a/chrome/browser/ash/drive/drive_integration_service.cc +++ b/chrome/browser/ash/drive/drive_integration_service.cc
@@ -45,6 +45,7 @@ #include "chrome/common/pref_names.h" #include "chromeos/ash/components/drivefs/drivefs_bootstrap.h" #include "chromeos/ash/components/drivefs/drivefs_pin_manager.h" +#include "chromeos/ash/components/drivefs/sync_status_tracker.h" #include "chromeos/ash/components/network/network_handler.h" #include "chromeos/ash/components/network/network_state.h" #include "chromeos/ash/components/network/network_state_handler.h" @@ -1497,9 +1498,9 @@ } } -drivefs::SyncStatusAndProgress DriveIntegrationService::GetSyncStatusForPath( +drivefs::SyncState DriveIntegrationService::GetSyncStateForPath( const base::FilePath& drive_path) { - return GetDriveFsHost()->GetSyncStatusForPath(drive_path); + return GetDriveFsHost()->GetSyncStateForPath(drive_path); } void DriveIntegrationService::PollHostedFilePinStates() {
diff --git a/chrome/browser/ash/drive/drive_integration_service.h b/chrome/browser/ash/drive/drive_integration_service.h index 12925d0..73c259da 100644 --- a/chrome/browser/ash/drive/drive_integration_service.h +++ b/chrome/browser/ash/drive/drive_integration_service.h
@@ -270,8 +270,7 @@ void GetSyncingPaths( drivefs::mojom::DriveFs::GetSyncingPathsCallback callback); - drivefs::SyncStatusAndProgress GetSyncStatusForPath( - const base::FilePath& drive_path); + drivefs::SyncState GetSyncStateForPath(const base::FilePath& drive_path); // Tells DriveFS to update its cached pin states of hosted files (once). void PollHostedFilePinStates();
diff --git a/chrome/browser/ash/extensions/file_manager/file_manager_private_apitest.cc b/chrome/browser/ash/extensions/file_manager/file_manager_private_apitest.cc index c75e3ac..1fe7d99 100644 --- a/chrome/browser/ash/extensions/file_manager/file_manager_private_apitest.cc +++ b/chrome/browser/ash/extensions/file_manager/file_manager_private_apitest.cc
@@ -786,11 +786,17 @@ base::Unretained(this))); ASSERT_TRUE(policy::DlpRulesManagerFactory::GetForPrimaryProfile()); - AddLocalFileSystem(browser()->profile(), temp_dir_.GetPath()); + base::FilePath my_files_dir_ = + file_manager::util::GetMyFilesFolderForProfile(browser()->profile()); + { + base::ScopedAllowBlockingForTesting allow_io; + + ASSERT_TRUE(base::CreateDirectory(my_files_dir_)); + } + AddLocalFileSystem(browser()->profile(), my_files_dir_); const char kTestFileName[] = "dlp_test_file.txt"; - const base::FilePath test_file_path = - temp_dir_.GetPath().Append(kTestFileName); + const base::FilePath test_file_path = my_files_dir_.Append(kTestFileName); { base::ScopedAllowBlockingForTesting allow_io;
diff --git a/chrome/browser/ash/extensions/file_manager/private_api_tasks.cc b/chrome/browser/ash/extensions/file_manager/private_api_tasks.cc index 106275f5..5ff9bbc 100644 --- a/chrome/browser/ash/extensions/file_manager/private_api_tasks.cc +++ b/chrome/browser/ash/extensions/file_manager/private_api_tasks.cc
@@ -165,6 +165,10 @@ if (params->urls.empty()) return RespondNow(Error("No URLs provided")); + if (params->dlp_source_urls.size() != params->urls.size()) { + return RespondNow(Error("Mismatching URLs and DLP source URLs provided")); + } + Profile* const profile = Profile::FromBrowserContext(browser_context()); const scoped_refptr<storage::FileSystemContext> file_system_context = file_manager::util::GetFileSystemContextForRenderFrameHost( @@ -182,6 +186,8 @@ local_paths_.push_back(file_system_url.path()); } + dlp_source_urls_ = std::move(params->dlp_source_urls); + mime_type_collector_ = std::make_unique<app_file_handler_util::MimeTypeCollector>(profile); mime_type_collector_->CollectForLocalPaths( @@ -218,6 +224,7 @@ file_manager::file_tasks::FindAllTypesOfTasks( Profile::FromBrowserContext(browser_context()), entries, urls_, + dlp_source_urls_, base::BindOnce( &FileManagerPrivateInternalGetFileTasksFunction::OnFileTasksListed, this)); @@ -238,6 +245,7 @@ converted.title = task.task_title; converted.is_default = task.is_default; converted.is_generic_file_handler = task.is_generic_file_handler; + converted.is_dlp_blocked = task.is_dlp_blocked; results.push_back(std::move(converted)); }
diff --git a/chrome/browser/ash/extensions/file_manager/private_api_tasks.h b/chrome/browser/ash/extensions/file_manager/private_api_tasks.h index 0befc73..bfe45dd 100644 --- a/chrome/browser/ash/extensions/file_manager/private_api_tasks.h +++ b/chrome/browser/ash/extensions/file_manager/private_api_tasks.h
@@ -79,6 +79,7 @@ mime_type_collector_; std::vector<GURL> urls_; std::vector<base::FilePath> local_paths_; + std::vector<std::string> dlp_source_urls_; }; // Implements the chrome.fileManagerPrivateInternal.setDefaultTask method.
diff --git a/chrome/browser/ash/extensions/file_manager/private_api_util.cc b/chrome/browser/ash/extensions/file_manager/private_api_util.cc index cd5ab36..f04f13c0 100644 --- a/chrome/browser/ash/extensions/file_manager/private_api_util.cc +++ b/chrome/browser/ash/extensions/file_manager/private_api_util.cc
@@ -314,28 +314,29 @@ if (base::FeatureList::IsEnabled(ash::features::kFilesInlineSyncStatus)) { drive::DriveIntegrationService* integration_service = drive::DriveIntegrationServiceFactory::FindForProfile(running_profile_); - drivefs::SyncStatusAndProgress status_and_progress = - (!integration_service) ? drivefs::SyncStatusAndProgress::kNotFound - : integration_service->GetSyncStatusForPath( - file_system_url_.path()); - switch (status_and_progress.status) { - case drivefs::SyncStatus::kQueued: - properties_->sync_status = file_manager_private::SYNC_STATUS_QUEUED; - break; - case drivefs::SyncStatus::kInProgress: - properties_->sync_status = - file_manager_private::SYNC_STATUS_IN_PROGRESS; - properties_->progress = status_and_progress.progress; - break; - case drivefs::SyncStatus::kError: - properties_->sync_status = file_manager_private::SYNC_STATUS_ERROR; - break; - default: - properties_->sync_status = file_manager_private::SYNC_STATUS_NOT_FOUND; - break; + if (integration_service) { + drivefs::SyncState sync_state = + integration_service->GetSyncStateForPath(file_system_url_.path()); + properties_->progress = sync_state.progress; + switch (sync_state.status) { + case drivefs::SyncStatus::kQueued: + properties_->sync_status = file_manager_private::SYNC_STATUS_QUEUED; + break; + case drivefs::SyncStatus::kInProgress: + properties_->sync_status = + file_manager_private::SYNC_STATUS_IN_PROGRESS; + break; + case drivefs::SyncStatus::kError: + properties_->sync_status = file_manager_private::SYNC_STATUS_ERROR; + break; + default: + properties_->sync_status = + file_manager_private::SYNC_STATUS_NOT_FOUND; + break; + } + } else { + properties_->sync_status = file_manager_private::SYNC_STATUS_NOT_FOUND; } - } else { - properties_->sync_status = file_manager_private::SYNC_STATUS_NOT_FOUND; } properties_->size = metadata->size;
diff --git a/chrome/browser/ash/file_manager/app_service_file_tasks.cc b/chrome/browser/ash/file_manager/app_service_file_tasks.cc index 977c745..f5d2c62c 100644 --- a/chrome/browser/ash/file_manager/app_service_file_tasks.cc +++ b/chrome/browser/ash/file_manager/app_service_file_tasks.cc
@@ -184,6 +184,7 @@ void FindAppServiceTasks(Profile* profile, const std::vector<extensions::EntryInfo>& entries, const std::vector<GURL>& file_urls, + const std::vector<std::string>& dlp_source_urls, std::vector<FullTaskDescriptor>* result_list) { DCHECK_CURRENTLY_ON(content::BrowserThread::UI); DCHECK_EQ(entries.size(), file_urls.size()); @@ -225,6 +226,7 @@ auto file = std::make_unique<apps::IntentFile>(file_urls.at(i)); file->mime_type = entries[i].mime_type; file->is_directory = entries[i].is_directory; + file->dlp_source_url = dlp_source_urls[i]; intent_files.push_back(std::move(file)); } std::vector<apps::IntentLaunchInfo> intent_launch_info = @@ -298,8 +300,9 @@ /* is_default=*/false, // TODO(petermarshall): Handle the rest of the logic from FindWebTasks() // e.g. prioritise non-generic handlers. - /* is_generic=*/launch_entry.is_generic_file_handler, - /* is_file_extension_match=*/launch_entry.is_file_extension_match)); + /* is_generic_file_handler=*/launch_entry.is_generic_file_handler, + /* is_file_extension_match=*/launch_entry.is_file_extension_match, + /* is_dlp_blocked=*/launch_entry.is_dlp_blocked)); } }
diff --git a/chrome/browser/ash/file_manager/app_service_file_tasks.h b/chrome/browser/ash/file_manager/app_service_file_tasks.h index b49610d6..1094bd5 100644 --- a/chrome/browser/ash/file_manager/app_service_file_tasks.h +++ b/chrome/browser/ash/file_manager/app_service_file_tasks.h
@@ -35,11 +35,14 @@ Profile* GetProfileWithAppService(Profile* profile); // Finds the app services tasks that can handle |entries|, appends them to -// |result_list|, and calls back to |callback|. -// Only support sharing at the moment. +// |result_list|, and calls back to |callback|. If passed, |dlp_source_urls| +// should have the same length as |entries| and each element should represent +// the URL from which the corresponding entry was downloaded from, and are used +// to check DLP restrictions on the |entries|. void FindAppServiceTasks(Profile* profile, const std::vector<extensions::EntryInfo>& entries, const std::vector<GURL>& file_urls, + const std::vector<std::string>& dlp_source_urls, std::vector<FullTaskDescriptor>* result_list); // Executes the specified task by app service.
diff --git a/chrome/browser/ash/file_manager/app_service_file_tasks_unittest.cc b/chrome/browser/ash/file_manager/app_service_file_tasks_unittest.cc index bc60180..d38afbf 100644 --- a/chrome/browser/ash/file_manager/app_service_file_tasks_unittest.cc +++ b/chrome/browser/ash/file_manager/app_service_file_tasks_unittest.cc
@@ -12,6 +12,7 @@ #include "base/strings/escape.h" #include "base/test/scoped_feature_list.h" #include "chrome/browser/apps/app_service/app_service_proxy.h" +#include "chrome/browser/apps/app_service/app_service_proxy_base.h" #include "chrome/browser/apps/app_service/app_service_proxy_factory.h" #include "chrome/browser/apps/app_service/app_service_test.h" #include "chrome/browser/apps/app_service/intent_util.h" @@ -20,6 +21,9 @@ #include "chrome/browser/ash/file_manager/file_manager_test_util.h" #include "chrome/browser/ash/file_manager/file_tasks.h" #include "chrome/browser/ash/file_manager/path_util.h" +#include "chrome/browser/ash/login/users/fake_chrome_user_manager.h" +#include "chrome/browser/chromeos/policy/dlp/dlp_rules_manager_factory.h" +#include "chrome/browser/chromeos/policy/dlp/mock_dlp_rules_manager.h" #include "chrome/test/base/testing_profile.h" #include "components/prefs/scoped_user_pref_update.h" #include "components/services/app_service/public/cpp/app_types.h" @@ -27,10 +31,13 @@ #include "components/services/app_service/public/cpp/intent_test_util.h" #include "components/services/app_service/public/cpp/intent_util.h" #include "components/services/app_service/public/mojom/types.mojom.h" +#include "components/user_manager/scoped_user_manager.h" +#include "components/user_manager/user_type.h" #include "content/public/test/browser_task_environment.h" #include "extensions/browser/entry_info.h" #include "extensions/common/extension_builder.h" #include "storage/browser/file_system/external_mount_points.h" +#include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" #include "third_party/abseil-cpp/absl/types/optional.h" #include "third_party/blink/public/common/features.h" @@ -66,7 +73,7 @@ class AppServiceFileTasksTest : public testing::Test { protected: - AppServiceFileTasksTest() {} + AppServiceFileTasksTest() = default; void SetUp() override { profile_ = std::make_unique<TestingProfile>(); app_service_test_.SetUp(profile_.get()); @@ -102,6 +109,7 @@ const std::vector<FakeFile>& files) { std::vector<extensions::EntryInfo> entries; std::vector<GURL> file_urls; + std::vector<std::string> dlp_source_urls; for (const FakeFile& fake_file : files) { entries.emplace_back( util::GetMyFilesFolderForProfile(profile()).AppendASCII( @@ -112,10 +120,12 @@ } else { file_urls.push_back(fake_file.file_url); } + dlp_source_urls.push_back(""); } std::vector<FullTaskDescriptor> tasks; - file_tasks::FindAppServiceTasks(profile(), entries, file_urls, &tasks); + file_tasks::FindAppServiceTasks(profile(), entries, file_urls, + dlp_source_urls, &tasks); // Sort by app ID so we don't rely on ordering. std::sort( tasks.begin(), tasks.end(), [](const auto& left, const auto& right) { @@ -864,5 +874,91 @@ ASSERT_EQ(0U, tasks.size()); } +// Tests applying policies when listing tasks. +class AppServiceFileTasksPolicyTest : public AppServiceFileTasksTestEnabled { + protected: + class MockFilesController : public policy::DlpFilesController { + public: + explicit MockFilesController(const policy::DlpRulesManager& rules_manager) + : DlpFilesController(rules_manager) {} + ~MockFilesController() override = default; + + MOCK_METHOD(bool, + IsLaunchBlocked, + (const apps::AppUpdate&, const apps::IntentPtr&), + (override)); + }; + + AppServiceFileTasksPolicyTest() + : user_manager_(new ash::FakeChromeUserManager()), + scoped_user_manager_(std::make_unique<user_manager::ScopedUserManager>( + base::WrapUnique(user_manager_))) {} + + std::unique_ptr<KeyedService> SetDlpRulesManager( + content::BrowserContext* context) { + auto dlp_rules_manager = + std::make_unique<testing::NiceMock<policy::MockDlpRulesManager>>(); + rules_manager_ = dlp_rules_manager.get(); + return dlp_rules_manager; + } + + void SetUp() override { + AppServiceFileTasksTestEnabled::SetUp(); + + AccountId account_id = + AccountId::FromUserEmailGaiaId("test@example.com", "12345"); + profile_->SetIsNewProfile(true); + user_manager::User* user = + user_manager_->AddUserWithAffiliationAndTypeAndProfile( + account_id, /*is_affiliated=*/false, + user_manager::USER_TYPE_REGULAR, profile_.get()); + user_manager_->UserLoggedIn(account_id, user->username_hash(), + /*browser_restart=*/false, + /*is_child=*/false); + user_manager_->SimulateUserProfileLoad(account_id); + + policy::DlpRulesManagerFactory::GetInstance()->SetTestingFactory( + profile_.get(), + base::BindRepeating(&AppServiceFileTasksPolicyTest::SetDlpRulesManager, + base::Unretained(this))); + ASSERT_TRUE(policy::DlpRulesManagerFactory::GetForPrimaryProfile()); + + ON_CALL(*rules_manager_, IsFilesPolicyEnabled) + .WillByDefault(testing::Return(true)); + mock_files_controller_ = + std::make_unique<MockFilesController>(*rules_manager_); + ON_CALL(*rules_manager_, GetDlpFilesController) + .WillByDefault(testing::Return(mock_files_controller_.get())); + } + + void TearDown() override { scoped_user_manager_.reset(); } + + policy::MockDlpRulesManager* rules_manager_ = nullptr; + std::unique_ptr<MockFilesController> mock_files_controller_ = nullptr; + ash::FakeChromeUserManager* user_manager_; + std::unique_ptr<user_manager::ScopedUserManager> scoped_user_manager_; +}; + +// Test that out of two apps, one can be blocked by DLP and the other allowed. +TEST_F(AppServiceFileTasksPolicyTest, FindAppServiceFileTasksText_DlpChecked) { + EXPECT_CALL(*mock_files_controller_.get(), IsLaunchBlocked) + .WillOnce(testing::Return(false)) + .WillOnce(testing::Return(true)); + + AddTextApp(); + AddAnyApp(); + // Find apps for a "text/plain" file. First app shouldn't be blocked, but the + // second one yes. + std::vector<FullTaskDescriptor> tasks = + FindAppServiceTasks({{"foo.txt", kMimeTypeText}}); + ASSERT_EQ(2U, tasks.size()); + EXPECT_EQ(kAppIdText, tasks[0].task_descriptor.app_id); + EXPECT_EQ(kActivityLabelText, tasks[0].task_title); + EXPECT_FALSE(tasks[0].is_dlp_blocked); + EXPECT_EQ(kAppIdAny, tasks[1].task_descriptor.app_id); + EXPECT_EQ(kActivityLabelAny, tasks[1].task_title); + EXPECT_TRUE(tasks[1].is_dlp_blocked); +} + } // namespace file_tasks } // namespace file_manager.
diff --git a/chrome/browser/ash/file_manager/file_manager_test_util.cc b/chrome/browser/ash/file_manager/file_manager_test_util.cc index b36264b9..2e402a0 100644 --- a/chrome/browser/ash/file_manager/file_manager_test_util.cc +++ b/chrome/browser/ash/file_manager/file_manager_test_util.cc
@@ -207,7 +207,7 @@ invoked_synchronously = true; }); - FindAllTypesOfTasks(profile, entries, file_urls, callback); + FindAllTypesOfTasks(profile, entries, file_urls, {""}, callback); // MIME sniffing requires a run loop, but the mime type must be explicitly // available, and is provided in this helper.
diff --git a/chrome/browser/ash/file_manager/file_tasks.cc b/chrome/browser/ash/file_manager/file_tasks.cc index a89828d..742e995 100644 --- a/chrome/browser/ash/file_manager/file_tasks.cc +++ b/chrome/browser/ash/file_manager/file_tasks.cc
@@ -542,13 +542,15 @@ const GURL& in_icon_url, bool in_is_default, bool in_is_generic_file_handler, - bool in_is_file_extension_match) + bool in_is_file_extension_match, + bool is_dlp_blocked) : task_descriptor(in_task_descriptor), task_title(in_task_title), icon_url(in_icon_url), is_default(in_is_default), is_generic_file_handler(in_is_generic_file_handler), - is_file_extension_match(in_is_file_extension_match) {} + is_file_extension_match(in_is_file_extension_match), + is_dlp_blocked(is_dlp_blocked) {} FullTaskDescriptor::FullTaskDescriptor(const FullTaskDescriptor& other) = default; @@ -903,13 +905,14 @@ void FindExtensionAndAppTasks(Profile* profile, const std::vector<extensions::EntryInfo>& entries, const std::vector<GURL>& file_urls, + const std::vector<std::string>& dlp_source_urls, FindTasksCallback callback, std::unique_ptr<ResultingTasks> resulting_tasks) { auto* tasks = &resulting_tasks->tasks; // 2. Web tasks file_handlers (View/Open With), Chrome app file_handlers, and // extension file_browser_handlers. - FindAppServiceTasks(profile, entries, file_urls, tasks); + FindAppServiceTasks(profile, entries, file_urls, dlp_source_urls, tasks); // 3. Find and append Guest OS tasks directly if Guest OS file tasks aren't // provided by App Service. @@ -928,18 +931,20 @@ void FindAllTypesOfTasks(Profile* profile, const std::vector<extensions::EntryInfo>& entries, const std::vector<GURL>& file_urls, + const std::vector<std::string>& dlp_source_urls, FindTasksCallback callback) { DCHECK(profile); auto resulting_tasks = std::make_unique<ResultingTasks>(); if (!ash::features::ShouldArcFileTasksUseAppService()) { // 1. Find and append ARC handler tasks if ARC file tasks aren't // provided by App Service. - FindArcTasks(profile, entries, file_urls, std::move(resulting_tasks), - base::BindOnce(&FindExtensionAndAppTasks, profile, entries, - file_urls, std::move(callback))); + FindArcTasks( + profile, entries, file_urls, std::move(resulting_tasks), + base::BindOnce(&FindExtensionAndAppTasks, profile, entries, file_urls, + dlp_source_urls, std::move(callback))); } else { - FindExtensionAndAppTasks(profile, entries, file_urls, std::move(callback), - std::move(resulting_tasks)); + FindExtensionAndAppTasks(profile, entries, file_urls, dlp_source_urls, + std::move(callback), std::move(resulting_tasks)); } }
diff --git a/chrome/browser/ash/file_manager/file_tasks.h b/chrome/browser/ash/file_manager/file_tasks.h index 0e62348..7b2d171 100644 --- a/chrome/browser/ash/file_manager/file_tasks.h +++ b/chrome/browser/ash/file_manager/file_tasks.h
@@ -225,7 +225,8 @@ const GURL& icon_url, bool is_default, bool is_generic_file_handler, - bool is_file_extension_match); + bool is_file_extension_match, + bool is_dlp_blocked = false); FullTaskDescriptor(const FullTaskDescriptor& other); FullTaskDescriptor& operator=(const FullTaskDescriptor& other); @@ -248,6 +249,8 @@ // that declares no MIME types in its manifest, but matches with the // file_handlers "extensions" instead. bool is_file_extension_match; + // True if this task is blocked by Data Leak Prevention (DLP). + bool is_dlp_blocked; }; // Describes how admin policy affects the default task in a ResultingTasks. @@ -365,10 +368,14 @@ // If |entries| contains a Google document, only the internal tasks of the // Files app (i.e., tasks having the app ID of the Files app) are listed. // This is to avoid listing normal file handler and file browser handler tasks, -// which can handle only normal files. +// which can handle only normal files. If passed, |dlp_source_urls| should have +// the same length as |entries| and each element should represent the URL from +// which the corresponding entry was downloaded from, and are used to check DLP +// restrictions on the |entries|. void FindAllTypesOfTasks(Profile* profile, const std::vector<extensions::EntryInfo>& entries, const std::vector<GURL>& file_urls, + const std::vector<std::string>& dlp_source_urls, FindTasksCallback callback); // Chooses the default task in |resulting_tasks| and sets it as default, if the
diff --git a/chrome/browser/ash/file_manager/file_tasks_browsertest.cc b/chrome/browser/ash/file_manager/file_tasks_browsertest.cc index 334ca8c..45e640fa 100644 --- a/chrome/browser/ash/file_manager/file_tasks_browsertest.cc +++ b/chrome/browser/ash/file_manager/file_tasks_browsertest.cc
@@ -2,6 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <cstring> #include <memory> #include <unordered_map> @@ -33,7 +34,11 @@ #include "chrome/browser/ash/file_system_provider/provided_file_system_info.h" #include "chrome/browser/ash/file_system_provider/provider_interface.h" #include "chrome/browser/ash/file_system_provider/service.h" +#include "chrome/browser/ash/policy/dlp/dlp_files_controller.h" #include "chrome/browser/ash/system_web_apps/system_web_app_manager.h" +#include "chrome/browser/chromeos/policy/dlp/dlp_rules_manager.h" +#include "chrome/browser/chromeos/policy/dlp/dlp_rules_manager_factory.h" +#include "chrome/browser/chromeos/policy/dlp/mock_dlp_rules_manager.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/web_applications/web_app_launch_manager.h" @@ -65,6 +70,7 @@ #include "services/network/test/test_network_connection_tracker.h" #include "storage/browser/file_system/external_mount_points.h" #include "storage/browser/file_system/file_system_url.h" +#include "testing/gmock/include/gmock/gmock.h" #include "third_party/blink/public/common/features.h" using web_app::kMediaAppId; @@ -73,15 +79,21 @@ namespace file_tasks { namespace { +const char* blockedUrl = "https://blocked.com"; + // A list of file extensions (`/` delimited) representing a selection of files // and the app expected to be the default to open these files. // A null app_id indicates there is no preferred default. // A mime_type can be set to a result normally given by sniffing when // net::GetMimeTypeFromFile() would not provide a result. +// A source_url can be set when testing DLP restrictions and is also used to +// determine whether fetched tasks should be blocked. If null, the task should +// never be blocked. struct Expectation { const char* file_extensions; const char* app_id; const char* mime_type = nullptr; + const char* dlp_source_url = nullptr; }; // Verifies that a single default task expectation (i.e. the expected @@ -127,6 +139,23 @@ std::move(quit_closure).Run(); } +// Verifies that all tasks are either blocked or not by DLP, according to +// |expectation|. Decrements the provided |remaining| integer to provide +// additional verification that this function is invoked an expected number of +// times (i.e. even if the callback could be invoked asynchronously). +void VerifyDlpStatus(int* remaining, + Expectation expectation, + std::unique_ptr<ResultingTasks> resulting_tasks) { + ASSERT_TRUE(resulting_tasks) << expectation.file_extensions; + --*remaining; + + bool expect_dlp_blocked = expectation.dlp_source_url && + strcmp(expectation.dlp_source_url, blockedUrl) == 0; + EXPECT_EQ(expect_dlp_blocked, + base::ranges::all_of(resulting_tasks->tasks, + &FullTaskDescriptor::is_dlp_blocked)); +} + // Installs a chrome app that handles .tiff. scoped_refptr<const extensions::Extension> InstallTiffHandlerChromeApp( Profile* profile) { @@ -134,6 +163,36 @@ profile, "extensions/api_test/file_browser/app_file_handler"); } +// Populates |entries|, |file_urls|, and |dlp_source_urls| based on |test|. +void ConvertExpectation(const Expectation& test, + std::vector<extensions::EntryInfo>& entries, + std::vector<GURL>& file_urls, + std::vector<std::string>& dlp_source_urls) { + const base::FilePath prefix = base::FilePath().AppendASCII("file"); + std::vector<base::StringPiece> all_extensions = base::SplitStringPiece( + test.file_extensions, "/", base::KEEP_WHITESPACE, base::SPLIT_WANT_ALL); + for (base::StringPiece extension : all_extensions) { + base::FilePath path = prefix.AddExtension(extension); + std::string mime_type; + net::GetMimeTypeFromFile(path, &mime_type); + if (test.mime_type != nullptr) { + // Sniffing isn't used when GetMimeTypeFromFile() succeeds, so there + // shouldn't be a hard-coded mime type configured. + EXPECT_TRUE(mime_type.empty()) + << "Did not expect mime match " << mime_type << " for " << path; + mime_type = test.mime_type; + } else { + EXPECT_FALSE(mime_type.empty()) << "No mime type for " << path; + } + entries.emplace_back(path, mime_type, false); + GURL url = GURL(base::JoinString( + {"filesystem:https://site.com/isolated/foo.", extension}, "")); + ASSERT_TRUE(url.is_valid()); + file_urls.push_back(url); + dlp_source_urls.push_back(test.dlp_source_url ? test.dlp_source_url : ""); + } +} + class FileTasksBrowserTest : public TestProfileTypeMixin<InProcessBrowserTest> { public: void SetUpOnMainThread() override { @@ -147,37 +206,17 @@ void TestExpectationsAgainstDefaultTasks( const std::vector<Expectation>& expectations) { int remaining = expectations.size(); - const base::FilePath prefix = base::FilePath().AppendASCII("file"); for (const Expectation& test : expectations) { std::vector<extensions::EntryInfo> entries; std::vector<GURL> file_urls; - std::vector<base::StringPiece> all_extensions = - base::SplitStringPiece(test.file_extensions, "/", - base::KEEP_WHITESPACE, base::SPLIT_WANT_ALL); - for (base::StringPiece extension : all_extensions) { - base::FilePath path = prefix.AddExtension(extension); - std::string mime_type; - net::GetMimeTypeFromFile(path, &mime_type); - if (test.mime_type != nullptr) { - // Sniffing isn't used when GetMimeTypeFromFile() succeeds, so there - // shouldn't be a hard-coded mime type configured. - EXPECT_TRUE(mime_type.empty()) - << "Did not expect mime match " << mime_type << " for " << path; - mime_type = test.mime_type; - } else { - EXPECT_FALSE(mime_type.empty()) << "No mime type for " << path; - } - entries.emplace_back(path, mime_type, false); - GURL url = GURL(base::JoinString( - {"filesystem:https://site.com/isolated/foo.", extension}, "")); - ASSERT_TRUE(url.is_valid()); - file_urls.push_back(url); - } + std::vector<std::string> dlp_source_urls; + ConvertExpectation(test, entries, file_urls, dlp_source_urls); // task_verifier callback is invoked synchronously from // FindAllTypesOfTasks. FindAllTypesOfTasks(browser()->profile(), entries, file_urls, + dlp_source_urls, base::BindOnce(&VerifyTasks, &remaining, test)); } EXPECT_EQ(0, remaining); @@ -419,7 +458,7 @@ base::BindLambdaForTesting([&](const std::string& mime_type) { entries[0].mime_type = mime_type; EXPECT_EQ(entries[0].mime_type, "image/gif"); - FindAllTypesOfTasks(profile, entries, urls, std::move(verifier)); + FindAllTypesOfTasks(profile, entries, urls, {""}, std::move(verifier)); })); run_loop.Run(); EXPECT_EQ(remaining_expectations, 0); @@ -619,6 +658,80 @@ } #endif // BUILDFLAG(GOOGLE_CHROME_BRANDING) +// Tests that apply DLP policies before fetching tasks and verify expectations +// on the blocked status. +class FileTasksPolicyBrowserTest : public FileTasksBrowserTest { + public: + // Tests that fetched tasks are marked as blocked by DLP, if expected. + void TestExpectationsAgainstDlp( + const std::vector<Expectation>& expectations) { + int remaining = expectations.size(); + + for (const Expectation& test : expectations) { + std::vector<extensions::EntryInfo> entries; + std::vector<GURL> file_urls; + std::vector<std::string> dlp_source_urls; + ConvertExpectation(test, entries, file_urls, dlp_source_urls); + + // task_verifier callback is invoked synchronously from + // FindAllTypesOfTasks. + FindAllTypesOfTasks(browser()->profile(), entries, file_urls, + dlp_source_urls, + base::BindOnce(&VerifyDlpStatus, &remaining, test)); + } + EXPECT_EQ(0, remaining); + } + + std::unique_ptr<KeyedService> SetDlpRulesManager( + content::BrowserContext* context) { + auto dlp_rules_manager = + std::make_unique<testing::NiceMock<policy::MockDlpRulesManager>>(); + rules_manager_ = dlp_rules_manager.get(); + return dlp_rules_manager; + } + + protected: + policy::MockDlpRulesManager* rules_manager_ = nullptr; +}; + +IN_PROC_BROWSER_TEST_P(FileTasksPolicyBrowserTest, TasksMarkedAsBlocked) { + if (profile_type() != TestProfileType::kRegular) { + // Early return: DLP is only supported for regular profiles. + return; + } + + Profile* profile = browser()->profile(); + + policy::DlpRulesManagerFactory::GetInstance()->SetTestingFactory( + profile, + base::BindRepeating(&FileTasksPolicyBrowserTest::SetDlpRulesManager, + base::Unretained(this))); + ASSERT_TRUE(policy::DlpRulesManagerFactory::GetForPrimaryProfile()); + + ON_CALL(*rules_manager_, IsFilesPolicyEnabled) + .WillByDefault(testing::Return(true)); + std::unique_ptr<policy::DlpFilesController> files_controller_ = + std::make_unique<policy::DlpFilesController>(*rules_manager_); + ON_CALL(*rules_manager_, GetDlpFilesController) + .WillByDefault(testing::Return(files_controller_.get())); + + EXPECT_CALL(*rules_manager_, IsRestrictedDestination) + .Times(testing::AtLeast(1)) + .WillRepeatedly(testing::Return(policy::DlpRulesManager::Level::kAllow)); + EXPECT_CALL(*rules_manager_, + IsRestrictedDestination(GURL(blockedUrl), testing::_, testing::_, + testing::_, testing::_)) + .Times(testing::AtLeast(1)) + .WillRepeatedly(testing::Return(policy::DlpRulesManager::Level::kBlock)); + + std::vector<Expectation> expectations = { + {"jpg/gif", kMediaAppId, nullptr, "https://example.com"}, + {"jpg/mp4", kMediaAppId, nullptr, "https://blocked.com"}, + }; + + TestExpectationsAgainstDlp(expectations); +} + // TODO(cassycc): move this class to a more appropriate spot. // Fake DriveFs specific to the `DriveTest`. Allows a test file to // be "added" to the DriveFs via `SetMetadata()`. The `alternate_url` of the @@ -1306,6 +1419,8 @@ INSTANTIATE_SYSTEM_WEB_APP_MANAGER_TEST_SUITE_ALL_PROFILE_TYPES_P( FileTasksBrowserTest); +INSTANTIATE_SYSTEM_WEB_APP_MANAGER_TEST_SUITE_ALL_PROFILE_TYPES_P( + FileTasksPolicyBrowserTest); } // namespace file_tasks } // namespace file_manager
diff --git a/chrome/browser/ash/file_manager/file_tasks_unittest.cc b/chrome/browser/ash/file_manager/file_tasks_unittest.cc index 30a95be..8da3b92 100644 --- a/chrome/browser/ash/file_manager/file_tasks_unittest.cc +++ b/chrome/browser/ash/file_manager/file_tasks_unittest.cc
@@ -34,6 +34,8 @@ #include "chrome/browser/ash/guest_os/guest_os_mime_types_service_factory.h" #include "chrome/browser/ash/login/users/scoped_test_user_manager.h" #include "chrome/browser/ash/settings/scoped_cros_settings_test_helper.h" +#include "chrome/browser/chromeos/policy/dlp/dlp_rules_manager_factory.h" +#include "chrome/browser/chromeos/policy/dlp/mock_dlp_rules_manager.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/extensions/test_extension_system.h" #include "chrome/browser/profiles/profile.h" @@ -763,9 +765,10 @@ void Call(Profile* profile, const std::vector<extensions::EntryInfo>& entries, const std::vector<GURL>& file_urls, + const std::vector<std::string>& source_urls, ResultingTasks* resulting_tasks) { FindAllTypesOfTasks( - profile, entries, file_urls, + profile, entries, file_urls, source_urls, base::BindOnce(&FindAllTypesOfTasksSynchronousWrapper::OnReply, base::Unretained(this), resulting_tasks)); run_loop_.Run(); @@ -886,7 +889,7 @@ std::vector<FullTaskDescriptor>& tasks = resulting_tasks->tasks; FindAllTypesOfTasksSynchronousWrapper().Call( - test_profile_.get(), entries, file_urls, resulting_tasks.get()); + test_profile_.get(), entries, file_urls, {""}, resulting_tasks.get()); ASSERT_EQ(1U, tasks.size()); EXPECT_EQ(text_app_id_, tasks[0].task_descriptor.app_id); @@ -894,7 +897,7 @@ entries.emplace_back(crostini_folder_.Append("bar.txt"), "text/plain", false); file_urls.emplace_back(PathToURL("dir/bar.txt")); FindAllTypesOfTasksSynchronousWrapper().Call( - test_profile_.get(), entries, file_urls, resulting_tasks.get()); + test_profile_.get(), entries, file_urls, {"", ""}, resulting_tasks.get()); ASSERT_EQ(1U, tasks.size()); EXPECT_EQ(text_app_id_, tasks[0].task_descriptor.app_id); } @@ -908,13 +911,13 @@ std::vector<FullTaskDescriptor>& tasks = resulting_tasks->tasks; FindAllTypesOfTasksSynchronousWrapper().Call( - test_profile_.get(), entries, file_urls, resulting_tasks.get()); + test_profile_.get(), entries, file_urls, {""}, resulting_tasks.get()); EXPECT_EQ(0U, tasks.size()); entries.emplace_back(crostini_folder_.Append("foo.txt"), "text/plain", false); file_urls.emplace_back(PathToURL("dir/foo.txt")); FindAllTypesOfTasksSynchronousWrapper().Call( - test_profile_.get(), entries, file_urls, resulting_tasks.get()); + test_profile_.get(), entries, file_urls, {"", ""}, resulting_tasks.get()); EXPECT_EQ(0U, tasks.size()); } @@ -929,7 +932,7 @@ std::vector<FullTaskDescriptor>& tasks = resulting_tasks->tasks; FindAllTypesOfTasksSynchronousWrapper().Call( - test_profile_.get(), entries, file_urls, resulting_tasks.get()); + test_profile_.get(), entries, file_urls, {"", ""}, resulting_tasks.get()); // The returned values happen to be ordered alphabetically by app_id, so we // rely on this to keep the test simple. EXPECT_LT(gif_app_id_, image_app_id_); @@ -949,14 +952,15 @@ std::vector<FullTaskDescriptor>& tasks = resulting_tasks->tasks; FindAllTypesOfTasksSynchronousWrapper().Call( - test_profile_.get(), entries, file_urls, resulting_tasks.get()); + test_profile_.get(), entries, file_urls, {"", ""}, resulting_tasks.get()); ASSERT_EQ(1U, tasks.size()); EXPECT_EQ(image_app_id_, tasks[0].task_descriptor.app_id); entries.emplace_back(crostini_folder_.Append("qux.mp4"), "video/mp4", false); file_urls.emplace_back(PathToURL("dir/qux.mp4")); - FindAllTypesOfTasksSynchronousWrapper().Call( - test_profile_.get(), entries, file_urls, resulting_tasks.get()); + FindAllTypesOfTasksSynchronousWrapper().Call(test_profile_.get(), entries, + file_urls, {"", "", ""}, + resulting_tasks.get()); EXPECT_EQ(0U, tasks.size()); } @@ -971,7 +975,7 @@ std::vector<FullTaskDescriptor>& tasks = resulting_tasks->tasks; FindAllTypesOfTasksSynchronousWrapper().Call( - test_profile_.get(), entries, file_urls, resulting_tasks.get()); + test_profile_.get(), entries, file_urls, {"", ""}, resulting_tasks.get()); ASSERT_EQ(1U, tasks.size()); EXPECT_EQ(alt_mime_app_id_, tasks[0].task_descriptor.app_id); }
diff --git a/chrome/browser/ash/file_manager/open_util.cc b/chrome/browser/ash/file_manager/open_util.cc index 1eecfb0..c42ec33c 100644 --- a/chrome/browser/ash/file_manager/open_util.cc +++ b/chrome/browser/ash/file_manager/open_util.cc
@@ -119,7 +119,7 @@ file_urls.push_back(url); file_tasks::FindAllTypesOfTasks( - profile, entries, file_urls, + profile, entries, file_urls, {""}, base::BindOnce(&OpenFileMimeTypeAfterTasksListed, profile, url, std::move(callback))); }
diff --git a/chrome/browser/ash/login/app_mode/kiosk_launch_controller_unittest.cc b/chrome/browser/ash/login/app_mode/kiosk_launch_controller_unittest.cc index 79a6a17..f94e62b1 100644 --- a/chrome/browser/ash/login/app_mode/kiosk_launch_controller_unittest.cc +++ b/chrome/browser/ash/login/app_mode/kiosk_launch_controller_unittest.cc
@@ -92,9 +92,8 @@ void SetUp() override { InitializeEmptyExtensionService(); - g_browser_process->platform_part() - ->browser_policy_connector_ash() - ->SetPolicyServiceForTesting(policy_service()); + policy::BrowserPolicyConnectorBase::SetPolicyServiceForTesting( + policy_service()); keyboard_controller_client_ = ChromeKeyboardControllerClientTestHelper::InitializeWithFake(); @@ -115,6 +114,14 @@ SetKioskLaunchStateCrashKey(KioskLaunchState::kStartLaunch); kiosk_app_id_ = KioskAppId::ForWebApp(EmptyAccountId()); + + extensions::ExtensionServiceTestBase::SetUp(); + } + + void TearDown() override { + extensions::ExtensionServiceTestBase::TearDown(); + + policy::BrowserPolicyConnectorBase::SetPolicyServiceForTesting(nullptr); } KioskLaunchController& controller() { return *controller_; }
diff --git a/chrome/browser/ash/login/enrollment/enrollment_screen.cc b/chrome/browser/ash/login/enrollment/enrollment_screen.cc index d07989f..68beb1d 100644 --- a/chrome/browser/ash/login/enrollment/enrollment_screen.cc +++ b/chrome/browser/ash/login/enrollment/enrollment_screen.cc
@@ -490,7 +490,8 @@ bool EnrollmentScreen::HandleAccelerator(LoginAcceleratorAction action) { if (action == LoginAcceleratorAction::kCancelScreenAction) { - if (config_.is_license_packaged_with_device) { + if (config_.is_license_packaged_with_device && !config_.is_forced() && + (!(enrollment_helper_ && enrollment_helper_->InProgress()))) { ShowSkipEnrollmentDialogue(); return true; } else {
diff --git a/chrome/browser/ash/login/enrollment/enrollment_screen_browsertest.cc b/chrome/browser/ash/login/enrollment/enrollment_screen_browsertest.cc index aa3bbbd6..3cb08fd 100644 --- a/chrome/browser/ash/login/enrollment/enrollment_screen_browsertest.cc +++ b/chrome/browser/ash/login/enrollment/enrollment_screen_browsertest.cc
@@ -351,6 +351,36 @@ } IN_PROC_BROWSER_TEST_F(EnrollmentScreenTest, + SkipEnrollmentDialogueGoBackWithFRE) { + enrollment_ui_.SetExitHandler(); + policy::EnrollmentConfig enrollment_config; + + // Set enrollment config to Forced Re-enrollment. + enrollment_config.mode = policy::EnrollmentConfig::MODE_LOCAL_FORCED; + enrollment_config.auth_mechanism = + policy::EnrollmentConfig::AUTH_MECHANISM_INTERACTIVE; + + enrollment_config.is_license_packaged_with_device = true; + + enrollment_screen()->SetEnrollmentConfig(enrollment_config); + enrollment_helper_.ResetMock(); + + WizardContext context; + enrollment_screen()->Show(&context); + + OobeScreenWaiter(EnrollmentScreenView::kScreenId).Wait(); + enrollment_ui_.WaitForStep(test::ui::kEnrollmentStepSignin); + + test::OobeJS().ExpectVisiblePath(kEnterpriseEnrollmentDialogue); + LoginDisplayHost::default_host()->HandleAccelerator( + LoginAcceleratorAction::kCancelScreenAction); + + // Check Dialogue is not open and Enrollment Screen is visible. + test::OobeJS().ExpectDialogClosed(kEnterpriseEnrollmentSkipDialogue); + test::OobeJS().ExpectVisiblePath(kEnterpriseEnrollmentDialogue); +} + +IN_PROC_BROWSER_TEST_F(EnrollmentScreenTest, SkipEnrollmentDialogueSkipConfirmation) { enrollment_ui_.SetExitHandler(); policy::EnrollmentConfig enrollment_config;
diff --git a/chrome/browser/ash/login/screens/user_selection_screen_browsertest.cc b/chrome/browser/ash/login/screens/user_selection_screen_browsertest.cc index f840d64..6d97bf2 100644 --- a/chrome/browser/ash/login/screens/user_selection_screen_browsertest.cc +++ b/chrome/browser/ash/login/screens/user_selection_screen_browsertest.cc
@@ -373,7 +373,8 @@ } // Test focusing different pods. -IN_PROC_BROWSER_TEST_F(DarkLightEnabledTest, OobeLogin) { +// Flaky test: crbug.com/1406789 +IN_PROC_BROWSER_TEST_F(DarkLightEnabledTest, DISABLED_OobeLogin) { ASSERT_EQ(LoginScreenTestApi::GetFocusedUser(), user2); auto* dark_light_mode_controller = DarkLightModeControllerImpl::Get(); EXPECT_FALSE(dark_light_mode_controller->IsDarkModeEnabled());
diff --git a/chrome/browser/ash/policy/dlp/dlp_files_controller.cc b/chrome/browser/ash/policy/dlp/dlp_files_controller.cc index 5570c76..a53befe 100644 --- a/chrome/browser/ash/policy/dlp/dlp_files_controller.cc +++ b/chrome/browser/ash/policy/dlp/dlp_files_controller.cc
@@ -91,6 +91,44 @@ return file_stats.st_ino; } +// Returns a `DlpFileDestination` with a source URL or component, based on +// |app_update|. +DlpFilesController::DlpFileDestination GetFileDestinationForApp( + const apps::AppUpdate& app_update) { + DlpFilesController::DlpFileDestination destination; + switch (app_update.AppType()) { + case apps::AppType::kStandaloneBrowserChromeApp: + case apps::AppType::kExtension: + case apps::AppType::kStandaloneBrowserExtension: + case apps::AppType::kChromeApp: + destination.url_or_path = base::StrCat( + {extensions::kExtensionScheme, "://", app_update.AppId()}); + break; + case apps::AppType::kArc: + destination.component = DlpRulesManager::Component::kArc; + break; + case apps::AppType::kCrostini: + destination.component = DlpRulesManager::Component::kCrostini; + break; + case apps::AppType::kPluginVm: + destination.component = DlpRulesManager::Component::kPluginVm; + break; + case apps::AppType::kWeb: + destination.url_or_path = app_update.PublisherId(); + break; + case apps::AppType::kUnknown: + case apps::AppType::kBuiltIn: + case apps::AppType::kMacOs: + case apps::AppType::kStandaloneBrowser: + case apps::AppType::kRemote: + case apps::AppType::kBorealis: + case apps::AppType::kBruschetta: + case apps::AppType::kSystemWeb: + break; + } + return destination; +} + std::vector<absl::optional<ino64_t>> GetFilesInodes( const std::vector<storage::FileSystemURL>& files) { std::vector<absl::optional<ino64_t>> inodes; @@ -448,6 +486,17 @@ /*metadata=*/nullptr); } +// Returns true if `file_path` is in My Files directory. +bool IsInLocalFileSystem(const base::FilePath& file_path) { + Profile* profile = ProfileManager::GetPrimaryUserProfile(); + auto my_files_folder = + file_manager::util::GetMyFilesFolderForProfile(profile); + if (my_files_folder == file_path || my_files_folder.IsParent(file_path)) { + return true; + } + return false; +} + } // namespace DlpFilesController::DlpFileMetadata::DlpFileMetadata( @@ -788,43 +837,53 @@ request.set_file_action(intent->IsShareIntent() ? ::dlp::FileAction::SHARE : ::dlp::FileAction::OPEN); - switch (app_update.AppType()) { - case apps::AppType::kStandaloneBrowserChromeApp: - case apps::AppType::kExtension: - case apps::AppType::kStandaloneBrowserExtension: - case apps::AppType::kChromeApp: - request.set_destination_url(base::StrCat( - {extensions::kExtensionScheme, "://", app_update.AppId()})); - break; - - case apps::AppType::kArc: - request.set_destination_component(::dlp::DlpComponent::ARC); - break; - case apps::AppType::kCrostini: - request.set_destination_component(::dlp::DlpComponent::CROSTINI); - break; - case apps::AppType::kPluginVm: - request.set_destination_component(::dlp::DlpComponent::PLUGIN_VM); - break; - case apps::AppType::kWeb: - request.set_destination_url(app_update.PublisherId()); - break; - case apps::AppType::kUnknown: - case apps::AppType::kBuiltIn: - case apps::AppType::kMacOs: - case apps::AppType::kStandaloneBrowser: - case apps::AppType::kRemote: - case apps::AppType::kBorealis: - case apps::AppType::kBruschetta: - case apps::AppType::kSystemWeb: - break; + DlpFileDestination destination = GetFileDestinationForApp(app_update); + if (destination.url_or_path.has_value()) { + request.set_destination_url(destination.url_or_path.value()); + } else if (destination.component.has_value()) { + request.set_destination_component( + MapPolicyComponentToProto(destination.component.value())); } + chromeos::DlpClient::Get()->CheckFilesTransfer( request, base::BindOnce(&DlpFilesController::LaunchIfAllowed, weak_ptr_factory_.GetWeakPtr(), std::move(result_callback))); } +bool DlpFilesController::IsLaunchBlocked(const apps::AppUpdate& app_update, + const apps::IntentPtr& intent) { + if (intent->files.empty()) { + return false; + } + + DlpFileDestination destination = GetFileDestinationForApp(app_update); + for (const auto& file : intent->files) { + if (!file->dlp_source_url.has_value()) { + continue; + } + if (destination.url_or_path.has_value()) { + DlpRulesManager::Level level = rules_manager_.IsRestrictedDestination( + GURL(file->dlp_source_url.value()), + GURL(destination.url_or_path.value()), + DlpRulesManager::Restriction::kFiles, /*out_source_pattern=*/nullptr, + /*out_destination_pattern=*/nullptr); + if (level == DlpRulesManager::Level::kBlock) { + return true; + } + } else if (destination.component.has_value()) { + DlpRulesManager::Level level = rules_manager_.IsRestrictedComponent( + GURL(file->dlp_source_url.value()), destination.component.value(), + DlpRulesManager::Restriction::kFiles, /*out_source_pattern=*/nullptr); + if (level == DlpRulesManager::Level::kBlock) { + return true; + } + } + } + + return false; +} + void DlpFilesController::IsFilesTransferRestricted( const std::vector<FileDaemonInfo>& transferred_files, const DlpFileDestination& destination, @@ -1248,9 +1307,10 @@ ::dlp::CheckFilesTransferRequest request; base::flat_map<std::string, storage::FileSystemURL> filtered_files; for (const auto& file : transferred_files) { - // If the file is in the same file system as the destination, no - // restrictions should be applied. - if (!file.IsInSameFileSystem(destination)) { + // If the file isn't in the local file system, or the file is in the same + // file system as the destination, no restrictions should be applied. + if (IsInLocalFileSystem(file.path()) && + !file.IsInSameFileSystem(destination)) { auto file_path = file.path().value(); filtered_files[file_path] = file; request.add_files_paths(file_path);
diff --git a/chrome/browser/ash/policy/dlp/dlp_files_controller.h b/chrome/browser/ash/policy/dlp/dlp_files_controller.h index 7b2cc877..8420a6a 100644 --- a/chrome/browser/ash/policy/dlp/dlp_files_controller.h +++ b/chrome/browser/ash/policy/dlp/dlp_files_controller.h
@@ -210,6 +210,11 @@ apps::IntentPtr intent, CheckIfLaunchAllowedCallback result_callback); + // Returns true if `app_update` is blocked from opening any of the + // files in `intent`. + virtual bool IsLaunchBlocked(const apps::AppUpdate& app_update, + const apps::IntentPtr& intent); + // Returns a sublist of |transferred_files| which aren't allowed to be // transferred to either |destination_url| or |destination_component| in // |result_callback|.
diff --git a/chrome/browser/ash/policy/dlp/dlp_files_controller_unittest.cc b/chrome/browser/ash/policy/dlp/dlp_files_controller_unittest.cc index af073ee..970f76e 100644 --- a/chrome/browser/ash/policy/dlp/dlp_files_controller_unittest.cc +++ b/chrome/browser/ash/policy/dlp/dlp_files_controller_unittest.cc
@@ -66,6 +66,7 @@ #include "components/drive/drive_pref_names.h" #include "components/file_access/scoped_file_access.h" #include "components/reporting/util/test_util.h" +#include "components/services/app_service/public/cpp/app_types.h" #include "components/services/app_service/public/cpp/intent_util.h" #include "components/user_manager/scoped_user_manager.h" #include "content/public/test/browser_task_environment.h" @@ -240,10 +241,12 @@ chromeos::DlpClient::InitializeFake(); chromeos::DlpClient::Get()->GetTestInterface()->SetIsAlive(true); - ASSERT_TRUE(temp_dir_.CreateUniqueTempDir()); - file_system_context_ = storage::CreateFileSystemContextForTesting( - nullptr, temp_dir_.GetPath()); - temp_dir_url_ = CreateFileSystemURL(temp_dir_.GetPath().value()); + my_files_dir_ = + file_manager::util::GetMyFilesFolderForProfile(profile_.get()); + ASSERT_TRUE(base::CreateDirectory(my_files_dir_)); + file_system_context_ = + storage::CreateFileSystemContextForTesting(nullptr, my_files_dir_); + my_files_dir_url_ = CreateFileSystemURL(my_files_dir_.value()); ASSERT_TRUE(files_controller_); files_controller_->SetFileSystemContextForTesting( @@ -327,17 +330,17 @@ const blink::StorageKey kTestStorageKey = blink::StorageKey::CreateFromStringForTesting("https://example.com/test"); - base::ScopedTempDir temp_dir_; - FileSystemURL temp_dir_url_; + base::FilePath my_files_dir_; + FileSystemURL my_files_dir_url_; }; TEST_F(DlpFilesControllerTest, GetDisallowedTransfers_DiffFileSystem) { std::vector<FileDaemonInfo> files{ - FileDaemonInfo(kInode1, temp_dir_.GetPath().AppendASCII(kFilePath1), + FileDaemonInfo(kInode1, my_files_dir_.AppendASCII(kFilePath1), kExampleUrl1), - FileDaemonInfo(kInode2, temp_dir_.GetPath().AppendASCII(kFilePath2), + FileDaemonInfo(kInode2, my_files_dir_.AppendASCII(kFilePath2), kExampleUrl2), - FileDaemonInfo(kInode3, temp_dir_.GetPath().AppendASCII(kFilePath3), + FileDaemonInfo(kInode3, my_files_dir_.AppendASCII(kFilePath3), kExampleUrl3)}; std::vector<FileSystemURL> files_urls; AddFilesToDlpClient(std::move(files), files_urls); @@ -378,11 +381,11 @@ TEST_F(DlpFilesControllerTest, GetDisallowedTransfers_SameFileSystem) { std::vector<FileDaemonInfo> files{ - FileDaemonInfo(kInode1, temp_dir_.GetPath().AppendASCII(kFilePath1), + FileDaemonInfo(kInode1, my_files_dir_.AppendASCII(kFilePath1), kExampleUrl1), - FileDaemonInfo(kInode2, temp_dir_.GetPath().AppendASCII(kFilePath2), + FileDaemonInfo(kInode2, my_files_dir_.AppendASCII(kFilePath2), kExampleUrl2), - FileDaemonInfo(kInode3, temp_dir_.GetPath().AppendASCII(kFilePath3), + FileDaemonInfo(kInode3, my_files_dir_.AppendASCII(kFilePath3), kExampleUrl3)}; std::vector<FileSystemURL> files_urls; AddFilesToDlpClient(std::move(files), files_urls); @@ -400,11 +403,11 @@ TEST_F(DlpFilesControllerTest, GetDisallowedTransfers_ClientNotRunning) { std::vector<FileDaemonInfo> files{ - FileDaemonInfo(kInode1, temp_dir_.GetPath().AppendASCII(kFilePath1), + FileDaemonInfo(kInode1, my_files_dir_.AppendASCII(kFilePath1), kExampleUrl1), - FileDaemonInfo(kInode2, temp_dir_.GetPath().AppendASCII(kFilePath2), + FileDaemonInfo(kInode2, my_files_dir_.AppendASCII(kFilePath2), kExampleUrl2), - FileDaemonInfo(kInode3, temp_dir_.GetPath().AppendASCII(kFilePath3), + FileDaemonInfo(kInode3, my_files_dir_.AppendASCII(kFilePath3), kExampleUrl3)}; std::vector<FileSystemURL> files_urls; AddFilesToDlpClient(std::move(files), files_urls); @@ -436,11 +439,11 @@ TEST_F(DlpFilesControllerTest, GetDisallowedTransfers_ErrorResponse) { std::vector<FileDaemonInfo> files{ - FileDaemonInfo(kInode1, temp_dir_.GetPath().AppendASCII(kFilePath1), + FileDaemonInfo(kInode1, my_files_dir_.AppendASCII(kFilePath1), kExampleUrl1), - FileDaemonInfo(kInode2, temp_dir_.GetPath().AppendASCII(kFilePath2), + FileDaemonInfo(kInode2, my_files_dir_.AppendASCII(kFilePath2), kExampleUrl2), - FileDaemonInfo(kInode3, temp_dir_.GetPath().AppendASCII(kFilePath3), + FileDaemonInfo(kInode3, my_files_dir_.AppendASCII(kFilePath3), kExampleUrl3)}; std::vector<FileSystemURL> files_urls; AddFilesToDlpClient(std::move(files), files_urls); @@ -483,16 +486,16 @@ TEST_F(DlpFilesControllerTest, GetDisallowedTransfers_Folder) { std::vector<FileDaemonInfo> files{ - FileDaemonInfo(kInode1, temp_dir_.GetPath().AppendASCII(kFilePath1), + FileDaemonInfo(kInode1, my_files_dir_.AppendASCII(kFilePath1), kExampleUrl1), - FileDaemonInfo(kInode2, temp_dir_.GetPath().AppendASCII(kFilePath2), + FileDaemonInfo(kInode2, my_files_dir_.AppendASCII(kFilePath2), kExampleUrl2), - FileDaemonInfo(kInode3, temp_dir_.GetPath().AppendASCII(kFilePath3), + FileDaemonInfo(kInode3, my_files_dir_.AppendASCII(kFilePath3), kExampleUrl3)}; std::vector<FileSystemURL> files_urls; AddFilesToDlpClient(std::move(files), files_urls); - std::vector<storage::FileSystemURL> transferred_files({temp_dir_url_}); + std::vector<storage::FileSystemURL> transferred_files({my_files_dir_url_}); storage::ExternalMountPoints* mount_points = storage::ExternalMountPoints::GetSystemInstance(); @@ -527,13 +530,13 @@ TEST_F(DlpFilesControllerTest, GetDisallowedTransfers_MultiFolder) { base::ScopedTempDir sub_dir1; - ASSERT_TRUE(sub_dir1.CreateUniqueTempDirUnderPath(temp_dir_.GetPath())); + ASSERT_TRUE(sub_dir1.CreateUniqueTempDirUnderPath(my_files_dir_)); std::vector<FileDaemonInfo> files{ - FileDaemonInfo(kInode1, temp_dir_.GetPath().AppendASCII(kFilePath1), + FileDaemonInfo(kInode1, my_files_dir_.AppendASCII(kFilePath1), kExampleUrl1), - FileDaemonInfo(kInode2, temp_dir_.GetPath().AppendASCII(kFilePath2), + FileDaemonInfo(kInode2, my_files_dir_.AppendASCII(kFilePath2), kExampleUrl2), - FileDaemonInfo(kInode3, temp_dir_.GetPath().AppendASCII(kFilePath3), + FileDaemonInfo(kInode3, my_files_dir_.AppendASCII(kFilePath3), kExampleUrl3), FileDaemonInfo(kInode4, sub_dir1.GetPath().AppendASCII(kFilePath4), kExampleUrl4), @@ -542,7 +545,7 @@ std::vector<FileSystemURL> files_urls; AddFilesToDlpClient(std::move(files), files_urls); - std::vector<storage::FileSystemURL> transferred_files({temp_dir_url_}); + std::vector<storage::FileSystemURL> transferred_files({my_files_dir_url_}); storage::ExternalMountPoints* mount_points = storage::ExternalMountPoints::GetSystemInstance(); @@ -577,15 +580,44 @@ EXPECT_EQ(expected_restricted_files, future.Take()); } +TEST_F(DlpFilesControllerTest, GetDisallowedTransfers_ExternalFiles) { + base::ScopedTempDir external_dir; + ASSERT_TRUE(external_dir.CreateUniqueTempDir()); + base::FilePath file_path1 = external_dir.GetPath().AppendASCII(kFilePath1); + ASSERT_TRUE(CreateDummyFile(file_path1)); + auto file_url1 = CreateFileSystemURL(file_path1.value()); + base::FilePath file_path2 = external_dir.GetPath().AppendASCII(kFilePath2); + ASSERT_TRUE(CreateDummyFile(file_path2)); + auto file_url2 = CreateFileSystemURL(file_path2.value()); + + // Set CheckFilesTransfer response to restrict the files to verify that the + // files transfer is allowed because the files are from external file system. + ::dlp::CheckFilesTransferResponse check_files_transfer_response; + check_files_transfer_response.add_files_paths(file_url1.path().value()); + check_files_transfer_response.add_files_paths(file_url2.path().value()); + ASSERT_TRUE(chromeos::DlpClient::Get()->IsAlive()); + chromeos::DlpClient::Get()->GetTestInterface()->SetCheckFilesTransferResponse( + check_files_transfer_response); + + std::vector<FileSystemURL> transferred_files({file_url1, file_url2}); + base::test::TestFuture<std::vector<FileSystemURL>> future; + ASSERT_TRUE(files_controller_); + files_controller_->GetDisallowedTransfers(transferred_files, + my_files_dir_url_, /*is_move=*/true, + future.GetCallback()); + EXPECT_TRUE(future.Wait()); + EXPECT_EQ(std::vector<FileSystemURL>(), future.Take()); +} + TEST_F(DlpFilesControllerTest, FilterDisallowedUploads_EmptyList) { NotificationDisplayServiceTester display_service_tester(profile_.get()); std::vector<FileDaemonInfo> files{ - FileDaemonInfo(kInode1, temp_dir_.GetPath().AppendASCII(kFilePath1), + FileDaemonInfo(kInode1, my_files_dir_.AppendASCII(kFilePath1), kExampleUrl1), - FileDaemonInfo(kInode2, temp_dir_.GetPath().AppendASCII(kFilePath2), + FileDaemonInfo(kInode2, my_files_dir_.AppendASCII(kFilePath2), kExampleUrl2), - FileDaemonInfo(kInode3, temp_dir_.GetPath().AppendASCII(kFilePath3), + FileDaemonInfo(kInode3, my_files_dir_.AppendASCII(kFilePath3), kExampleUrl3)}; std::vector<FileSystemURL> files_urls; AddFilesToDlpClient(std::move(files), files_urls); @@ -618,17 +650,17 @@ ASSERT_TRUE(mount_points); ASSERT_TRUE(mount_points->RegisterFileSystem( "c", storage::kFileSystemTypeLocal, storage::FileSystemMountOption(), - temp_dir_.GetPath())); + my_files_dir_)); base::ScopedClosureRunner external_mount_points_revoker( base::BindOnce(&storage::ExternalMountPoints::RevokeAllFileSystems, base::Unretained(mount_points))); std::vector<FileDaemonInfo> files{ - FileDaemonInfo(kInode1, temp_dir_.GetPath().AppendASCII(kFilePath1), + FileDaemonInfo(kInode1, my_files_dir_.AppendASCII(kFilePath1), kExampleUrl1), - FileDaemonInfo(kInode2, temp_dir_.GetPath().AppendASCII(kFilePath2), + FileDaemonInfo(kInode2, my_files_dir_.AppendASCII(kFilePath2), kExampleUrl2), - FileDaemonInfo(kInode3, temp_dir_.GetPath().AppendASCII(kFilePath3), + FileDaemonInfo(kInode3, my_files_dir_.AppendASCII(kFilePath3), kExampleUrl3)}; std::vector<FileSystemURL> files_urls; AddFilesToDlpClient(std::move(files), files_urls); @@ -669,17 +701,17 @@ ASSERT_TRUE(mount_points); ASSERT_TRUE(mount_points->RegisterFileSystem( "c", storage::kFileSystemTypeLocal, storage::FileSystemMountOption(), - temp_dir_.GetPath())); + my_files_dir_)); base::ScopedClosureRunner external_mount_points_revoker( base::BindOnce(&storage::ExternalMountPoints::RevokeAllFileSystems, base::Unretained(mount_points))); std::vector<FileDaemonInfo> files{ - FileDaemonInfo(kInode1, temp_dir_.GetPath().AppendASCII(kFilePath1), + FileDaemonInfo(kInode1, my_files_dir_.AppendASCII(kFilePath1), kExampleUrl1), - FileDaemonInfo(kInode2, temp_dir_.GetPath().AppendASCII(kFilePath2), + FileDaemonInfo(kInode2, my_files_dir_.AppendASCII(kFilePath2), kExampleUrl2), - FileDaemonInfo(kInode3, temp_dir_.GetPath().AppendASCII(kFilePath3), + FileDaemonInfo(kInode3, my_files_dir_.AppendASCII(kFilePath3), kExampleUrl3)}; std::vector<FileSystemURL> files_urls; AddFilesToDlpClient(std::move(files), files_urls); @@ -717,19 +749,19 @@ ASSERT_TRUE(mount_points); ASSERT_TRUE(mount_points->RegisterFileSystem( "c", storage::kFileSystemTypeLocal, storage::FileSystemMountOption(), - temp_dir_.GetPath())); + my_files_dir_)); base::ScopedClosureRunner external_mount_points_revoker( base::BindOnce(&storage::ExternalMountPoints::RevokeAllFileSystems, base::Unretained(mount_points))); base::ScopedTempDir sub_dir1; - ASSERT_TRUE(sub_dir1.CreateUniqueTempDirUnderPath(temp_dir_.GetPath())); + ASSERT_TRUE(sub_dir1.CreateUniqueTempDirUnderPath(my_files_dir_)); base::ScopedTempDir sub_dir2; - ASSERT_TRUE(sub_dir2.CreateUniqueTempDirUnderPath(temp_dir_.GetPath())); + ASSERT_TRUE(sub_dir2.CreateUniqueTempDirUnderPath(my_files_dir_)); base::ScopedTempDir sub_dir2_1; ASSERT_TRUE(sub_dir2_1.CreateUniqueTempDirUnderPath(sub_dir2.GetPath())); base::ScopedTempDir sub_dir3; - ASSERT_TRUE(sub_dir3.CreateUniqueTempDirUnderPath(temp_dir_.GetPath())); + ASSERT_TRUE(sub_dir3.CreateUniqueTempDirUnderPath(my_files_dir_)); std::vector<FileDaemonInfo> files{ FileDaemonInfo(kInode1, sub_dir1.GetPath().AppendASCII(kFilePath1), kExampleUrl1), @@ -773,11 +805,11 @@ TEST_F(DlpFilesControllerTest, GetDlpMetadata) { std::vector<FileDaemonInfo> files{ - FileDaemonInfo(kInode1, temp_dir_.GetPath().AppendASCII(kFilePath1), + FileDaemonInfo(kInode1, my_files_dir_.AppendASCII(kFilePath1), kExampleUrl1), - FileDaemonInfo(kInode2, temp_dir_.GetPath().AppendASCII(kFilePath2), + FileDaemonInfo(kInode2, my_files_dir_.AppendASCII(kFilePath2), kExampleUrl2), - FileDaemonInfo(kInode3, temp_dir_.GetPath().AppendASCII(kFilePath3), + FileDaemonInfo(kInode3, my_files_dir_.AppendASCII(kFilePath3), kExampleUrl3)}; std::vector<FileSystemURL> files_urls; AddFilesToDlpClient(std::move(files), files_urls); @@ -814,11 +846,11 @@ TEST_F(DlpFilesControllerTest, GetDlpMetadata_WithComponent) { std::vector<FileDaemonInfo> files{ - FileDaemonInfo(kInode1, temp_dir_.GetPath().AppendASCII(kFilePath1), + FileDaemonInfo(kInode1, my_files_dir_.AppendASCII(kFilePath1), kExampleUrl1), - FileDaemonInfo(kInode2, temp_dir_.GetPath().AppendASCII(kFilePath2), + FileDaemonInfo(kInode2, my_files_dir_.AppendASCII(kFilePath2), kExampleUrl2), - FileDaemonInfo(kInode3, temp_dir_.GetPath().AppendASCII(kFilePath3), + FileDaemonInfo(kInode3, my_files_dir_.AppendASCII(kFilePath3), kExampleUrl3)}; std::vector<FileSystemURL> files_urls; AddFilesToDlpClient(std::move(files), files_urls); @@ -861,11 +893,11 @@ TEST_F(DlpFilesControllerTest, GetDlpMetadata_WithDestination) { std::vector<FileDaemonInfo> files{ - FileDaemonInfo(kInode1, temp_dir_.GetPath().AppendASCII(kFilePath1), + FileDaemonInfo(kInode1, my_files_dir_.AppendASCII(kFilePath1), kExampleUrl1), - FileDaemonInfo(kInode2, temp_dir_.GetPath().AppendASCII(kFilePath2), + FileDaemonInfo(kInode2, my_files_dir_.AppendASCII(kFilePath2), kExampleUrl2), - FileDaemonInfo(kInode3, temp_dir_.GetPath().AppendASCII(kFilePath3), + FileDaemonInfo(kInode3, my_files_dir_.AppendASCII(kFilePath3), kExampleUrl3)}; std::vector<FileSystemURL> files_urls; AddFilesToDlpClient(std::move(files), files_urls); @@ -908,7 +940,7 @@ TEST_F(DlpFilesControllerTest, GetDlpMetadata_FileNotAvailable) { ASSERT_TRUE(chromeos::DlpClient::Get()->IsAlive()); - auto file_path = temp_dir_.GetPath().AppendASCII(kFilePath1); + auto file_path = my_files_dir_.AppendASCII(kFilePath1); ASSERT_TRUE(CreateDummyFile(file_path)); auto file_url = CreateFileSystemURL(file_path.value()); ASSERT_TRUE(file_url.is_valid()); @@ -1867,13 +1899,11 @@ } TEST_F(DlpFilesControllerTest, LocalFileCopyTest) { - base::FilePath src_file = - temp_dir_.GetPath().Append(FILE_PATH_LITERAL("test")); + base::FilePath src_file = my_files_dir_.Append(FILE_PATH_LITERAL("test")); base::File(src_file, base::File::FLAG_CREATE_ALWAYS | base::File::FLAG_WRITE) .Flush(); - base::FilePath dest_file = - temp_dir_.GetPath().Append(FILE_PATH_LITERAL("dest")); + base::FilePath dest_file = my_files_dir_.Append(FILE_PATH_LITERAL("dest")); auto source = storage::FileSystemURL::CreateForTest( kTestStorageKey, storage::kFileSystemTypeLocal, src_file); @@ -1950,13 +1980,11 @@ } TEST_F(DlpFilesControllerTest, CopyNoMetadataTest) { - base::FilePath src_file = - temp_dir_.GetPath().Append(FILE_PATH_LITERAL("test")); + base::FilePath src_file = my_files_dir_.Append(FILE_PATH_LITERAL("test")); base::File(src_file, base::File::FLAG_CREATE_ALWAYS | base::File::FLAG_WRITE) .Flush(); - base::FilePath dest_file = - temp_dir_.GetPath().Append(FILE_PATH_LITERAL("dest")); + base::FilePath dest_file = my_files_dir_.Append(FILE_PATH_LITERAL("dest")); auto source = storage::FileSystemURL::CreateForTest( kTestStorageKey, storage::kFileSystemTypeLocal, src_file); @@ -1992,13 +2020,11 @@ } TEST_F(DlpFilesControllerTest, CopyEmptyMetadataTest) { - base::FilePath src_file = - temp_dir_.GetPath().Append(FILE_PATH_LITERAL("test")); + base::FilePath src_file = my_files_dir_.Append(FILE_PATH_LITERAL("test")); base::File(src_file, base::File::FLAG_CREATE_ALWAYS | base::File::FLAG_WRITE) .Flush(); - base::FilePath dest_file = - temp_dir_.GetPath().Append(FILE_PATH_LITERAL("dest")); + base::FilePath dest_file = my_files_dir_.Append(FILE_PATH_LITERAL("dest")); auto source = storage::FileSystemURL::CreateForTest( kTestStorageKey, storage::kFileSystemTypeLocal, src_file); @@ -2047,13 +2073,11 @@ } TEST_F(DlpFilesControllerTest, CopyNoClientTest) { - base::FilePath src_file = - temp_dir_.GetPath().Append(FILE_PATH_LITERAL("test")); + base::FilePath src_file = my_files_dir_.Append(FILE_PATH_LITERAL("test")); base::File(src_file, base::File::FLAG_CREATE_ALWAYS | base::File::FLAG_WRITE) .Flush(); - base::FilePath dest_file = - temp_dir_.GetPath().Append(FILE_PATH_LITERAL("dest")); + base::FilePath dest_file = my_files_dir_.Append(FILE_PATH_LITERAL("dest")); auto source = storage::FileSystemURL::CreateForTest( kTestStorageKey, storage::kFileSystemTypeLocal, src_file); @@ -2138,11 +2162,11 @@ storage::FileSystemMountOption(), base::FilePath(file_manager::util::kRemovableMediaPath))); std::vector<FileDaemonInfo> files{ - FileDaemonInfo(kInode1, temp_dir_.GetPath().AppendASCII(kFilePath1), + FileDaemonInfo(kInode1, my_files_dir_.AppendASCII(kFilePath1), kExampleUrl1), - FileDaemonInfo(kInode2, temp_dir_.GetPath().AppendASCII(kFilePath2), + FileDaemonInfo(kInode2, my_files_dir_.AppendASCII(kFilePath2), kExampleUrl2), - FileDaemonInfo(kInode3, temp_dir_.GetPath().AppendASCII(kFilePath3), + FileDaemonInfo(kInode3, my_files_dir_.AppendASCII(kFilePath3), kExampleUrl3)}; std::vector<FileSystemURL> files_urls; AddFilesToDlpClient(std::move(files), files_urls); @@ -2301,6 +2325,47 @@ EXPECT_EQ(launch_cb.Get(), true); } +TEST_F(DlpFilesAppServiceTest, IsLaunchBlocked_EmptyIntent) { + CreateAndStoreFakeApp("arcApp", apps::AppType::kArc); + + ON_CALL(*rules_manager_, IsRestrictedComponent) + .WillByDefault(testing::Return(DlpRulesManager::Level::kBlock)); + + auto app_service_intent = + std::make_unique<apps::Intent>(apps_util::kIntentActionView); + + ASSERT_TRUE(files_controller_); + EXPECT_TRUE(app_service_proxy_->AppRegistryCache().ForOneApp( + kArcAppId, [this, &app_service_intent](const apps::AppUpdate& update) { + EXPECT_FALSE(files_controller_->IsLaunchBlocked( + update, std::move(app_service_intent))); + })); +} + +TEST_F(DlpFilesAppServiceTest, IsLaunchBlocked_NoSourceUrl) { + CreateAndStoreFakeApp("arcApp", apps::AppType::kArc); + + ON_CALL(*rules_manager_, IsRestrictedComponent) + .WillByDefault(testing::Return(DlpRulesManager::Level::kBlock)); + + auto app_service_intent = + std::make_unique<apps::Intent>(apps_util::kIntentActionSend); + app_service_intent->mime_type = "*/*"; + app_service_intent->files = std::vector<apps::IntentFilePtr>{}; + auto url1 = ToGURL(base::FilePath(storage::kTestDir), "Documents/foo1.txt"); + EXPECT_TRUE(url1.SchemeIsFileSystem()); + auto file1 = std::make_unique<apps::IntentFile>(url1); + file1->mime_type = "text/plain"; + app_service_intent->files.push_back(std::move(file1)); + + ASSERT_TRUE(files_controller_); + EXPECT_TRUE(app_service_proxy_->AppRegistryCache().ForOneApp( + kArcAppId, [this, &app_service_intent](const apps::AppUpdate& update) { + EXPECT_FALSE(files_controller_->IsLaunchBlocked( + update, std::move(app_service_intent))); + })); +} + class DlpFilesAppLaunchTest : public DlpFilesAppServiceTest, public ::testing::WithParamInterface< std::tuple<apps::AppType, std::string>> { @@ -2415,4 +2480,69 @@ display_service_tester.GetNotification(kOpenBlockedNotificationId)); } +TEST_P(DlpFilesAppLaunchTest, IsLaunchBlocked) { + auto [app_type, app_id] = GetParam(); + + auto app_service_intent = + std::make_unique<apps::Intent>(apps_util::kIntentActionSend); + app_service_intent->mime_type = "*/*"; + app_service_intent->files = std::vector<apps::IntentFilePtr>{}; + auto url1 = ToGURL(base::FilePath(storage::kTestDir), "Documents/foo1.txt"); + EXPECT_TRUE(url1.SchemeIsFileSystem()); + auto file1 = std::make_unique<apps::IntentFile>(url1); + file1->mime_type = "text/plain"; + file1->dlp_source_url = kExampleUrl1; + app_service_intent->files.push_back(std::move(file1)); + + std::vector<std::string> urls; + urls.push_back(kExampleUrl1); + + if (app_type == apps::AppType::kChromeApp || + app_type == apps::AppType::kWeb) { + EXPECT_CALL(*rules_manager_, IsRestrictedDestination) + .WillOnce(testing::Return(DlpRulesManager::Level::kBlock)); + } else { + EXPECT_CALL(*rules_manager_, IsRestrictedComponent) + .WillOnce(testing::Return(DlpRulesManager::Level::kBlock)); + } + + ASSERT_TRUE(files_controller_); + EXPECT_TRUE(app_service_proxy_->AppRegistryCache().ForOneApp( + app_id, [this, &app_service_intent](const apps::AppUpdate& update) { + EXPECT_TRUE(files_controller_->IsLaunchBlocked( + update, std::move(app_service_intent))); + })); +} + +TEST_P(DlpFilesAppLaunchTest, IsLaunchBlocked_Empty) { + auto [app_type, app_id] = GetParam(); + + auto app_service_intent = + std::make_unique<apps::Intent>(apps_util::kIntentActionSend); + app_service_intent->mime_type = "*/*"; + app_service_intent->files = std::vector<apps::IntentFilePtr>{}; + auto url1 = ToGURL(base::FilePath(storage::kTestDir), "Documents/foo1.txt"); + EXPECT_TRUE(url1.SchemeIsFileSystem()); + auto file1 = std::make_unique<apps::IntentFile>(url1); + file1->mime_type = "text/plain"; + file1->dlp_source_url = kExampleUrl1; + app_service_intent->files.push_back(std::move(file1)); + + if (app_type == apps::AppType::kChromeApp || + app_type == apps::AppType::kWeb) { + EXPECT_CALL(*rules_manager_, IsRestrictedDestination) + .WillOnce(testing::Return(DlpRulesManager::Level::kBlock)); + } else { + EXPECT_CALL(*rules_manager_, IsRestrictedComponent) + .WillOnce(testing::Return(DlpRulesManager::Level::kBlock)); + } + + ASSERT_TRUE(files_controller_); + EXPECT_TRUE(app_service_proxy_->AppRegistryCache().ForOneApp( + app_id, [this, &app_service_intent](const apps::AppUpdate& update) { + EXPECT_TRUE(files_controller_->IsLaunchBlocked( + update, std::move(app_service_intent))); + })); +} + } // namespace policy
diff --git a/chrome/browser/chromeos/extensions/smart_card_provider_private/BUILD.gn b/chrome/browser/chromeos/extensions/smart_card_provider_private/BUILD.gn new file mode 100644 index 0000000..f0d6a45 --- /dev/null +++ b/chrome/browser/chromeos/extensions/smart_card_provider_private/BUILD.gn
@@ -0,0 +1,18 @@ +# Copyright 2023 The Chromium Authors +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +import("//extensions/buildflags/buildflags.gni") + +source_set("smart_card_provider_private") { + sources = [ + "smart_card_provider_private_api.cc", + "smart_card_provider_private_api.h", + ] + + deps = [ + "//base", + "//chrome/common/extensions/api", + "//extensions/browser", + ] +}
diff --git a/chrome/browser/chromeos/extensions/smart_card_provider_private/DIR_METADATA b/chrome/browser/chromeos/extensions/smart_card_provider_private/DIR_METADATA new file mode 100644 index 0000000..7f4c9b5 --- /dev/null +++ b/chrome/browser/chromeos/extensions/smart_card_provider_private/DIR_METADATA
@@ -0,0 +1,11 @@ +# Metadata information for this directory. +# +# For more information on DIR_METADATA files, see: +# https://source.chromium.org/chromium/infra/infra/+/main:go/src/infra/tools/dirmd/README.md +# +# For the schema of this file, see Metadata message: +# https://source.chromium.org/chromium/infra/infra/+/main:go/src/infra/tools/dirmd/proto/dir_metadata.proto + +monorail { + component: "Blink>SmartCard" +}
diff --git a/chrome/browser/chromeos/extensions/smart_card_provider_private/OWNERS b/chrome/browser/chromeos/extensions/smart_card_provider_private/OWNERS new file mode 100644 index 0000000..783b6bbe --- /dev/null +++ b/chrome/browser/chromeos/extensions/smart_card_provider_private/OWNERS
@@ -0,0 +1 @@ +file://third_party/blink/renderer/modules/smart_card/OWNERS
diff --git a/chrome/browser/chromeos/extensions/smart_card_provider_private/smart_card_provider_private_api.cc b/chrome/browser/chromeos/extensions/smart_card_provider_private/smart_card_provider_private_api.cc new file mode 100644 index 0000000..ad7f80a --- /dev/null +++ b/chrome/browser/chromeos/extensions/smart_card_provider_private/smart_card_provider_private_api.cc
@@ -0,0 +1,47 @@ +// Copyright 2023 The Chromium Authors +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#include "chrome/browser/chromeos/extensions/smart_card_provider_private/smart_card_provider_private_api.h" + +#include "base/notreached.h" + +namespace extensions { + +SmartCardProviderPrivateReportEstablishContextResultFunction:: + ~SmartCardProviderPrivateReportEstablishContextResultFunction() = default; +SmartCardProviderPrivateReportEstablishContextResultFunction::ResponseAction +SmartCardProviderPrivateReportEstablishContextResultFunction::Run() { + // TODO(crbug.com/1386175): Implement + NOTIMPLEMENTED(); + return RespondNow(NoArguments()); +} + +SmartCardProviderPrivateReportReleaseContextResultFunction:: + ~SmartCardProviderPrivateReportReleaseContextResultFunction() = default; +SmartCardProviderPrivateReportEstablishContextResultFunction::ResponseAction +SmartCardProviderPrivateReportReleaseContextResultFunction::Run() { + // TODO(crbug.com/1386175): Implement + NOTIMPLEMENTED(); + return RespondNow(NoArguments()); +} + +SmartCardProviderPrivateReportListReadersResultFunction:: + ~SmartCardProviderPrivateReportListReadersResultFunction() = default; +SmartCardProviderPrivateReportEstablishContextResultFunction::ResponseAction +SmartCardProviderPrivateReportListReadersResultFunction::Run() { + // TODO(crbug.com/1386175): Implement + NOTIMPLEMENTED(); + return RespondNow(NoArguments()); +} + +SmartCardProviderPrivateReportGetStatusChangeResultFunction:: + ~SmartCardProviderPrivateReportGetStatusChangeResultFunction() = default; +SmartCardProviderPrivateReportEstablishContextResultFunction::ResponseAction +SmartCardProviderPrivateReportGetStatusChangeResultFunction::Run() { + // TODO(crbug.com/1386175): Implement + NOTIMPLEMENTED(); + return RespondNow(NoArguments()); +} + +} // namespace extensions
diff --git a/chrome/browser/chromeos/extensions/smart_card_provider_private/smart_card_provider_private_api.h b/chrome/browser/chromeos/extensions/smart_card_provider_private/smart_card_provider_private_api.h new file mode 100644 index 0000000..622c9f7 --- /dev/null +++ b/chrome/browser/chromeos/extensions/smart_card_provider_private/smart_card_provider_private_api.h
@@ -0,0 +1,61 @@ +// Copyright 2023 The Chromium Authors +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#ifndef CHROME_BROWSER_CHROMEOS_EXTENSIONS_SMART_CARD_PROVIDER_PRIVATE_SMART_CARD_PROVIDER_PRIVATE_API_H_ +#define CHROME_BROWSER_CHROMEOS_EXTENSIONS_SMART_CARD_PROVIDER_PRIVATE_SMART_CARD_PROVIDER_PRIVATE_API_H_ + +#include "extensions/browser/extension_function.h" + +namespace extensions { + +class SmartCardProviderPrivateReportEstablishContextResultFunction + : public ExtensionFunction { + private: + // ExtensionFunction: + ~SmartCardProviderPrivateReportEstablishContextResultFunction() override; + ResponseAction Run() override; + + DECLARE_EXTENSION_FUNCTION( + "smartCardProviderPrivate.reportEstablishContextResult", + SMARTCARDPROVIDERPRIVATE_REPORTESTABLISHCONTEXTRESULT) +}; + +class SmartCardProviderPrivateReportReleaseContextResultFunction + : public ExtensionFunction { + private: + // ExtensionFunction: + ~SmartCardProviderPrivateReportReleaseContextResultFunction() override; + ResponseAction Run() override; + + DECLARE_EXTENSION_FUNCTION( + "smartCardProviderPrivate.reportReleaseContextResult", + SMARTCARDPROVIDERPRIVATE_REPORTRELEASECONTEXTRESULT) +}; + +class SmartCardProviderPrivateReportListReadersResultFunction + : public ExtensionFunction { + private: + // ExtensionFunction: + ~SmartCardProviderPrivateReportListReadersResultFunction() override; + ResponseAction Run() override; + + DECLARE_EXTENSION_FUNCTION("smartCardProviderPrivate.reportListReadersResult", + SMARTCARDPROVIDERPRIVATE_REPORTLISTREADERSRESULT) +}; + +class SmartCardProviderPrivateReportGetStatusChangeResultFunction + : public ExtensionFunction { + private: + // ExtensionFunction: + ~SmartCardProviderPrivateReportGetStatusChangeResultFunction() override; + ResponseAction Run() override; + + DECLARE_EXTENSION_FUNCTION( + "smartCardProviderPrivate.reportGetStatusChangeResult", + SMARTCARDPROVIDERPRIVATE_REPORTGETSTATUSCHANGERESULT) +}; + +} // namespace extensions + +#endif // CHROME_BROWSER_CHROMEOS_EXTENSIONS_SMART_CARD_PROVIDER_PRIVATE_SMART_CARD_PROVIDER_PRIVATE_API_H_
diff --git a/chrome/browser/commerce/price_tracking/android/java/src/org/chromium/chrome/browser/price_tracking/PriceDropNotificationManagerImpl.java b/chrome/browser/commerce/price_tracking/android/java/src/org/chromium/chrome/browser/price_tracking/PriceDropNotificationManagerImpl.java index f22537c..37d2c2f 100644 --- a/chrome/browser/commerce/price_tracking/android/java/src/org/chromium/chrome/browser/price_tracking/PriceDropNotificationManagerImpl.java +++ b/chrome/browser/commerce/price_tracking/android/java/src/org/chromium/chrome/browser/price_tracking/PriceDropNotificationManagerImpl.java
@@ -32,7 +32,6 @@ import org.chromium.chrome.browser.bookmarks.BookmarkModel; import org.chromium.chrome.browser.bookmarks.BookmarkModelObserver; import org.chromium.chrome.browser.browserservices.intents.WebappConstants; -import org.chromium.chrome.browser.commerce.ShoppingServiceFactory; import org.chromium.chrome.browser.document.ChromeLauncherActivity; import org.chromium.chrome.browser.init.ChromeBrowserInitializer; import org.chromium.chrome.browser.notifications.NotificationIntentInterceptor; @@ -42,14 +41,16 @@ import org.chromium.chrome.browser.preferences.ChromePreferenceKeys; import org.chromium.chrome.browser.preferences.SharedPreferencesManager; import org.chromium.chrome.browser.profiles.Profile; +import org.chromium.chrome.browser.subscriptions.CommerceSubscription; +import org.chromium.chrome.browser.subscriptions.CommerceSubscription.CommerceSubscriptionType; +import org.chromium.chrome.browser.subscriptions.CommerceSubscription.SubscriptionManagementType; +import org.chromium.chrome.browser.subscriptions.CommerceSubscription.TrackingIdType; +import org.chromium.chrome.browser.subscriptions.CommerceSubscriptionsServiceFactory; +import org.chromium.chrome.browser.subscriptions.SubscriptionsManager; +import org.chromium.chrome.browser.subscriptions.SubscriptionsManagerImpl; import org.chromium.components.browser_ui.notifications.NotificationManagerProxy; import org.chromium.components.browser_ui.notifications.NotificationManagerProxyImpl; import org.chromium.components.browser_ui.notifications.channels.ChannelsInitializer; -import org.chromium.components.commerce.core.CommerceSubscription; -import org.chromium.components.commerce.core.IdentifierType; -import org.chromium.components.commerce.core.ManagementType; -import org.chromium.components.commerce.core.ShoppingService; -import org.chromium.components.commerce.core.SubscriptionType; import java.util.Locale; @@ -232,11 +233,16 @@ NotificationIntentInterceptor.INVALID_CREATE_TIME); } else if (actionId.equals(ACTION_ID_TURN_OFF_ALERT)) { if (offerId == null && clusterId == null) return; - ShoppingService shoppingService = - ShoppingServiceFactory.getForProfile(Profile.getLastUsedRegularProfile()); - Callback<Boolean> callback = (status) -> { - assert status : "Failed to remove subscriptions."; - Log.e(TAG, "Failed to remove subscriptions."); + SubscriptionsManagerImpl subscriptionsManager = + (new CommerceSubscriptionsServiceFactory()) + .getForLastUsedProfile() + .getSubscriptionsManager(); + Callback<Integer> callback = (status) -> { + assert status + == SubscriptionsManager.StatusCode.OK : "Failed to remove subscriptions."; + Log.e(TAG, + String.format( + Locale.US, "Failed to remove subscriptions. Status: %d", status)); }; final BookmarkModel bookmarkModel; if (sBookmarkModelForTesting != null) { @@ -247,17 +253,17 @@ Runnable unsubscribeRunnable = () -> { if (offerId != null) { - shoppingService.unsubscribe( - new CommerceSubscription(SubscriptionType.PRICE_TRACK, - IdentifierType.OFFER_ID, offerId, ManagementType.CHROME_MANAGED, - null), + subscriptionsManager.unsubscribe( + new CommerceSubscription(CommerceSubscriptionType.PRICE_TRACK, offerId, + SubscriptionManagementType.CHROME_MANAGED, + TrackingIdType.OFFER_ID), callback); } if (clusterId != null) { - shoppingService.unsubscribe( - new CommerceSubscription(SubscriptionType.PRICE_TRACK, - IdentifierType.PRODUCT_CLUSTER_ID, clusterId, - ManagementType.USER_MANAGED, null), + subscriptionsManager.unsubscribe( + new CommerceSubscription(CommerceSubscriptionType.PRICE_TRACK, + clusterId, SubscriptionManagementType.USER_MANAGED, + TrackingIdType.PRODUCT_CLUSTER_ID), callback); } };
diff --git a/chrome/browser/commerce/price_tracking/android/javatests/src/org/chromium/chrome/browser/price_tracking/PriceDropNotificationManagerTest.java b/chrome/browser/commerce/price_tracking/android/javatests/src/org/chromium/chrome/browser/price_tracking/PriceDropNotificationManagerTest.java index 01c45f0..4c8e133e 100644 --- a/chrome/browser/commerce/price_tracking/android/javatests/src/org/chromium/chrome/browser/price_tracking/PriceDropNotificationManagerTest.java +++ b/chrome/browser/commerce/price_tracking/android/javatests/src/org/chromium/chrome/browser/price_tracking/PriceDropNotificationManagerTest.java
@@ -10,6 +10,8 @@ import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -30,8 +32,6 @@ import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; -import org.mockito.ArgumentCaptor; -import org.mockito.Captor; import org.mockito.Mock; import org.mockito.junit.MockitoJUnit; import org.mockito.junit.MockitoRule; @@ -42,23 +42,24 @@ import org.chromium.base.test.util.CommandLineFlags; import org.chromium.chrome.browser.bookmarks.BookmarkModel; import org.chromium.chrome.browser.browserservices.intents.WebappConstants; -import org.chromium.chrome.browser.commerce.ShoppingServiceFactory; import org.chromium.chrome.browser.flags.ChromeFeatureList; import org.chromium.chrome.browser.flags.ChromeSwitches; import org.chromium.chrome.browser.notifications.NotificationUmaTracker.SystemNotificationType; import org.chromium.chrome.browser.notifications.channels.ChromeChannelDefinitions; import org.chromium.chrome.browser.preferences.SharedPreferencesManager; import org.chromium.chrome.browser.price_tracking.PriceDropNotificationManagerImpl.DismissNotificationChromeActivity; -import org.chromium.chrome.browser.profiles.Profile; +import org.chromium.chrome.browser.subscriptions.CommerceSubscription; +import org.chromium.chrome.browser.subscriptions.CommerceSubscription.CommerceSubscriptionType; +import org.chromium.chrome.browser.subscriptions.CommerceSubscription.SubscriptionManagementType; +import org.chromium.chrome.browser.subscriptions.CommerceSubscription.TrackingIdType; +import org.chromium.chrome.browser.subscriptions.CommerceSubscriptionsService; +import org.chromium.chrome.browser.subscriptions.CommerceSubscriptionsServiceFactory; +import org.chromium.chrome.browser.subscriptions.SubscriptionsManagerImpl; import org.chromium.chrome.test.ChromeJUnit4ClassRunner; import org.chromium.chrome.test.ChromeTabbedActivityTestRule; import org.chromium.chrome.test.batch.BlankCTATabInitialStateRule; import org.chromium.chrome.test.util.browser.Features; import org.chromium.components.browser_ui.notifications.MockNotificationManagerProxy; -import org.chromium.components.commerce.core.CommerceSubscription; -import org.chromium.components.commerce.core.IdentifierType; -import org.chromium.components.commerce.core.ManagementType; -import org.chromium.components.commerce.core.ShoppingService; /** * Tests for {@link PriceDropNotificationManager}. @@ -98,13 +99,13 @@ new BlankCTATabInitialStateRule(sActivityTestRule, false); @Mock - private ShoppingService mMockShoppingService; + private CommerceSubscriptionsService mMockSubscriptionsService; + + @Mock + private SubscriptionsManagerImpl mMockSubscriptionsManager; + @Mock private BookmarkModel mMockBookmarkModel; - @Mock - private Profile mMockProfile; - @Captor - private ArgumentCaptor<CommerceSubscription> mSubscriptionCaptor; @Before public void setUp() { @@ -113,8 +114,6 @@ mPriceDropNotificationManager = PriceDropNotificationManagerFactory.create(); when(mMockBookmarkModel.isBookmarkModelLoaded()).thenReturn(true); PriceDropNotificationManagerImpl.setBookmarkModelForTesting(mMockBookmarkModel); - ShoppingServiceFactory.setShoppingServiceForTesting(mMockShoppingService); - Profile.setLastUsedProfileForTesting(mMockProfile); } @After @@ -263,20 +262,26 @@ @Test @MediumTest public void testOnNotificationActionClicked_TurnOffAlert() { + doReturn(mMockSubscriptionsManager) + .when(mMockSubscriptionsService) + .getSubscriptionsManager(); + CommerceSubscriptionsServiceFactory.setSubscriptionsServiceForTesting( + mMockSubscriptionsService); + String offerId = "offer_id"; + CommerceSubscription commerceSubscription = + new CommerceSubscription(CommerceSubscriptionType.PRICE_TRACK, offerId, + SubscriptionManagementType.CHROME_MANAGED, TrackingIdType.OFFER_ID); mPriceDropNotificationManager.onNotificationActionClicked( ACTION_ID_TURN_OFF_ALERT, TEST_URL, null, null, false); - verify(mMockShoppingService, times(0)).unsubscribe(any(), any(Callback.class)); + verify(mMockSubscriptionsManager, times(0)) + .unsubscribe(eq(commerceSubscription), any(Callback.class)); mPriceDropNotificationManager.onNotificationActionClicked( ACTION_ID_TURN_OFF_ALERT, TEST_URL, offerId, null, false); - verify(mMockShoppingService, times(1)) - .unsubscribe(mSubscriptionCaptor.capture(), any(Callback.class)); - assertEquals(IdentifierType.OFFER_ID, mSubscriptionCaptor.getValue().idType); - assertEquals(offerId, mSubscriptionCaptor.getValue().id); - assertEquals(ManagementType.CHROME_MANAGED, mSubscriptionCaptor.getValue().managementType); - assertEquals(null, mSubscriptionCaptor.getValue().userSeenOffer); + verify(mMockSubscriptionsManager, times(1)) + .unsubscribe(eq(commerceSubscription), any(Callback.class)); } @Test
diff --git a/chrome/browser/commerce/subscriptions/BUILD.gn b/chrome/browser/commerce/subscriptions/BUILD.gn new file mode 100644 index 0000000..a20ccd2 --- /dev/null +++ b/chrome/browser/commerce/subscriptions/BUILD.gn
@@ -0,0 +1,25 @@ +# Copyright 2021 The Chromium Authors +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +import("//testing/test.gni") +import("//third_party/protobuf/proto_library.gni") + +source_set("commerce_subscription_db") { + sources = [ + "commerce_subscription_db.cc", + "commerce_subscription_db.h", + ] + + deps = [ + "//base:base", + "//chrome/browser/commerce/subscriptions/android:jni_headers", + "//chrome/browser/persisted_state_db:persisted_state_db", + "//components/commerce/core:commerce_subscription_db_content_proto", + "//components/commerce/core:persisted_state_db_content_proto", + "//components/keyed_service/content", + "//components/leveldb_proto", + "//content/public/browser:browser", + "//third_party/leveldatabase", + ] +}
diff --git a/chrome/browser/commerce/subscriptions/android/BUILD.gn b/chrome/browser/commerce/subscriptions/android/BUILD.gn index a7e5931c..c89c056 100644 --- a/chrome/browser/commerce/subscriptions/android/BUILD.gn +++ b/chrome/browser/commerce/subscriptions/android/BUILD.gn
@@ -4,11 +4,25 @@ import("//build/config/android/rules.gni") +generate_jni("jni_headers") { + sources = [ + "java/src/org/chromium/chrome/browser/subscriptions/CommerceSubscription.java", + "java/src/org/chromium/chrome/browser/subscriptions/CommerceSubscriptionsStorage.java", + ] +} + android_library("subscriptions_java") { sources = [ + "java/src/org/chromium/chrome/browser/subscriptions/CommerceSubscription.java", + "java/src/org/chromium/chrome/browser/subscriptions/CommerceSubscriptionJsonSerializer.java", + "java/src/org/chromium/chrome/browser/subscriptions/CommerceSubscriptionsMetrics.java", "java/src/org/chromium/chrome/browser/subscriptions/CommerceSubscriptionsService.java", "java/src/org/chromium/chrome/browser/subscriptions/CommerceSubscriptionsServiceConfig.java", + "java/src/org/chromium/chrome/browser/subscriptions/CommerceSubscriptionsServiceProxy.java", + "java/src/org/chromium/chrome/browser/subscriptions/CommerceSubscriptionsStorage.java", "java/src/org/chromium/chrome/browser/subscriptions/ImplicitPriceDropSubscriptionsManager.java", + "java/src/org/chromium/chrome/browser/subscriptions/SubscriptionsManager.java", + "java/src/org/chromium/chrome/browser/subscriptions/SubscriptionsManagerImpl.java", ] deps = [ @@ -24,7 +38,6 @@ "//chrome/browser/signin/services/android:java", "//chrome/browser/tab:java", "//chrome/browser/tabmodel:java", - "//components/commerce/core/android:core_java", "//components/prefs/android:java", "//components/signin/public/android:java", "//components/user_prefs/android:java",
diff --git a/chrome/browser/commerce/subscriptions/android/java/src/org/chromium/chrome/browser/subscriptions/CommerceSubscription.java b/chrome/browser/commerce/subscriptions/android/java/src/org/chromium/chrome/browser/subscriptions/CommerceSubscription.java new file mode 100644 index 0000000..3608dd1 --- /dev/null +++ b/chrome/browser/commerce/subscriptions/android/java/src/org/chromium/chrome/browser/subscriptions/CommerceSubscription.java
@@ -0,0 +1,171 @@ +// Copyright 2021 The Chromium Authors +// 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.subscriptions; + +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.annotation.StringDef; + +import org.chromium.base.annotations.CalledByNative; + +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.util.ArrayList; +import java.util.List; + +/** + * Represents the information for one commerce subscription entry. + * + * To add a new SubscriptionType / ManagementType / TrackingIdType: + * 1. Add the type in this class. + * 2. Add the corresponding entry in {@link commerce_subscription_db_content.proto} to ensure the + * storage works correctly. + */ +public class CommerceSubscription { + @StringDef({CommerceSubscriptionType.TYPE_UNSPECIFIED, CommerceSubscriptionType.PRICE_TRACK}) + @Retention(RetentionPolicy.SOURCE) + public @interface CommerceSubscriptionType { + String TYPE_UNSPECIFIED = "TYPE_UNSPECIFIED"; + String PRICE_TRACK = "PRICE_TRACK"; + } + + @StringDef({SubscriptionManagementType.TYPE_UNSPECIFIED, + SubscriptionManagementType.CHROME_MANAGED, SubscriptionManagementType.USER_MANAGED}) + @Retention(RetentionPolicy.SOURCE) + public @interface SubscriptionManagementType { + String TYPE_UNSPECIFIED = "TYPE_UNSPECIFIED"; + String CHROME_MANAGED = "CHROME_MANAGED"; + String USER_MANAGED = "USER_MANAGED"; + } + + @StringDef({TrackingIdType.IDENTIFIER_TYPE_UNSPECIFIED, TrackingIdType.OFFER_ID, + TrackingIdType.PRODUCT_CLUSTER_ID}) + @Retention(RetentionPolicy.SOURCE) + public @interface TrackingIdType { + String IDENTIFIER_TYPE_UNSPECIFIED = "IDENTIFIER_TYPE_UNSPECIFIED"; + String OFFER_ID = "OFFER_ID"; + String PRODUCT_CLUSTER_ID = "PRODUCT_CLUSTER_ID"; + } + + /** The price track offer data specific to price track subscriptions. */ + public static class PriceTrackableOffer { + public PriceTrackableOffer(@Nullable String offerId, @Nullable String currentPrice, + @Nullable String countryCode) { + this.offerId = offerId; + this.currentPrice = currentPrice; + this.countryCode = countryCode; + } + /** Associated offer id */ + public final String offerId; + /** Current price upon subscribing */ + public final String currentPrice; + /** Country code of the offer */ + public final String countryCode; + } + + public static final long UNSAVED_SUBSCRIPTION = -1L; + + private final long mTimestamp; + @NonNull + private final @CommerceSubscriptionType String mType; + @NonNull + private final String mTrackingId; + @NonNull + private final @SubscriptionManagementType String mManagementType; + @NonNull + private final @TrackingIdType String mTrackingIdType; + @Nullable + private final PriceTrackableOffer mSeenOffer; + + // TODO(crbug.com/1311754): Clean up this api. + @Deprecated + public CommerceSubscription(@NonNull @CommerceSubscriptionType String type, + @NonNull String trackingId, @NonNull @SubscriptionManagementType String managementType, + @NonNull @TrackingIdType String trackingIdType) { + this(type, trackingId, managementType, trackingIdType, UNSAVED_SUBSCRIPTION); + } + + @CalledByNative + CommerceSubscription(@NonNull @CommerceSubscriptionType String type, @NonNull String trackingId, + @NonNull @SubscriptionManagementType String managementType, + @NonNull @TrackingIdType String trackingIdType, long timestamp) { + this(type, trackingId, managementType, trackingIdType, timestamp, null); + } + + public CommerceSubscription(@NonNull @CommerceSubscriptionType String type, + @NonNull String trackingId, @NonNull @SubscriptionManagementType String managementType, + @NonNull @TrackingIdType String trackingIdType, + @Nullable PriceTrackableOffer seenOffer) { + this(type, trackingId, managementType, trackingIdType, UNSAVED_SUBSCRIPTION, seenOffer); + } + + private CommerceSubscription(@NonNull @CommerceSubscriptionType String type, + @NonNull String trackingId, @NonNull @SubscriptionManagementType String managementType, + @NonNull @TrackingIdType String trackingIdType, long timestamp, + @Nullable PriceTrackableOffer seenOffer) { + mTrackingId = trackingId; + mType = type; + mManagementType = managementType; + mTrackingIdType = trackingIdType; + mTimestamp = timestamp; + mSeenOffer = seenOffer; + } + + long getTimestamp() { + return mTimestamp; + } + + @CommerceSubscriptionType + String getType() { + return mType; + } + + @TrackingIdType + public String getTrackingIdType() { + return mTrackingIdType; + } + + public String getTrackingId() { + return mTrackingId; + } + + @SubscriptionManagementType + public String getManagementType() { + return mManagementType; + } + + public PriceTrackableOffer getSeenOffer() { + return mSeenOffer; + } + + @CalledByNative + static List<CommerceSubscription> createSubscriptionList() { + return new ArrayList<>(); + } + + @CalledByNative + static CommerceSubscription createSubscriptionAndAddToList(List<CommerceSubscription> list, + @NonNull @CommerceSubscriptionType String type, @NonNull String trackingId, + @NonNull @SubscriptionManagementType String managementType, + @NonNull @TrackingIdType String trackingIdType, long timestamp) { + CommerceSubscription subscription = new CommerceSubscription( + type, trackingId, managementType, trackingIdType, timestamp); + list.add(subscription); + return subscription; + } + + @Override + public boolean equals(Object other) { + if (!(other instanceof CommerceSubscription)) { + return false; + } + CommerceSubscription otherSubscription = (CommerceSubscription) other; + return mManagementType.equals(otherSubscription.getManagementType()) + && mType.equals(otherSubscription.getType()) + && mTrackingId.equals(otherSubscription.getTrackingId()) + && mTrackingIdType.equals(otherSubscription.getTrackingIdType()) + && mTimestamp == otherSubscription.getTimestamp(); + } +}
diff --git a/chrome/browser/commerce/subscriptions/android/java/src/org/chromium/chrome/browser/subscriptions/CommerceSubscriptionJsonSerializer.java b/chrome/browser/commerce/subscriptions/android/java/src/org/chromium/chrome/browser/subscriptions/CommerceSubscriptionJsonSerializer.java new file mode 100644 index 0000000..4ba9d3f --- /dev/null +++ b/chrome/browser/commerce/subscriptions/android/java/src/org/chromium/chrome/browser/subscriptions/CommerceSubscriptionJsonSerializer.java
@@ -0,0 +1,79 @@ +// Copyright 2021 The Chromium Authors +// 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.subscriptions; + +import org.json.JSONException; +import org.json.JSONObject; + +import org.chromium.base.Log; +import org.chromium.chrome.browser.subscriptions.CommerceSubscription.PriceTrackableOffer; + +import java.util.Locale; + +/** + * Helpers for serializing and deserializing {@link CommerceSubscription} objects. + */ +class CommerceSubscriptionJsonSerializer { + private static final String TAG = "CSJS"; + private static final String SUBSCRIPTION_TYPE_KEY = "type"; + private static final String SUBSCRIPTION_IDENTIFIER_KEY = "identifier"; + private static final String SUBSCRIPTION_IDENTIFIER_TYPE_KEY = "identifierType"; + private static final String SUBSCRIPTION_MANAGEMENT_TYPE_KEY = "managementType"; + private static final String SUBSCRIPTION_TIMESTAMP_KEY = "eventTimestampMicros"; + private static final String SUBSCRIPTION_SEEN_OFFER_KEY = "userSeenOffer"; + private static final String SEEN_OFFER_ID_KEY = "offerId"; + private static final String SEEN_OFFER_PRICE_KEY = "seenPriceMicros"; + private static final String SEEN_OFFER_COUNTRY_KEY = "countryCode"; + + /** Creates a {@link CommerceSubscription} from a {@link JSONObject}. */ + public static CommerceSubscription deserialize(JSONObject json) { + try { + return new CommerceSubscription(json.getString(SUBSCRIPTION_TYPE_KEY), + json.getString(SUBSCRIPTION_IDENTIFIER_KEY), + json.getString(SUBSCRIPTION_MANAGEMENT_TYPE_KEY), + json.getString(SUBSCRIPTION_IDENTIFIER_TYPE_KEY), + Long.parseLong(json.getString(SUBSCRIPTION_TIMESTAMP_KEY))); + + } catch (JSONException e) { + Log.e(TAG, + String.format(Locale.US, + "Failed to deserialize CommerceSubscription. Details: %s", + e.getMessage())); + } + return null; + } + + /** Creates a {@link JSONObject}from a {@link CommerceSubscription}. */ + public static JSONObject serialize(CommerceSubscription subscription) { + try { + JSONObject subscriptionJson = new JSONObject(); + subscriptionJson.put(SUBSCRIPTION_TYPE_KEY, subscription.getType()); + subscriptionJson.put( + SUBSCRIPTION_MANAGEMENT_TYPE_KEY, subscription.getManagementType()); + subscriptionJson.put( + SUBSCRIPTION_IDENTIFIER_TYPE_KEY, subscription.getTrackingIdType()); + subscriptionJson.put(SUBSCRIPTION_IDENTIFIER_KEY, subscription.getTrackingId()); + + PriceTrackableOffer seenOffer = subscription.getSeenOffer(); + if (CommerceSubscriptionsServiceConfig.shouldParseSeenOfferToServer() + && seenOffer != null) { + JSONObject seenOfferJson = new JSONObject(); + seenOfferJson.put(SEEN_OFFER_ID_KEY, seenOffer.offerId); + seenOfferJson.put(SEEN_OFFER_PRICE_KEY, seenOffer.currentPrice); + seenOfferJson.put(SEEN_OFFER_COUNTRY_KEY, seenOffer.countryCode); + subscriptionJson.put(SUBSCRIPTION_SEEN_OFFER_KEY, seenOfferJson); + } + + return subscriptionJson; + } catch (JSONException e) { + Log.e(TAG, + String.format(Locale.US, + "Failed to serialize CommerceSubscription. Details: %s", + e.getMessage())); + } + + return null; + } +}
diff --git a/chrome/browser/commerce/subscriptions/android/java/src/org/chromium/chrome/browser/subscriptions/CommerceSubscriptionsMetrics.java b/chrome/browser/commerce/subscriptions/android/java/src/org/chromium/chrome/browser/subscriptions/CommerceSubscriptionsMetrics.java new file mode 100644 index 0000000..6494924c --- /dev/null +++ b/chrome/browser/commerce/subscriptions/android/java/src/org/chromium/chrome/browser/subscriptions/CommerceSubscriptionsMetrics.java
@@ -0,0 +1,103 @@ +// Copyright 2022 The Chromium Authors +// 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.subscriptions; + +import androidx.annotation.IntDef; +import androidx.annotation.VisibleForTesting; + +import org.chromium.base.metrics.RecordHistogram; +import org.chromium.chrome.browser.preferences.Pref; +import org.chromium.chrome.browser.profiles.Profile; +import org.chromium.chrome.browser.signin.services.IdentityServicesProvider; +import org.chromium.chrome.browser.subscriptions.CommerceSubscription.SubscriptionManagementType; +import org.chromium.components.prefs.PrefService; +import org.chromium.components.signin.identitymanager.ConsentLevel; +import org.chromium.components.user_prefs.UserPrefs; + +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.util.List; + +/** + * Commerce Subscriptions Metrics. + */ +public class CommerceSubscriptionsMetrics { + @VisibleForTesting + public static final String SUBSCRIPTION_CHROME_MANAGED_COUNT_HISTOGRAM = + "Commerce.Subscriptions.ChromeManaged.Count"; + @VisibleForTesting + public static final String SUBSCRIPTION_USER_MANAGED_COUNT_HISTOGRAM = + "Commerce.Subscriptions.UserManaged.Count"; + @VisibleForTesting + public static final String ACCOUNT_WAA_STATUS_HISTOGRAM = "Commerce.SignIn.AccountWaaStatus"; + + /** + * The account web and app activity enabled status. + * + * Needs to stay in sync with AccountWaaStatusForCommerce in enums.xml. These values are + * persisted to logs. Entries should not be renumbered and numeric values should never be + * reused. + */ + @IntDef({AccountWaaStatus.SIGN_OUT, AccountWaaStatus.SIGN_IN_WAA_DISABLED, + AccountWaaStatus.SIGN_IN_WAA_ENABLED, AccountWaaStatus.NUM_ENTRIES}) + @Retention(RetentionPolicy.SOURCE) + public @interface AccountWaaStatus { + int SIGN_OUT = 0; + int SIGN_IN_WAA_DISABLED = 1; + int SIGN_IN_WAA_ENABLED = 2; + + // Must be the last one. + int NUM_ENTRIES = 3; + } + + /** + * Record the number of subscriptions per management type. + */ + void recordSubscriptionCounts(List<CommerceSubscription> subscriptions) { + int chromeManaged = 0; + int userManaged = 0; + for (CommerceSubscription subscription : subscriptions) { + @SubscriptionManagementType + String type = subscription.getManagementType(); + if (SubscriptionManagementType.CHROME_MANAGED.equals(type)) { + chromeManaged++; + } else if (SubscriptionManagementType.USER_MANAGED.equals(type)) { + userManaged++; + } + } + RecordHistogram.recordCount1000Histogram( + SUBSCRIPTION_CHROME_MANAGED_COUNT_HISTOGRAM, chromeManaged); + RecordHistogram.recordCount1000Histogram( + SUBSCRIPTION_USER_MANAGED_COUNT_HISTOGRAM, userManaged); + } + + void recordAccountWaaStatus() { + RecordHistogram.recordEnumeratedHistogram( + ACCOUNT_WAA_STATUS_HISTOGRAM, getAccountWaaStatus(), AccountWaaStatus.NUM_ENTRIES); + } + + @AccountWaaStatus + private int getAccountWaaStatus() { + if (!isSignedIn()) { + return AccountWaaStatus.SIGN_OUT; + } else if (isWebAndAppActivityEnabled()) { + return AccountWaaStatus.SIGN_IN_WAA_ENABLED; + } else { + return AccountWaaStatus.SIGN_IN_WAA_DISABLED; + } + } + + private boolean isSignedIn() { + return IdentityServicesProvider.get() + .getIdentityManager(Profile.getLastUsedRegularProfile()) + .hasPrimaryAccount(ConsentLevel.SYNC); + } + + private boolean isWebAndAppActivityEnabled() { + PrefService prefService = UserPrefs.get(Profile.getLastUsedRegularProfile()); + return prefService != null + && prefService.getBoolean(Pref.WEB_AND_APP_ACTIVITY_ENABLED_FOR_SHOPPING); + } +}
diff --git a/chrome/browser/commerce/subscriptions/android/java/src/org/chromium/chrome/browser/subscriptions/CommerceSubscriptionsService.java b/chrome/browser/commerce/subscriptions/android/java/src/org/chromium/chrome/browser/subscriptions/CommerceSubscriptionsService.java index dd1edf18..b0e750f6 100644 --- a/chrome/browser/commerce/subscriptions/android/java/src/org/chromium/chrome/browser/subscriptions/CommerceSubscriptionsService.java +++ b/chrome/browser/commerce/subscriptions/android/java/src/org/chromium/chrome/browser/subscriptions/CommerceSubscriptionsService.java
@@ -12,37 +12,47 @@ import org.chromium.chrome.browser.preferences.SharedPreferencesManager; import org.chromium.chrome.browser.price_tracking.PriceDropNotificationManager; import org.chromium.chrome.browser.price_tracking.PriceTrackingFeatures; +import org.chromium.chrome.browser.subscriptions.CommerceSubscription.CommerceSubscriptionType; import org.chromium.chrome.browser.tabmodel.TabModelSelector; -import org.chromium.components.commerce.core.ShoppingService; +import org.chromium.components.signin.identitymanager.IdentityManager; +import org.chromium.components.signin.identitymanager.PrimaryAccountChangeEvent; import java.util.concurrent.TimeUnit; /** * Commerce Subscriptions Service. - * TODO(crbug.com/1382191): This service is now only used to manage implicit tracking and to record - * notification metrics, both of which are Android-specific. The - * ImplicitPriceDropSubscriptionsManager should be profile-independent and we should decouple - * subscriptions and notifications. Some logic here like observing Android activity lifecycle can be - * moved to ShoppingServiceFactory. */ public class CommerceSubscriptionsService { @VisibleForTesting public static final String CHROME_MANAGED_SUBSCRIPTIONS_TIMESTAMP = ChromePreferenceKeys.COMMERCE_SUBSCRIPTIONS_CHROME_MANAGED_TIMESTAMP; + private final SubscriptionsManagerImpl mSubscriptionManager; + private final IdentityManager mIdentityManager; + private final IdentityManager.Observer mIdentityManagerObserver; private final SharedPreferencesManager mSharedPreferencesManager; private final PriceDropNotificationManager mPriceDropNotificationManager; + private final CommerceSubscriptionsMetrics mMetrics; private ImplicitPriceDropSubscriptionsManager mImplicitPriceDropSubscriptionsManager; private ActivityLifecycleDispatcher mActivityLifecycleDispatcher; private PauseResumeWithNativeObserver mPauseResumeWithNativeObserver; - private ShoppingService mShoppingService; /** Creates a new instance. */ - CommerceSubscriptionsService(ShoppingService shoppingService, + CommerceSubscriptionsService(SubscriptionsManagerImpl subscriptionsManager, + IdentityManager identityManager, PriceDropNotificationManager priceDropNotificationManager) { - mShoppingService = shoppingService; + mSubscriptionManager = subscriptionsManager; + mIdentityManager = identityManager; + mIdentityManagerObserver = new IdentityManager.Observer() { + @Override + public void onPrimaryAccountChanged(PrimaryAccountChangeEvent eventDetails) { + mSubscriptionManager.onIdentityChanged(); + } + }; + mIdentityManager.addObserver(mIdentityManagerObserver); mSharedPreferencesManager = SharedPreferencesManager.getInstance(); mPriceDropNotificationManager = priceDropNotificationManager; + mMetrics = new CommerceSubscriptionsMetrics(); } /** Performs any deferred startup tasks required by {@link Subscriptions}. */ @@ -62,15 +72,21 @@ if (CommerceSubscriptionsServiceConfig.isImplicitSubscriptionsEnabled() && mImplicitPriceDropSubscriptionsManager == null) { - mImplicitPriceDropSubscriptionsManager = - new ImplicitPriceDropSubscriptionsManager(tabModelSelector, mShoppingService); + mImplicitPriceDropSubscriptionsManager = new ImplicitPriceDropSubscriptionsManager( + tabModelSelector, mSubscriptionManager); } } + /** Returns the subscriptionsManager. */ + public SubscriptionsManagerImpl getSubscriptionsManager() { + return mSubscriptionManager; + } + /** * Cleans up internal resources. Currently this method calls SubscriptionsManagerImpl#destroy. */ public void destroy() { + mIdentityManager.removeObserver(mIdentityManagerObserver); if (mActivityLifecycleDispatcher != null) { mActivityLifecycleDispatcher.unregister(mPauseResumeWithNativeObserver); } @@ -90,6 +106,7 @@ } mSharedPreferencesManager.writeLong( CHROME_MANAGED_SUBSCRIPTIONS_TIMESTAMP, System.currentTimeMillis()); + mMetrics.recordAccountWaaStatus(); if (!PriceTrackingFeatures.isPriceDropNotificationEligible()) return; recordMetricsForEligibleAccount(); if (mImplicitPriceDropSubscriptionsManager != null) { @@ -101,6 +118,8 @@ // Record notification opt-in metrics. mPriceDropNotificationManager.canPostNotificationWithMetricsRecorded(); mPriceDropNotificationManager.recordMetricsForNotificationCounts(); + mSubscriptionManager.getSubscriptions( + CommerceSubscriptionType.PRICE_TRACK, false, mMetrics::recordSubscriptionCounts); } @VisibleForTesting
diff --git a/chrome/browser/commerce/subscriptions/android/java/src/org/chromium/chrome/browser/subscriptions/CommerceSubscriptionsServiceConfig.java b/chrome/browser/commerce/subscriptions/android/java/src/org/chromium/chrome/browser/subscriptions/CommerceSubscriptionsServiceConfig.java index 5b99d73a..870ebac 100644 --- a/chrome/browser/commerce/subscriptions/android/java/src/org/chromium/chrome/browser/subscriptions/CommerceSubscriptionsServiceConfig.java +++ b/chrome/browser/commerce/subscriptions/android/java/src/org/chromium/chrome/browser/subscriptions/CommerceSubscriptionsServiceConfig.java
@@ -4,15 +4,22 @@ package org.chromium.chrome.browser.subscriptions; +import android.text.TextUtils; + import androidx.annotation.VisibleForTesting; import org.chromium.base.FeatureList; import org.chromium.chrome.browser.flags.ChromeFeatureList; import java.util.concurrent.TimeUnit; - /** Flag configuration for Commerce Subscriptions Service. */ public class CommerceSubscriptionsServiceConfig { + private static final String sServiceBaseUrl = + "https://memex-pa.googleapis.com/v1/shopping/subscriptions"; + + @VisibleForTesting + private static final String sBaseUrlParam = "subscriptions_service_base_url"; + @VisibleForTesting private static final String STALE_TAB_LOWER_BOUND_SECONDS_PARAM = "price_tracking_stale_tab_lower_bound_seconds"; @@ -21,8 +28,21 @@ public static final String IMPLICIT_SUBSCRIPTIONS_ENABLED_PARAM = "implicit_subscriptions_enabled"; + private static final String PARSE_SEEN_OFFER_TO_SERVER_PARAM = + "price_tracking_parse_seen_offer_to_server"; + private static final int DEFAULT_STALE_TAB_LOWER_BOUND_DAYS = 1; + public static String getDefaultServiceUrl() { + String defaultValue = sServiceBaseUrl; + if (FeatureList.isInitialized()) { + defaultValue = ChromeFeatureList.getFieldTrialParamByFeature( + ChromeFeatureList.COMMERCE_PRICE_TRACKING, sBaseUrlParam); + } + + return TextUtils.isEmpty(defaultValue) ? sServiceBaseUrl : defaultValue; + } + public static int getStaleTabLowerBoundSeconds() { int defaultValue = (int) TimeUnit.DAYS.toSeconds(DEFAULT_STALE_TAB_LOWER_BOUND_DAYS); if (FeatureList.isInitialized()) { @@ -41,4 +61,13 @@ } return false; } + + public static boolean shouldParseSeenOfferToServer() { + if (FeatureList.isInitialized()) { + return ChromeFeatureList.getFieldTrialParamByFeatureAsBoolean( + ChromeFeatureList.COMMERCE_PRICE_TRACKING, PARSE_SEEN_OFFER_TO_SERVER_PARAM, + true); + } + return true; + } }
diff --git a/chrome/browser/commerce/subscriptions/android/java/src/org/chromium/chrome/browser/subscriptions/CommerceSubscriptionsServiceFactory.java b/chrome/browser/commerce/subscriptions/android/java/src/org/chromium/chrome/browser/subscriptions/CommerceSubscriptionsServiceFactory.java index cf59608..3fc2d89 100644 --- a/chrome/browser/commerce/subscriptions/android/java/src/org/chromium/chrome/browser/subscriptions/CommerceSubscriptionsServiceFactory.java +++ b/chrome/browser/commerce/subscriptions/android/java/src/org/chromium/chrome/browser/subscriptions/CommerceSubscriptionsServiceFactory.java
@@ -6,11 +6,11 @@ import androidx.annotation.VisibleForTesting; -import org.chromium.chrome.browser.commerce.ShoppingServiceFactory; import org.chromium.chrome.browser.price_tracking.PriceDropNotificationManager; import org.chromium.chrome.browser.price_tracking.PriceDropNotificationManagerFactory; import org.chromium.chrome.browser.profiles.Profile; import org.chromium.chrome.browser.profiles.ProfileManager; +import org.chromium.chrome.browser.signin.services.IdentityServicesProvider; import java.util.HashMap; import java.util.Map; @@ -67,7 +67,9 @@ PriceDropNotificationManager priceDropNotificationManager = PriceDropNotificationManagerFactory.create(); service = new CommerceSubscriptionsService( - ShoppingServiceFactory.getForProfile(profile), priceDropNotificationManager); + new SubscriptionsManagerImpl(profile, priceDropNotificationManager), + IdentityServicesProvider.get().getIdentityManager(profile), + priceDropNotificationManager); sProfileToSubscriptionsService.put(profile, service); } return service;
diff --git a/chrome/browser/commerce/subscriptions/android/java/src/org/chromium/chrome/browser/subscriptions/CommerceSubscriptionsServiceProxy.java b/chrome/browser/commerce/subscriptions/android/java/src/org/chromium/chrome/browser/subscriptions/CommerceSubscriptionsServiceProxy.java new file mode 100644 index 0000000..4d5f3a6 --- /dev/null +++ b/chrome/browser/commerce/subscriptions/android/java/src/org/chromium/chrome/browser/subscriptions/CommerceSubscriptionsServiceProxy.java
@@ -0,0 +1,244 @@ +// Copyright 2021 The Chromium Authors +// 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.subscriptions; + +import org.json.JSONArray; +import org.json.JSONException; +import org.json.JSONObject; + +import org.chromium.base.Callback; +import org.chromium.base.Log; +import org.chromium.chrome.browser.endpoint_fetcher.EndpointFetcher; +import org.chromium.chrome.browser.preferences.Pref; +import org.chromium.chrome.browser.profiles.Profile; +import org.chromium.components.prefs.PrefService; +import org.chromium.components.user_prefs.UserPrefs; +import org.chromium.net.NetworkTrafficAnnotationTag; + +import java.util.ArrayList; +import java.util.List; +import java.util.Locale; +/** + * Wrapper around CommerceSubscriptions Web APIs. + */ +public class CommerceSubscriptionsServiceProxy { + private static final String TAG = "CSSP"; + private static final long HTTPS_REQUEST_TIMEOUT_MS = 1000L; + private static final String GET_HTTPS_METHOD = "GET"; + private static final String POST_HTTPS_METHOD = "POST"; + private static final String CONTENT_TYPE = "application/json; charset=UTF-8"; + private static final String EMPTY_POST_DATA = ""; + private static final String[] OAUTH_SCOPE = + new String[] {"https://www.googleapis.com/auth/chromememex"}; + private static final String OAUTH_NAME = "susbcriptions_svc"; + private static final String STATUS_KEY = "status"; + private static final String STATUS_CODE_KEY = "code"; + private static final String REMOVE_SUBSCRIPTIONS_REQUEST_PARAMS_KEY = + "removeShoppingSubscriptionsParams"; + private static final String CREATE_SUBSCRIPTIONS_REQUEST_PARAMS_KEY = + "createShoppingSubscriptionsParams"; + private static final String EVENT_TIMESTAMP_MICROS_KEY = "eventTimestampMicros"; + private static final String SUBSCRIPTIONS_KEY = "subscriptions"; + private static final String GET_SUBSCRIPTIONS_QUERY_PARAMS_TEMPLATE = + "?requestParams.subscriptionType=%s"; + private static final int BACKEND_CANONICAL_CODE_SUCCESS = 0; + + // TODO(crbug.com/1311754): These parameters (url, OAUTH_SCOPE, etc.) are copied from + // web_history_service.cc directly, it works now but we should figure out a better way to + // keep these parameters in sync. + private static final String WAA_QUERY_URL = + "https://history.google.com/history/api/lookup?client=web_app"; + private static final String[] WAA_OAUTH_SCOPE = + new String[] {"https://www.googleapis.com/auth/chromesync"}; + private static final String WAA_RESPONSE_KEY = "history_recording_enabled"; + private static final String WAA_OAUTH_NAME = "web_history"; + + private final Profile mProfile; + + /** + * Creates a new instance. + * @param profile the {@link Profile} to use when making the calls. + */ + public CommerceSubscriptionsServiceProxy(Profile profile) { + mProfile = profile; + } + + /** + * Makes an HTTPS call to the backend in order to create the provided subscriptions. + * @param subscriptions list of {@link CommerceSubscription} to create. + * @param callback indicates whether or not the operation succeeded on the backend. + */ + public void create(List<CommerceSubscription> subscriptions, Callback<Boolean> callback) { + if (subscriptions.isEmpty()) { + callback.onResult(true); + return; + } + + manageSubscriptions(getCreateSubscriptionsRequestParams(subscriptions), callback); + } + + /** + * Makes an HTTPS call to the backend to delete the provided list of subscriptions. + * @param subscriptions list of {@link CommerceSubscription} to delete. + * @param callback indicates whether or not the operation succeeded on the backend. + */ + public void delete(List<CommerceSubscription> subscriptions, Callback<Boolean> callback) { + if (subscriptions.isEmpty()) { + callback.onResult(true); + return; + } + + manageSubscriptions(getRemoveSubscriptionsRequestParams(subscriptions), callback); + } + + /** + * Fetches all subscriptions that match the provided type from the backend. + * @param type the type of subscriptions to fetch. + * @param callback contains the list of subscriptions returned from the server. + */ + public void get(@CommerceSubscription.CommerceSubscriptionType String type, + Callback<List<CommerceSubscription>> callback) { + // TODO(crbug.com/995852): Replace MISSING_TRAFFIC_ANNOTATION with a real traffic + // annotation. + EndpointFetcher.fetchUsingOAuth( + (response) + -> { + callback.onResult(createCommerceSubscriptions(response.getResponseString())); + }, + mProfile, OAUTH_NAME, + CommerceSubscriptionsServiceConfig.getDefaultServiceUrl() + + String.format(GET_SUBSCRIPTIONS_QUERY_PARAMS_TEMPLATE, type), + GET_HTTPS_METHOD, CONTENT_TYPE, OAUTH_SCOPE, EMPTY_POST_DATA, + HTTPS_REQUEST_TIMEOUT_MS, NetworkTrafficAnnotationTag.MISSING_TRAFFIC_ANNOTATION); + } + + void queryAndUpdateWaaEnabled() { + // TODO(crbug.com/1311754): Move the endpoint fetch to components/ and merge this query to + // shopping service. For NetworkTrafficAnnotationTag, we need to replace + // MISSING_TRAFFIC_ANNOTATION with the correct NetworkTrafficAnnotation. + EndpointFetcher.fetchUsingOAuth( + (response) + -> { + try { + JSONObject object = new JSONObject(response.getResponseString()); + boolean isWaaEnabled = object.getBoolean(WAA_RESPONSE_KEY); + PrefService prefService = UserPrefs.get(mProfile); + if (prefService != null) { + prefService.setBoolean( + Pref.WEB_AND_APP_ACTIVITY_ENABLED_FOR_SHOPPING, isWaaEnabled); + } + } catch (JSONException e) { + Log.e(TAG, + String.format(Locale.US, "Failed to get waa status. Details: %s", + e.getMessage())); + } + }, + mProfile, WAA_OAUTH_NAME, WAA_QUERY_URL, GET_HTTPS_METHOD, CONTENT_TYPE, + WAA_OAUTH_SCOPE, EMPTY_POST_DATA, 30000L, + NetworkTrafficAnnotationTag.MISSING_TRAFFIC_ANNOTATION); + } + + private void manageSubscriptions(JSONObject requestPayload, Callback<Boolean> callback) { + // TODO(crbug.com/995852): Replace MISSING_TRAFFIC_ANNOTATION with a real traffic + // annotation. + EndpointFetcher.fetchUsingOAuth( + (response) + -> { + callback.onResult( + didManageSubscriptionCallSucceed(response.getResponseString())); + }, + mProfile, OAUTH_NAME, CommerceSubscriptionsServiceConfig.getDefaultServiceUrl(), + POST_HTTPS_METHOD, CONTENT_TYPE, OAUTH_SCOPE, requestPayload.toString(), + HTTPS_REQUEST_TIMEOUT_MS, NetworkTrafficAnnotationTag.MISSING_TRAFFIC_ANNOTATION); + } + + private boolean didManageSubscriptionCallSucceed(String responseString) { + try { + JSONObject response = new JSONObject(responseString); + JSONObject statusJson = response.getJSONObject(STATUS_KEY); + int statusCode = statusJson.getInt(STATUS_CODE_KEY); + return statusCode == BACKEND_CANONICAL_CODE_SUCCESS; + } catch (JSONException e) { + Log.e(TAG, + String.format(Locale.US, + "Failed to create CreateSubscriptionRequestParams. Details: %s", + e.getMessage())); + } + + return false; + } + + private JSONObject getCreateSubscriptionsRequestParams( + List<CommerceSubscription> subscriptions) { + JSONObject container = new JSONObject(); + JSONArray subscriptionsJsonArray = new JSONArray(); + try { + for (CommerceSubscription subscription : subscriptions) { + subscriptionsJsonArray.put( + CommerceSubscriptionJsonSerializer.serialize(subscription)); + } + + JSONObject subscriptionsObject = new JSONObject(); + subscriptionsObject.put(SUBSCRIPTIONS_KEY, subscriptionsJsonArray); + + container.put(CREATE_SUBSCRIPTIONS_REQUEST_PARAMS_KEY, subscriptionsObject); + } catch (JSONException e) { + Log.e(TAG, + String.format(Locale.US, + "Failed to create CreateSubscriptionRequestParams. Details: %s", + e.getMessage())); + } + + return container; + } + + private JSONObject getRemoveSubscriptionsRequestParams( + List<CommerceSubscription> subscriptions) { + JSONObject container = new JSONObject(); + try { + JSONObject removeSubscriptionsParamsJson = new JSONObject(); + JSONArray subscriptionsTimestamps = new JSONArray(); + for (CommerceSubscription subscription : subscriptions) { + if (subscription.getTimestamp() == CommerceSubscription.UNSAVED_SUBSCRIPTION) { + continue; + } + subscriptionsTimestamps.put(subscription.getTimestamp()); + } + removeSubscriptionsParamsJson.put(EVENT_TIMESTAMP_MICROS_KEY, subscriptionsTimestamps); + container.put(REMOVE_SUBSCRIPTIONS_REQUEST_PARAMS_KEY, removeSubscriptionsParamsJson); + } catch (JSONException e) { + Log.e(TAG, + String.format(Locale.US, + "Failed to create RemoveSubscriptionsRequestParams. Details: %s", + e.getMessage())); + } + + return container; + } + + private List<CommerceSubscription> createCommerceSubscriptions(String responseString) { + List<CommerceSubscription> subscriptions = new ArrayList<>(); + try { + JSONObject response = new JSONObject(responseString); + JSONArray subscriptionsJsonArray = response.getJSONArray(SUBSCRIPTIONS_KEY); + + for (int i = 0; i < subscriptionsJsonArray.length(); i++) { + JSONObject subscriptionJson = subscriptionsJsonArray.getJSONObject(i); + CommerceSubscription subscription = + CommerceSubscriptionJsonSerializer.deserialize(subscriptionJson); + if (subscription != null) { + subscriptions.add(subscription); + } + } + } catch (JSONException e) { + Log.e(TAG, + String.format(Locale.US, + "Failed to deserialize Subscriptions list. Details: %s", + e.getMessage())); + } + + return subscriptions; + } +}
diff --git a/chrome/browser/commerce/subscriptions/android/java/src/org/chromium/chrome/browser/subscriptions/CommerceSubscriptionsStorage.java b/chrome/browser/commerce/subscriptions/android/java/src/org/chromium/chrome/browser/subscriptions/CommerceSubscriptionsStorage.java new file mode 100644 index 0000000..a899c88 --- /dev/null +++ b/chrome/browser/commerce/subscriptions/android/java/src/org/chromium/chrome/browser/subscriptions/CommerceSubscriptionsStorage.java
@@ -0,0 +1,146 @@ +// Copyright 2021 The Chromium Authors +// 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.subscriptions; + +import androidx.annotation.MainThread; +import androidx.annotation.VisibleForTesting; + +import org.chromium.base.Callback; +import org.chromium.base.annotations.CalledByNative; +import org.chromium.base.annotations.NativeMethods; +import org.chromium.chrome.browser.profiles.Profile; +import org.chromium.content_public.browser.BrowserContextHandle; + +import java.util.List; + +/** + * Provides storage for commerce subscription data. + */ +public class CommerceSubscriptionsStorage { + private long mNativeCommerceSubscriptionDB; + + CommerceSubscriptionsStorage(Profile profile) { + assert !profile.isOffTheRecord() + : "CommerceSubscriptionsStorage is not supported for incognito profiles"; + CommerceSubscriptionsStorageJni.get().init(this, profile); + assert mNativeCommerceSubscriptionDB != 0; + } + + /** + * Save one subscription to the database. + * @param subscription The {@link CommerceSubscription} to store. + */ + public void save(CommerceSubscription subscription) { + assert mNativeCommerceSubscriptionDB != 0; + saveWithCallback(subscription, null); + } + + @MainThread + @VisibleForTesting + public void saveWithCallback(CommerceSubscription subscription, Runnable onComplete) { + assert mNativeCommerceSubscriptionDB != 0; + CommerceSubscriptionsStorageJni.get().save(mNativeCommerceSubscriptionDB, + getKey(subscription), subscription.getType(), subscription.getTrackingId(), + subscription.getManagementType(), subscription.getTrackingIdType(), + subscription.getTimestamp(), onComplete); + } + + /** + * Load one subscription from the database. + * @param key The key used to identify a subscription. + * @param callback A callback with loaded result. + */ + public void load(String key, Callback<CommerceSubscription> callback) { + assert mNativeCommerceSubscriptionDB != 0; + CommerceSubscriptionsStorageJni.get().load(mNativeCommerceSubscriptionDB, key, callback); + } + + /** + * Load all subscriptions whose keys have specific prefix. + * @param prefix The prefix used to identify subscriptions. + * @param callback A callback with loaded results. + */ + public void loadWithPrefix(String prefix, Callback<List<CommerceSubscription>> callback) { + assert mNativeCommerceSubscriptionDB != 0; + CommerceSubscriptionsStorageJni.get().loadWithPrefix( + mNativeCommerceSubscriptionDB, prefix, callback); + } + + /** + * Delete one subscription from the database. + * @param subscription The {@link CommerceSubscription} to delete. + */ + public void delete(CommerceSubscription subscription) { + assert mNativeCommerceSubscriptionDB != 0; + CommerceSubscriptionsStorageJni.get().delete( + mNativeCommerceSubscriptionDB, getKey(subscription), null); + } + + @MainThread + @VisibleForTesting + public void deleteForTesting(CommerceSubscription subscription, Runnable onComplete) { + assert mNativeCommerceSubscriptionDB != 0; + CommerceSubscriptionsStorageJni.get().delete( + mNativeCommerceSubscriptionDB, getKey(subscription), onComplete); + } + + /** + * Delete all subscriptions from the database. + */ + public void deleteAll() { + assert mNativeCommerceSubscriptionDB != 0; + CommerceSubscriptionsStorageJni.get().deleteAll(mNativeCommerceSubscriptionDB, null); + } + + @MainThread + @VisibleForTesting + public void deleteAllForTesting(Runnable onComplete) { + assert mNativeCommerceSubscriptionDB != 0; + CommerceSubscriptionsStorageJni.get().deleteAll(mNativeCommerceSubscriptionDB, onComplete); + } + + /** + * Destroy the database. + */ + public void destroy() { + assert mNativeCommerceSubscriptionDB != 0; + CommerceSubscriptionsStorageJni.get().destroy(mNativeCommerceSubscriptionDB); + } + + @CalledByNative + private void setNativePtr(long nativePtr) { + assert nativePtr != 0; + assert mNativeCommerceSubscriptionDB == 0; + mNativeCommerceSubscriptionDB = nativePtr; + } + + @VisibleForTesting + public void setNativeCommerceSubscriptionDBForTesting(long nativeCommerceSubscriptionDB) { + mNativeCommerceSubscriptionDB = nativeCommerceSubscriptionDB; + } + + /** + * Generate the key for a {@link CommerceSubscription} used to store it in database. + * @param subscription The {@link CommerceSubscription} whose key we want to generate. + */ + public static String getKey(CommerceSubscription subscription) { + return String.format("%s_%s_%s", subscription.getType(), subscription.getTrackingIdType(), + subscription.getTrackingId()); + } + + @NativeMethods + interface Natives { + void init(CommerceSubscriptionsStorage caller, BrowserContextHandle handle); + void destroy(long nativeCommerceSubscriptionDB); + void save(long nativeCommerceSubscriptionDB, String key, String type, String trackingId, + String managementType, String trackingIdType, long timestamp, Runnable onComplete); + void load(long nativeCommerceSubscriptionDB, String key, + Callback<CommerceSubscription> callback); + void loadWithPrefix(long nativeCommerceSubscriptionDB, String key, + Callback<List<CommerceSubscription>> callback); + void delete(long nativeCommerceSubscriptionDB, String key, Runnable onComplete); + void deleteAll(long nativeCommerceSubscriptionDB, Runnable onComplete); + } +}
diff --git a/chrome/browser/commerce/subscriptions/android/java/src/org/chromium/chrome/browser/subscriptions/ImplicitPriceDropSubscriptionsManager.java b/chrome/browser/commerce/subscriptions/android/java/src/org/chromium/chrome/browser/subscriptions/ImplicitPriceDropSubscriptionsManager.java index 1e63dd5..9720761a 100644 --- a/chrome/browser/commerce/subscriptions/android/java/src/org/chromium/chrome/browser/subscriptions/ImplicitPriceDropSubscriptionsManager.java +++ b/chrome/browser/commerce/subscriptions/android/java/src/org/chromium/chrome/browser/subscriptions/ImplicitPriceDropSubscriptionsManager.java
@@ -10,17 +10,15 @@ import org.chromium.base.Callback; import org.chromium.base.metrics.RecordHistogram; +import org.chromium.chrome.browser.subscriptions.CommerceSubscription.CommerceSubscriptionType; +import org.chromium.chrome.browser.subscriptions.CommerceSubscription.SubscriptionManagementType; +import org.chromium.chrome.browser.subscriptions.CommerceSubscription.TrackingIdType; import org.chromium.chrome.browser.tab.Tab; import org.chromium.chrome.browser.tab.state.CriticalPersistedTabData; import org.chromium.chrome.browser.tab.state.ShoppingPersistedTabData; import org.chromium.chrome.browser.tabmodel.TabModel; import org.chromium.chrome.browser.tabmodel.TabModelObserver; import org.chromium.chrome.browser.tabmodel.TabModelSelector; -import org.chromium.components.commerce.core.CommerceSubscription; -import org.chromium.components.commerce.core.IdentifierType; -import org.chromium.components.commerce.core.ManagementType; -import org.chromium.components.commerce.core.ShoppingService; -import org.chromium.components.commerce.core.SubscriptionType; import java.util.HashSet; import java.util.Set; @@ -32,11 +30,11 @@ public class ImplicitPriceDropSubscriptionsManager { private final TabModelSelector mTabModelSelector; private final TabModelObserver mTabModelObserver; - private final ShoppingService mShoppingService; + private final SubscriptionsManagerImpl mSubscriptionManager; public ImplicitPriceDropSubscriptionsManager( - TabModelSelector tabModelSelector, ShoppingService shoppingService) { - mShoppingService = shoppingService; + TabModelSelector tabModelSelector, SubscriptionsManagerImpl subscriptionsManager) { + mSubscriptionManager = subscriptionsManager; mTabModelSelector = tabModelSelector; mTabModelObserver = new TabModelObserver() { @Override @@ -90,12 +88,12 @@ String url = tab.getOriginalUrl().getSpec(); if (urlSet.contains(url)) return; urlSet.add(url); - CommerceSubscription subscription = new CommerceSubscription( - SubscriptionType.PRICE_TRACK, IdentifierType.OFFER_ID, offerId, - ManagementType.CHROME_MANAGED, null); - mShoppingService.subscribe(subscription, (status) -> { + CommerceSubscription subscription = + new CommerceSubscription(CommerceSubscriptionType.PRICE_TRACK, offerId, + SubscriptionManagementType.CHROME_MANAGED, TrackingIdType.OFFER_ID); + mSubscriptionManager.subscribe(subscription, (status) -> { // TODO: Add histograms for implicit tabs creation. - assert status; + assert status == SubscriptionsManager.StatusCode.OK; }); }); } @@ -107,9 +105,10 @@ fetchOfferId(tab, (offerId) -> { if (offerId == null) return; CommerceSubscription subscription = - new CommerceSubscription(SubscriptionType.PRICE_TRACK, IdentifierType.OFFER_ID, - offerId, ManagementType.CHROME_MANAGED, null); - mShoppingService.unsubscribe(subscription, (status) -> { assert status; }); + new CommerceSubscription(CommerceSubscriptionType.PRICE_TRACK, offerId, + SubscriptionManagementType.CHROME_MANAGED, TrackingIdType.OFFER_ID); + mSubscriptionManager.unsubscribe(subscription, + (status) -> { assert status == SubscriptionsManager.StatusCode.OK; }); }); }
diff --git a/chrome/browser/commerce/subscriptions/android/java/src/org/chromium/chrome/browser/subscriptions/SubscriptionsManager.java b/chrome/browser/commerce/subscriptions/android/java/src/org/chromium/chrome/browser/subscriptions/SubscriptionsManager.java new file mode 100644 index 0000000..2aa27c28 --- /dev/null +++ b/chrome/browser/commerce/subscriptions/android/java/src/org/chromium/chrome/browser/subscriptions/SubscriptionsManager.java
@@ -0,0 +1,104 @@ +// Copyright 2021 The Chromium Authors +// 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.subscriptions; + +import androidx.annotation.IntDef; + +import org.chromium.base.Callback; + +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.util.List; + +/** + * Interface for exposing {@link CommerceSubscription} management. + */ +public interface SubscriptionsManager { + @IntDef({StatusCode.OK, StatusCode.NETWORK_ERROR, StatusCode.INTERNAL_ERROR, + StatusCode.INVALID_ARGUMENT}) + @Retention(RetentionPolicy.SOURCE) + public @interface StatusCode { + int OK = 0; + int NETWORK_ERROR = 2; + int INTERNAL_ERROR = 3; + int INVALID_ARGUMENT = 4; + } + + /** An observer for notification about a product be tracked or untracked. */ + interface SubscriptionObserver { + /** + * A notification that a user has subscribed to product updated. + * + * @param subscriptions The list of subscriptions being added. + */ + void onSubscribe(List<CommerceSubscription> subscriptions); + + /** + * A notification that a user has unsubscribed to product updated. + * + * @param subscriptions The list of subscriptions being removed. + */ + void onUnsubscribe(List<CommerceSubscription> subscriptions); + } + + /** + * Creates a new subscription on the server if needed. + * @param subscription The {@link CommerceSubscription} to add. + * @param callback indicates whether or not the operation was successful. + */ + void subscribe(CommerceSubscription subscription, Callback<Integer> callback); + + /** + * Creates new subscriptions in batch if needed. + * @param subscriptions The list of {@link CommerceSubscription} to add. + * @param callback indicates whether or not the operation was successful. + */ + void subscribe(List<CommerceSubscription> subscriptions, Callback<Integer> callback); + + /** + * Destroys a subscription on the server if needed. + * @param subscription The {@link CommerceSubscription} to destroy. + * @param callback indicates whether or not the operation was successful. + */ + void unsubscribe(CommerceSubscription subscription, Callback<Integer> callback); + + /** + * This is batched version of {@link #unsubscribe(CommerceSubscription, Callback)}. + * @param subscriptions The list of subscription objects to unsubscribe from. + * @param callback A callback for whether the operation completed successfully. + */ + void unsubscribe(List<CommerceSubscription> subscriptions, Callback<Integer> callback); + + /** + * Returns all subscriptions that match the provided type. + * @param type The {@link CommerceSubscription.CommerceSubscriptionType} to query. + * @param forceFetch Whether to fetch from server. + * @param callback returns the list of subscriptions. + */ + void getSubscriptions(@CommerceSubscription.CommerceSubscriptionType String type, + boolean forceFetch, Callback<List<CommerceSubscription>> callback); + + /** + * Checks if the given subscription matches any subscriptions in local storage. + * + * @param subscription The subscription to check. + * @param callback The callback to receive the result. + */ + void isSubscribed(CommerceSubscription subscription, Callback<Boolean> callback); + + /** + * Add an observer of subscribe and unsubscribe events. + * + * @param observer The observer to add. + */ + void addObserver(SubscriptionObserver observer); + + /** + * Remove an observer of subscribe and unsubscribe events. + * + * @param observer The observer to remove. + */ + void removeObserver(SubscriptionObserver observer); +}
diff --git a/chrome/browser/commerce/subscriptions/android/java/src/org/chromium/chrome/browser/subscriptions/SubscriptionsManagerImpl.java b/chrome/browser/commerce/subscriptions/android/java/src/org/chromium/chrome/browser/subscriptions/SubscriptionsManagerImpl.java new file mode 100644 index 0000000..da5055a --- /dev/null +++ b/chrome/browser/commerce/subscriptions/android/java/src/org/chromium/chrome/browser/subscriptions/SubscriptionsManagerImpl.java
@@ -0,0 +1,439 @@ +// Copyright 2021 The Chromium Authors +// 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.subscriptions; + +import android.os.Build; + +import androidx.annotation.IntDef; +import androidx.annotation.VisibleForTesting; + +import org.chromium.base.Callback; +import org.chromium.base.ObserverList; +import org.chromium.chrome.browser.price_tracking.PriceDropNotificationManager; +import org.chromium.chrome.browser.price_tracking.PriceTrackingFeatures; +import org.chromium.chrome.browser.profiles.Profile; + +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.Queue; + +/** + * Implementation of {@link SubscriptionsManager} to manage price drop related subscriptions. + * TODO(crbug.com/1186450): Pull subscription type specific code into respective handlers to + * simplify this class. + */ +public class SubscriptionsManagerImpl implements SubscriptionsManager { + @IntDef({Operation.SUBSCRIBE, Operation.UNSUBSCRIBE}) + @Retention(RetentionPolicy.SOURCE) + public @interface Operation { + int SUBSCRIBE = 0; + int UNSUBSCRIBE = 1; + } + + private final CommerceSubscriptionsStorage mStorage; + private final CommerceSubscriptionsServiceProxy mServiceProxy; + private static List<CommerceSubscription> sRemoteSubscriptionsForTesting; + private boolean mCanHandleRequests; + private Queue<DeferredSubscriptionOperation> mDeferredTasks; + private final ObserverList<SubscriptionObserver> mObservers; + private final PriceDropNotificationManager mPriceDropNotificationManager; + + private static class DeferredSubscriptionOperation { + private final @Operation int mOperation; + private final List<CommerceSubscription> mSubscriptions; + private final Callback<Integer> mCallback; + + public DeferredSubscriptionOperation(@Operation int operation, + List<CommerceSubscription> subscriptions, Callback<Integer> callback) { + mOperation = operation; + mSubscriptions = subscriptions; + mCallback = callback; + } + + public @Operation int getOperation() { + return mOperation; + } + + public List<CommerceSubscription> getSubscriptions() { + return mSubscriptions; + } + + public Callback<Integer> getCallback() { + return mCallback; + } + } + + public SubscriptionsManagerImpl( + Profile profile, PriceDropNotificationManager priceDropNotificationManager) { + this(profile, new CommerceSubscriptionsStorage(profile), + new CommerceSubscriptionsServiceProxy(profile), priceDropNotificationManager); + } + + @VisibleForTesting + SubscriptionsManagerImpl(Profile profile, CommerceSubscriptionsStorage storage, + CommerceSubscriptionsServiceProxy proxy, + PriceDropNotificationManager priceDropNotificationManager) { + mStorage = storage; + mServiceProxy = proxy; + mPriceDropNotificationManager = priceDropNotificationManager; + mDeferredTasks = new LinkedList<>(); + mCanHandleRequests = false; + initTypes(this::onInitComplete); + mObservers = new ObserverList<>(); + } + + @Override + public void addObserver(SubscriptionObserver observer) { + mObservers.addObserver(observer); + } + + @Override + public void removeObserver(SubscriptionObserver observer) { + mObservers.removeObserver(observer); + } + + /** + * Creates a new subscription on the server-side and refreshes the local storage of + * subscriptions. + * @param subscription The {@link CommerceSubscription} to add. + * @param callback indicates whether or not the operation was successful. + */ + @Override + public void subscribe(CommerceSubscription subscription, Callback<Integer> callback) { + if (subscription == null || !isSubscriptionTypeSupported(subscription.getType())) { + callback.onResult(SubscriptionsManager.StatusCode.INVALID_ARGUMENT); + return; + } + + subscribe(new ArrayList<CommerceSubscription>() { + { add(subscription); }; + }, callback); + } + + /** + * Creates new subscriptions in batch if needed. + * @param subscriptions The list of {@link CommerceSubscription} to add. + * @param callback indicates whether or not the operation was successful. + */ + @Override + public void subscribe(List<CommerceSubscription> subscriptions, Callback<Integer> callback) { + if (subscriptions.size() == 0) { + callback.onResult(SubscriptionsManager.StatusCode.OK); + return; + } + + // Wrap the callback in one that allows us to trigger the observers. + Callback<Integer> wrappedCallback = (status) -> { + if (status == StatusCode.OK) { + for (SubscriptionObserver o : mObservers) { + o.onSubscribe(subscriptions); + } + } + callback.onResult(status); + }; + + String type = subscriptions.get(0).getType(); + if (!isSubscriptionTypeSupported(type)) { + wrappedCallback.onResult(SubscriptionsManager.StatusCode.INVALID_ARGUMENT); + return; + } + + // Make sure the notification channel is initialized if there is a user-managed PRICE_TRACK + // subscription. For chrome-managed subscriptions, channel will be initialized via message + // card in tab switcher. + if (CommerceSubscription.CommerceSubscriptionType.PRICE_TRACK.equals(type) + && CommerceSubscription.SubscriptionManagementType.USER_MANAGED.equals( + subscriptions.get(0).getManagementType()) + && Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { + mPriceDropNotificationManager.createNotificationChannel(); + } + + if (!mCanHandleRequests) { + mDeferredTasks.add(new DeferredSubscriptionOperation( + Operation.SUBSCRIBE, subscriptions, wrappedCallback)); + return; + } + + getUniqueSubscriptions(subscriptions, (list) -> { + if (list.size() == 0) { + wrappedCallback.onResult(SubscriptionsManager.StatusCode.OK); + } else { + mServiceProxy.create(list, + (didSucceed) + -> handleUpdateSubscriptionsResponse( + didSucceed, type, wrappedCallback)); + } + }); + } + + /** + * Destroys a subscription on the server-side and refreshes the local storage of subscriptions. + * @param subscription The {@link CommerceSubscription} to destroy. + * @param callback indicates whether or not the operation was successful. + */ + @Override + public void unsubscribe(CommerceSubscription subscription, Callback<Integer> callback) { + String type = subscription.getType(); + if (subscription == null || !isSubscriptionTypeSupported(type)) { + callback.onResult(SubscriptionsManager.StatusCode.INVALID_ARGUMENT); + return; + } + unsubscribe(new ArrayList<CommerceSubscription>() { + { add(subscription); }; + }, callback); + } + + /** + * Returns all subscriptions that match the provided type. + * @param type The {@link CommerceSubscription.CommerceSubscriptionType} to query. + * @param forceFetch Whether to fetch from server. If no, fetch from local storage. + * @param callback returns the list of subscriptions. + */ + @Override + public void getSubscriptions(@CommerceSubscription.CommerceSubscriptionType String type, + boolean forceFetch, Callback<List<CommerceSubscription>> callback) { + if (sRemoteSubscriptionsForTesting != null) { + callback.onResult(sRemoteSubscriptionsForTesting); + return; + } + if (forceFetch) { + mServiceProxy.get(type, callback); + } else { + mStorage.loadWithPrefix(String.valueOf(type), + localSubscriptions -> callback.onResult(localSubscriptions)); + } + } + + /** + * Checks if the given subscription matches any subscriptions in local storage. + * + * @param subscription The subscription to check. + * @param callback The callback to receive the result. + */ + @Override + public void isSubscribed(CommerceSubscription subscription, Callback<Boolean> callback) { + if (subscription == null) { + callback.onResult(false); + return; + } + + // Searching by prefix instead of loading by key to handle cases of duplicates. + String targetKey = CommerceSubscriptionsStorage.getKey(subscription); + mStorage.loadWithPrefix(targetKey, localSubscriptions -> { + // TODO: (crbug/1279519) CommerceSubscriptionsStorage should support full key matching + // and we shouldn't need to perform this additional check. + for (CommerceSubscription current : localSubscriptions) { + if (targetKey.equals(CommerceSubscriptionsStorage.getKey(current))) { + callback.onResult(true); + return; + } + } + callback.onResult(false); + }); + } + + /** + * Called when user account is cleared or updated. + */ + void onIdentityChanged() { + mStorage.deleteAll(); + // If the feature is still eligible to work, we should re-init and fetch the fresh data. + if (PriceTrackingFeatures.isPriceDropNotificationEligible()) { + initTypes((status) -> { assert status == SubscriptionsManager.StatusCode.OK; }); + queryAndUpdateWaaEnabled(); + } + } + + /** + * Query whether web and app activity is enabled on the server and update the local pref value. + */ + public void queryAndUpdateWaaEnabled() { + mServiceProxy.queryAndUpdateWaaEnabled(); + } + + @Override + public void unsubscribe(List<CommerceSubscription> subscriptions, Callback<Integer> callback) { + String type = subscriptions.get(0).getType(); + if (subscriptions == null || !isSubscriptionTypeSupported(type)) { + callback.onResult(SubscriptionsManager.StatusCode.INVALID_ARGUMENT); + return; + } + + if (subscriptions.size() == 0) { + callback.onResult(SubscriptionsManager.StatusCode.OK); + return; + } + + // Wrap the callback in one that allows us to trigger the observers. + Callback<Integer> wrappedCallback = (status) -> { + if (status == StatusCode.OK) { + for (SubscriptionObserver o : mObservers) { + o.onUnsubscribe(subscriptions); + } + } + callback.onResult(status); + }; + + if (!mCanHandleRequests) { + mDeferredTasks.add(new DeferredSubscriptionOperation( + Operation.UNSUBSCRIBE, subscriptions, wrappedCallback)); + return; + } + + Map<String, CommerceSubscription> subscriptionsMap = getSubscriptionsMap(subscriptions); + mStorage.loadWithPrefix(String.valueOf(type), localSubscriptions -> { + if (localSubscriptions.size() == 0) { + wrappedCallback.onResult(SubscriptionsManager.StatusCode.OK); + return; + } + + List<CommerceSubscription> subscriptionsToDelete = + new ArrayList<CommerceSubscription>(); + + for (CommerceSubscription current : localSubscriptions) { + String key = CommerceSubscriptionsStorage.getKey(current); + if (subscriptionsMap.containsKey(key)) { + subscriptionsToDelete.add(current); + } + } + + if (subscriptionsToDelete.size() == 0) { + wrappedCallback.onResult(SubscriptionsManager.StatusCode.OK); + return; + } + + mServiceProxy.delete(subscriptionsToDelete, + (didSucceed) + -> handleUpdateSubscriptionsResponse( + didSucceed, type, wrappedCallback)); + }); + } + + // Calls the backend for known types and updates the local cache. + private void initTypes(Callback<Integer> callback) { + mStorage.deleteAll(); + String type = CommerceSubscription.CommerceSubscriptionType.PRICE_TRACK; + getSubscriptions(type, true, + remoteSubscriptions + -> updateStorageWithSubscriptions(type, remoteSubscriptions, callback)); + } + + // Updates the local cache + the state of whether or not the object can start handling requests + // based on the initial response form the server. + private void onInitComplete(@SubscriptionsManager.StatusCode Integer result) { + mCanHandleRequests = true; + + if (result == SubscriptionsManager.StatusCode.OK) { + for (DeferredSubscriptionOperation item : mDeferredTasks) { + if (Operation.SUBSCRIBE == item.getOperation()) { + subscribe(item.getSubscriptions(), item.getCallback()); + } else if (Operation.UNSUBSCRIBE == item.getOperation()) { + unsubscribe(item.getSubscriptions(), item.getCallback()); + } + } + } else { + // Resolve all pending callbacks with an internal error and clear the queue. + // TODO: add a retry in case of a network failure. + for (DeferredSubscriptionOperation item : mDeferredTasks) { + item.getCallback().onResult(SubscriptionsManager.StatusCode.INTERNAL_ERROR); + } + } + + mDeferredTasks.clear(); + } + + private boolean isSubscriptionTypeSupported( + @CommerceSubscription.CommerceSubscriptionType String type) { + return CommerceSubscription.CommerceSubscriptionType.PRICE_TRACK.equals(type); + } + + private void updateStorageWithSubscriptions( + @CommerceSubscription.CommerceSubscriptionType String type, + List<CommerceSubscription> remoteSubscriptions, Callback<Integer> callback) { + mStorage.loadWithPrefix(String.valueOf(type), localSubscriptions -> { + for (CommerceSubscription subscription : localSubscriptions) { + if (!remoteSubscriptions.contains(subscription)) { + mStorage.delete(subscription); + } + } + for (CommerceSubscription subscription : remoteSubscriptions) { + if (!localSubscriptions.contains(subscription)) { + mStorage.save(subscription); + } + } + + callback.onResult(SubscriptionsManager.StatusCode.OK); + }); + } + + private void handleUpdateSubscriptionsResponse(Boolean didSucceed, + @CommerceSubscription.CommerceSubscriptionType String type, + Callback<Integer> callback) { + if (!didSucceed) { + callback.onResult(SubscriptionsManager.StatusCode.NETWORK_ERROR); + return; + } else { + getSubscriptions(type, true, + remoteSubscriptions + -> updateStorageWithSubscriptions(type, remoteSubscriptions, callback)); + } + } + + // Creates a Key-Subscription map where key is generated using {@link + // CommerceSubscriptionsStorage#getKey}. + private Map<String, CommerceSubscription> getSubscriptionsMap( + List<CommerceSubscription> subscriptions) { + Map<String, CommerceSubscription> subscriptionsMap = + new HashMap<String, CommerceSubscription>(); + for (CommerceSubscription current : subscriptions) { + subscriptionsMap.put(CommerceSubscriptionsStorage.getKey(current), current); + } + + return subscriptionsMap; + } + + // Compares the provided subscriptions list against the local cache and only returns the ones + // that are not in the local cache. + private void getUniqueSubscriptions(List<CommerceSubscription> subscriptions, + Callback<List<CommerceSubscription>> callback) { + String type = subscriptions.get(0).getType(); + + mStorage.loadWithPrefix(String.valueOf(type), localSubscriptions -> { + if (localSubscriptions.size() == 0) { + callback.onResult(subscriptions); + return; + } + + List<CommerceSubscription> result = new ArrayList<CommerceSubscription>(); + + Map<String, CommerceSubscription> localSubscriptionsMap = + getSubscriptionsMap(localSubscriptions); + + for (CommerceSubscription subscription : subscriptions) { + String key = CommerceSubscriptionsStorage.getKey(subscription); + if (!localSubscriptionsMap.containsKey(key)) { + result.add(subscription); + } + } + + callback.onResult(result); + }); + } + + @VisibleForTesting + public void setRemoteSubscriptionsForTesting(List<CommerceSubscription> subscriptions) { + sRemoteSubscriptionsForTesting = subscriptions; + } + + @VisibleForTesting + public void setCanHandlerequests(boolean value) { + mCanHandleRequests = value; + } +}
diff --git a/chrome/browser/commerce/subscriptions/commerce_subscription_db.cc b/chrome/browser/commerce/subscriptions/commerce_subscription_db.cc new file mode 100644 index 0000000..c03987a --- /dev/null +++ b/chrome/browser/commerce/subscriptions/commerce_subscription_db.cc
@@ -0,0 +1,237 @@ +// Copyright 2021 The Chromium Authors +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#include "chrome/browser/commerce/subscriptions/commerce_subscription_db.h" + +#include "base/android/callback_android.h" +#include "base/android/jni_android.h" +#include "base/android/jni_array.h" +#include "base/android/jni_string.h" +#include "base/containers/fixed_flat_map.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" +#include "chrome/browser/commerce/subscriptions/android/jni_headers/CommerceSubscription_jni.h" +#include "chrome/browser/commerce/subscriptions/android/jni_headers/CommerceSubscriptionsStorage_jni.h" +#include "chrome/browser/persisted_state_db/session_proto_db_factory.h" +#include "components/commerce/core/proto/commerce_subscription_db_content.pb.h" +#include "content/public/browser/android/browser_context_handle.h" + +namespace { + +using CommerceSubscriptionProto = + commerce_subscription_db::CommerceSubscriptionContentProto; +using CommerceSubscriptions = + std::vector<SessionProtoDB<CommerceSubscriptionProto>::KeyAndValue>; +using SubscriptionManagementTypeProto = commerce_subscription_db:: + CommerceSubscriptionContentProto_SubscriptionManagementType; +using SubscriptionTypeProto = + commerce_subscription_db::CommerceSubscriptionContentProto_SubscriptionType; +using TrackingIdTypeProto = + commerce_subscription_db::CommerceSubscriptionContentProto_TrackingIdType; + +SubscriptionManagementTypeProto getManagementTypeForString( + const std::string& management_type_string) { + SubscriptionManagementTypeProto management_type = commerce_subscription_db:: + CommerceSubscriptionContentProto_SubscriptionManagementType_MANAGE_TYPE_UNSPECIFIED; + bool success = commerce_subscription_db:: + CommerceSubscriptionContentProto_SubscriptionManagementType_Parse( + management_type_string, &management_type); + DCHECK(success) + << "There was an error getting the management type from given string"; + return management_type; +} + +const std::string& getStringForManagementType( + SubscriptionManagementTypeProto management_type) { + return commerce_subscription_db:: + CommerceSubscriptionContentProto_SubscriptionManagementType_Name( + management_type); +} + +SubscriptionTypeProto getSubscriptionTypeForString( + const std::string& subscription_type_string) { + SubscriptionTypeProto subscription_type = commerce_subscription_db:: + CommerceSubscriptionContentProto_SubscriptionType_TYPE_UNSPECIFIED; + bool success = commerce_subscription_db:: + CommerceSubscriptionContentProto_SubscriptionType_Parse( + subscription_type_string, &subscription_type); + DCHECK(success) + << "There was an error getting the subscription type from given string"; + return subscription_type; +} + +const std::string& getStringForSubscriptionType( + SubscriptionTypeProto subscription_type) { + return commerce_subscription_db:: + CommerceSubscriptionContentProto_SubscriptionType_Name(subscription_type); +} + +TrackingIdTypeProto getTrackingIdTypeForString( + const std::string& tracking_id_type_string) { + TrackingIdTypeProto tracking_id_type = commerce_subscription_db:: + CommerceSubscriptionContentProto_TrackingIdType_IDENTIFIER_TYPE_UNSPECIFIED; + bool success = commerce_subscription_db:: + CommerceSubscriptionContentProto_TrackingIdType_Parse( + tracking_id_type_string, &tracking_id_type); + DCHECK(success) + << "There was an error getting the tracking id type from given string"; + return tracking_id_type; +} + +const std::string& getStringForTrackingIdType( + TrackingIdTypeProto tracking_id_type) { + return commerce_subscription_db:: + CommerceSubscriptionContentProto_TrackingIdType_Name(tracking_id_type); +} + +void OnLoadCallbackSingleEntry(const base::android::JavaRef<jobject>& jcallback, + bool success, + CommerceSubscriptions data) { + DCHECK(success) << "There was an error loading from CommerceSubscriptionDB"; + if (data.size() == 0) { + base::android::RunObjectCallbackAndroid(jcallback, nullptr); + return; + } + DCHECK(data.size() == 1); + CommerceSubscriptionProto proto = std::move(data.at(0).second); + JNIEnv* env = base::android::AttachCurrentThread(); + base::android::ScopedJavaLocalRef<jobject> subscription = + Java_CommerceSubscription_Constructor( + env, + base::android::ConvertUTF8ToJavaString( + env, getStringForSubscriptionType( + proto.subscription_type())) /*subscription_type*/, + base::android::ConvertUTF8ToJavaString( + env, proto.tracking_id()) /*tracking_id*/, + base::android::ConvertUTF8ToJavaString( + env, getStringForManagementType( + proto.management_type())) /*management_type*/, + base::android::ConvertUTF8ToJavaString( + env, getStringForTrackingIdType( + proto.tracking_id_type())) /*tracking_id_type*/, + proto.timestamp() /*timestamp*/); + base::android::RunObjectCallbackAndroid(jcallback, subscription); +} + +void OnLoadCallbackMultipleEntry( + const base::android::JavaRef<jobject>& jcallback, + bool success, + CommerceSubscriptions data) { + DCHECK(success) << "There was an error loading from CommerceSubscriptionDB"; + JNIEnv* env = base::android::AttachCurrentThread(); + base::android::ScopedJavaLocalRef<jobject> jlist = + Java_CommerceSubscription_createSubscriptionList(env); + for (SessionProtoDB<CommerceSubscriptionProto>::KeyAndValue& kv : data) { + CommerceSubscriptionProto proto = std::move(kv.second); + Java_CommerceSubscription_createSubscriptionAndAddToList( + env, jlist, + base::android::ConvertUTF8ToJavaString( + env, getStringForSubscriptionType( + proto.subscription_type())) /*subscription_type*/, + base::android::ConvertUTF8ToJavaString( + env, proto.tracking_id()) /*tracking_id*/, + base::android::ConvertUTF8ToJavaString( + env, getStringForManagementType( + proto.management_type())) /*management_type*/, + base::android::ConvertUTF8ToJavaString( + env, getStringForTrackingIdType( + proto.tracking_id_type())) /*tracking_id_type*/, + proto.timestamp()); + } + base::android::RunObjectCallbackAndroid(jcallback, jlist); +} + +void OnUpdateCallback( + const base::android::JavaRef<jobject>& joncomplete_for_testing, + bool success) { + DCHECK(success) << "There was an error modifying CommerceSubscriptionDB"; + if (joncomplete_for_testing) + base::android::RunRunnableAndroid(joncomplete_for_testing); +} +} // namespace + +CommerceSubscriptionDB::CommerceSubscriptionDB( + content::BrowserContext* browser_context) + : proto_db_(SessionProtoDBFactory<CommerceSubscriptionProto>::GetInstance() + ->GetForProfile(browser_context)) {} +CommerceSubscriptionDB::~CommerceSubscriptionDB() = default; + +void CommerceSubscriptionDB::Save( + JNIEnv* env, + const base::android::JavaParamRef<jstring>& jkey, + const base::android::JavaParamRef<jstring>& jtype, + const base::android::JavaParamRef<jstring>& jtracking_id, + const base::android::JavaParamRef<jstring>& jmanagement_type, + const base::android::JavaParamRef<jstring>& jtracking_id_type, + const jlong jtimestamp, + const base::android::JavaParamRef<jobject>& jcallback) { + const std::string& key = base::android::ConvertJavaStringToUTF8(env, jkey); + CommerceSubscriptionProto proto; + proto.set_key(key); + proto.set_tracking_id(base::android::ConvertJavaStringToUTF8(jtracking_id)); + proto.set_subscription_type(getSubscriptionTypeForString( + base::android::ConvertJavaStringToUTF8(jtype))); + proto.set_tracking_id_type(getTrackingIdTypeForString( + base::android::ConvertJavaStringToUTF8(jtracking_id_type))); + proto.set_management_type(getManagementTypeForString( + base::android::ConvertJavaStringToUTF8(jmanagement_type))); + proto.set_timestamp(jtimestamp); + proto_db_->InsertContent( + key, proto, + base::BindOnce(&OnUpdateCallback, + base::android::ScopedJavaGlobalRef<jobject>(jcallback))); +} + +void CommerceSubscriptionDB::Load( + JNIEnv* env, + const base::android::JavaParamRef<jstring>& jkey, + const base::android::JavaParamRef<jobject>& jcallback) { + proto_db_->LoadOneEntry( + base::android::ConvertJavaStringToUTF8(env, jkey), + base::BindOnce(&OnLoadCallbackSingleEntry, + base::android::ScopedJavaGlobalRef<jobject>(jcallback))); +} + +void CommerceSubscriptionDB::LoadWithPrefix( + JNIEnv* env, + const base::android::JavaParamRef<jstring>& jprefix, + const base::android::JavaParamRef<jobject>& jcallback) { + proto_db_->LoadContentWithPrefix( + base::android::ConvertJavaStringToUTF8(env, jprefix), + base::BindOnce(&OnLoadCallbackMultipleEntry, + base::android::ScopedJavaGlobalRef<jobject>(jcallback))); +} + +void CommerceSubscriptionDB::Delete( + JNIEnv* env, + const base::android::JavaParamRef<jstring>& jkey, + const base::android::JavaParamRef<jobject>& joncomplete_for_testing) { + proto_db_->DeleteOneEntry( + base::android::ConvertJavaStringToUTF8(env, jkey), + base::BindOnce(&OnUpdateCallback, + base::android::ScopedJavaGlobalRef<jobject>( + joncomplete_for_testing))); +} + +void CommerceSubscriptionDB::DeleteAll( + JNIEnv* env, + const base::android::JavaParamRef<jobject>& joncomplete_for_testing) { + proto_db_->DeleteAllContent(base::BindOnce( + &OnUpdateCallback, + base::android::ScopedJavaGlobalRef<jobject>(joncomplete_for_testing))); +} + +void CommerceSubscriptionDB::Destroy(JNIEnv* env) { + proto_db_->Destroy(); +} + +static void JNI_CommerceSubscriptionsStorage_Init( + JNIEnv* env, + const base::android::JavaParamRef<jobject>& obj, + const base::android::JavaParamRef<jobject>& jprofile) { + Java_CommerceSubscriptionsStorage_setNativePtr( + env, obj, + reinterpret_cast<intptr_t>(new CommerceSubscriptionDB( + content::BrowserContextFromJavaHandle(jprofile)))); +}
diff --git a/chrome/browser/commerce/subscriptions/commerce_subscription_db.h b/chrome/browser/commerce/subscriptions/commerce_subscription_db.h new file mode 100644 index 0000000..6a2b5d1 --- /dev/null +++ b/chrome/browser/commerce/subscriptions/commerce_subscription_db.h
@@ -0,0 +1,72 @@ +// Copyright 2021 The Chromium Authors +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#ifndef CHROME_BROWSER_COMMERCE_SUBSCRIPTIONS_COMMERCE_SUBSCRIPTION_DB_H_ +#define CHROME_BROWSER_COMMERCE_SUBSCRIPTIONS_COMMERCE_SUBSCRIPTION_DB_H_ + +#include "base/android/scoped_java_ref.h" +#include "base/memory/raw_ptr.h" +#include "base/memory/weak_ptr.h" +#include "components/commerce/core/proto/commerce_subscription_db_content.pb.h" +#include "components/keyed_service/core/keyed_service.h" +#include "components/leveldb_proto/public/proto_database.h" + +namespace content { +class BrowserContext; +} // namespace content + +namespace commerce_subscription_db { +class CommerceSubscriptionContentProto; +} // namespace commerce_subscription_db + +template <typename T> +class SessionProtoDB; + +class CommerceSubscriptionDB { + public: + explicit CommerceSubscriptionDB(content::BrowserContext* browser_context); + CommerceSubscriptionDB(const CommerceSubscriptionDB&) = delete; + CommerceSubscriptionDB& operator=(const CommerceSubscriptionDB&) = delete; + ~CommerceSubscriptionDB(); + + // Save subscription for key. + void Save(JNIEnv* env, + const base::android::JavaParamRef<jstring>& jkey, + const base::android::JavaParamRef<jstring>& jtype, + const base::android::JavaParamRef<jstring>& jtracking_id, + const base::android::JavaParamRef<jstring>& jmanagement_type, + const base::android::JavaParamRef<jstring>& jtracking_id_type, + const jlong jtimestamp, + const base::android::JavaParamRef<jobject>& jcallback); + + // Load subscription corresponding to key. + void Load(JNIEnv* env, + const base::android::JavaParamRef<jstring>& jkey, + const base::android::JavaParamRef<jobject>& jcallback); + + // Load subscriptions whose keys have specific prefix. + void LoadWithPrefix(JNIEnv* env, + const base::android::JavaParamRef<jstring>& jprefix, + const base::android::JavaParamRef<jobject>& jcallback); + + // Delete entry corresponding to key. + void Delete(JNIEnv* env, + const base::android::JavaParamRef<jstring>& jkey, + const base::android::JavaParamRef<jobject>& jcallback); + + // Delete all entries in the database. + void DeleteAll(JNIEnv* env, + const base::android::JavaParamRef<jobject>& jcallback); + + // Destroy CommerceSubscriptionDB object. + void Destroy(JNIEnv* env); + + private: + raw_ptr<SessionProtoDB< + commerce_subscription_db::CommerceSubscriptionContentProto>> + proto_db_; + base::WeakPtrFactory<CommerceSubscriptionDB> weak_ptr_factory_{this}; +}; + +#endif // CHROME_BROWSER_COMMERCE_SUBSCRIPTIONS_COMMERCE_SUBSCRIPTION_DB_H_
diff --git a/chrome/browser/commerce/subscriptions/test/android/java/src/org/chromium/chrome/browser/subscriptions/CommerceSubscriptionJsonSerializerUnitTest.java b/chrome/browser/commerce/subscriptions/test/android/java/src/org/chromium/chrome/browser/subscriptions/CommerceSubscriptionJsonSerializerUnitTest.java new file mode 100644 index 0000000..9544c2f --- /dev/null +++ b/chrome/browser/commerce/subscriptions/test/android/java/src/org/chromium/chrome/browser/subscriptions/CommerceSubscriptionJsonSerializerUnitTest.java
@@ -0,0 +1,177 @@ +// Copyright 2021 The Chromium Authors +// 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.subscriptions; +import static org.hamcrest.CoreMatchers.equalTo; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertThat; + +import org.json.JSONException; +import org.json.JSONObject; +import org.junit.After; +import org.junit.Before; +import org.junit.Rule; +import org.junit.Test; +import org.junit.rules.TestRule; +import org.junit.runner.RunWith; +import org.mockito.MockitoAnnotations; +import org.robolectric.annotation.Config; + +import org.chromium.base.test.BaseRobolectricTestRunner; +import org.chromium.chrome.browser.DeferredStartupHandler; +import org.chromium.chrome.browser.subscriptions.CommerceSubscription.PriceTrackableOffer; +import org.chromium.chrome.test.util.browser.Features; + +/** + * Tests for {@link CommerceSubscriptionJsonSerializer}. + */ +@RunWith(BaseRobolectricTestRunner.class) +@Config(manifest = Config.NONE) +public class CommerceSubscriptionJsonSerializerUnitTest { + @Rule + public TestRule mProcessor = new Features.JUnitProcessor(); + + private static final String FAKE_OFFER_ID = "100"; + private static final String FAKE_PRODUCT_CLUSTER_ID = "300"; + private static final String FAKE_CURRENT_PRICE = "1000"; + private static final String FAKE_COUNTRY_CODE = "us"; + + private static final String FAKE_SUBSCRIPTION_JSON_STRING = "{ \"type\": \"PRICE_TRACK\"," + + "\"managementType\": \"CHROME_MANAGED\", " + + "\"identifierType\": \"OFFER_ID\", \"identifier\": \"100\"," + + "\"eventTimestampMicros\": \"200\" }"; + + private static final CommerceSubscription FAKE_CHROME_MANAGED_SUBSCRIPTION = + new CommerceSubscription(CommerceSubscription.CommerceSubscriptionType.PRICE_TRACK, + FAKE_OFFER_ID, CommerceSubscription.SubscriptionManagementType.CHROME_MANAGED, + CommerceSubscription.TrackingIdType.OFFER_ID, 200L); + + private static final CommerceSubscription FAKE_USER_MANAGED_SUBSCRIPTION = + new CommerceSubscription(CommerceSubscription.CommerceSubscriptionType.PRICE_TRACK, + FAKE_PRODUCT_CLUSTER_ID, + CommerceSubscription.SubscriptionManagementType.USER_MANAGED, + CommerceSubscription.TrackingIdType.PRODUCT_CLUSTER_ID, + new PriceTrackableOffer(FAKE_OFFER_ID, FAKE_CURRENT_PRICE, FAKE_COUNTRY_CODE)); + + @Before + public void setUp() { + MockitoAnnotations.initMocks(this); + } + + @After + public void tearDown() { + DeferredStartupHandler.setInstanceForTests(null); + } + + @Test + public void testSerialize() throws JSONException { + JSONObject subscriptionJson = + CommerceSubscriptionJsonSerializer.serialize(FAKE_CHROME_MANAGED_SUBSCRIPTION); + assertThat(subscriptionJson.getString("type"), + equalTo(CommerceSubscription.CommerceSubscriptionType.PRICE_TRACK)); + assertThat(subscriptionJson.getString("identifierType"), + equalTo(CommerceSubscription.TrackingIdType.OFFER_ID)); + assertThat(subscriptionJson.getString("identifier"), equalTo(FAKE_OFFER_ID)); + } + + @Test + public void testSerialize_ClusterId() throws JSONException { + JSONObject subscriptionJson = + CommerceSubscriptionJsonSerializer.serialize(FAKE_USER_MANAGED_SUBSCRIPTION); + assertThat(subscriptionJson.getString("type"), + equalTo(CommerceSubscription.CommerceSubscriptionType.PRICE_TRACK)); + assertThat(subscriptionJson.getString("identifierType"), + equalTo(CommerceSubscription.TrackingIdType.PRODUCT_CLUSTER_ID)); + assertThat(subscriptionJson.getString("identifier"), equalTo(FAKE_PRODUCT_CLUSTER_ID)); + assertThat(subscriptionJson.getJSONObject("userSeenOffer").getString("offerId"), + equalTo(FAKE_OFFER_ID)); + assertThat(subscriptionJson.getJSONObject("userSeenOffer").getString("seenPriceMicros"), + equalTo(FAKE_CURRENT_PRICE)); + assertThat(subscriptionJson.getJSONObject("userSeenOffer").getString("countryCode"), + equalTo(FAKE_COUNTRY_CODE)); + } + + @Test + public void testDeserialize() throws JSONException { + JSONObject fakeSubscription = new JSONObject(FAKE_SUBSCRIPTION_JSON_STRING); + CommerceSubscription actual = + CommerceSubscriptionJsonSerializer.deserialize(fakeSubscription); + + assertThat(actual.getType(), equalTo(FAKE_CHROME_MANAGED_SUBSCRIPTION.getType())); + assertThat(actual.getTimestamp(), equalTo(FAKE_CHROME_MANAGED_SUBSCRIPTION.getTimestamp())); + assertThat( + actual.getTrackingId(), equalTo(FAKE_CHROME_MANAGED_SUBSCRIPTION.getTrackingId())); + assertThat(actual.getTrackingIdType(), + equalTo(FAKE_CHROME_MANAGED_SUBSCRIPTION.getTrackingIdType())); + assertThat(actual.getManagementType(), + equalTo(FAKE_CHROME_MANAGED_SUBSCRIPTION.getManagementType())); + } + + @Test + public void testDeserialize_MissingTimestamp() throws JSONException { + JSONObject fakeSubscription = + new JSONObject("{ \"type\": \"PRICE_TRACK\", \"managementType\": " + + "\"CHROME_MANAGED\", \"identifierType\": \"OFFER_ID\", " + + "\"identifier\": \"100\" }"); + assertNull(CommerceSubscriptionJsonSerializer.deserialize(fakeSubscription)); + } + + @Test + public void testDeserialize_MissingIdentifierOrType() throws JSONException { + JSONObject fakeSubscriptionMissingId = + new JSONObject("{ \"type\": \"PRICE_TRACK\", \"managementType\": " + + "\"CHROME_MANAGED\", \"identifierType\": \"OFFER_ID\", " + + "\"eventTimestampMicros\": \"200\" }"); + assertNull(CommerceSubscriptionJsonSerializer.deserialize(fakeSubscriptionMissingId)); + + JSONObject fakeSubscriptionMissingIdType = + new JSONObject("{ \"type\": \"PRICE_TRACK\", \"managementType\": " + + " \"CHROME_MANAGED\", \"identifier\": \"100\", " + + "\"eventTimestampMicros\": \"200\" }"); + assertNull(CommerceSubscriptionJsonSerializer.deserialize(fakeSubscriptionMissingIdType)); + } + + @Test + public void testDeserialize_MissingManagementType() throws JSONException { + JSONObject fakeSubscriptionMissingManagementType = + new JSONObject("{ \"type\": \"PRICE_TRACK\", \"identifierType\": \"OFFER_ID\"," + + " \"identifier\": \"100\", \"eventTimestampMicros\": \"200\" }"); + assertNull(CommerceSubscriptionJsonSerializer.deserialize( + fakeSubscriptionMissingManagementType)); + } + + @Test + public void testDeserialize_MissingType() throws JSONException { + JSONObject fakeSubscriptionMissingManagementType = + new JSONObject("{ \"managementType\": \"CHROME_MANAGED\", \"identifierType\":" + + "\"OFFER_ID\", \"identifier\": \"100\"," + + " \"eventTimestampMicros\": \"200\" }"); + assertNull(CommerceSubscriptionJsonSerializer.deserialize( + fakeSubscriptionMissingManagementType)); + } + + @Test + public void testDeserialize_InvalidTimestamp() throws JSONException { + JSONObject fakeSubscriptionInvalidTimestamp = + new JSONObject("{ \"managementType\": \"CHROME_MANAGED\", " + + "\"identifierType\": \"OFFER_ID\", \"identifier\": \"100\", " + + "\"eventTimestampMicros\": \"lkjasdf\" }"); + assertNull( + CommerceSubscriptionJsonSerializer.deserialize(fakeSubscriptionInvalidTimestamp)); + } + + @Test + public void testDeserialize_ProductClusterId() throws JSONException { + JSONObject subscriptionJson = + new JSONObject("{ \"type\": \"PRICE_TRACK\", \"managementType\": \"USER_MANAGED\", " + + "\"identifierType\": \"PRODUCT_CLUSTER_ID\", \"identifier\": \"100\", " + + "\"eventTimestampMicros\": \"200\" }"); + CommerceSubscription actual = + CommerceSubscriptionJsonSerializer.deserialize(subscriptionJson); + assertThat(actual.getTrackingIdType(), + equalTo(CommerceSubscription.TrackingIdType.PRODUCT_CLUSTER_ID)); + assertThat(actual.getManagementType(), + equalTo(CommerceSubscription.SubscriptionManagementType.USER_MANAGED)); + } +}
diff --git a/chrome/browser/commerce/subscriptions/test/android/java/src/org/chromium/chrome/browser/subscriptions/CommerceSubscriptionsServiceFactoryUnitTest.java b/chrome/browser/commerce/subscriptions/test/android/java/src/org/chromium/chrome/browser/subscriptions/CommerceSubscriptionsServiceFactoryUnitTest.java index b422e25..401b833 100644 --- a/chrome/browser/commerce/subscriptions/test/android/java/src/org/chromium/chrome/browser/subscriptions/CommerceSubscriptionsServiceFactoryUnitTest.java +++ b/chrome/browser/commerce/subscriptions/test/android/java/src/org/chromium/chrome/browser/subscriptions/CommerceSubscriptionsServiceFactoryUnitTest.java
@@ -4,6 +4,8 @@ package org.chromium.chrome.browser.subscriptions; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.Mockito.doAnswer; import static org.mockito.Mockito.doReturn; import androidx.test.filters.SmallTest; @@ -17,19 +19,20 @@ import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.mockito.invocation.InvocationOnMock; +import org.mockito.stubbing.Answer; import org.robolectric.annotation.Config; import org.chromium.base.test.BaseRobolectricTestRunner; import org.chromium.base.test.util.JniMocker; -import org.chromium.chrome.browser.commerce.ShoppingServiceFactory; import org.chromium.chrome.browser.endpoint_fetcher.EndpointFetcher; import org.chromium.chrome.browser.endpoint_fetcher.EndpointFetcherJni; import org.chromium.chrome.browser.profiles.Profile; import org.chromium.chrome.browser.profiles.ProfileManager; import org.chromium.chrome.browser.signin.services.IdentityServicesProvider; import org.chromium.chrome.test.util.browser.Features; -import org.chromium.components.commerce.core.ShoppingService; - +import org.chromium.components.signin.identitymanager.IdentityManager; +import org.chromium.content_public.browser.BrowserContextHandle; /** * Unit tests for {@link CommerceSubscriptionsServiceFactory}. */ @@ -49,18 +52,39 @@ private Profile mProfileTwo; @Mock + private CommerceSubscriptionsStorage.Natives mCommerceSubscriptionsStorageJni; + + @Mock EndpointFetcher.Natives mEndpointFetcherJniMock; @Mock - ShoppingService mShoppingService; + IdentityServicesProvider mIdentityServicesProvider; + + @Mock + IdentityManager mIdentityManager; @Before public void setUp() { MockitoAnnotations.initMocks(this); doReturn(false).when(mProfileOne).isOffTheRecord(); doReturn(false).when(mProfileTwo).isOffTheRecord(); + mMocker.mock(CommerceSubscriptionsStorageJni.TEST_HOOKS, mCommerceSubscriptionsStorageJni); mMocker.mock(EndpointFetcherJni.TEST_HOOKS, mEndpointFetcherJniMock); - ShoppingServiceFactory.setShoppingServiceForTesting(mShoppingService); + + IdentityServicesProvider.setInstanceForTests(mIdentityServicesProvider); + doReturn(mIdentityManager).when(mIdentityServicesProvider).getIdentityManager(any()); + + doAnswer(new Answer<Void>() { + @Override + public Void answer(InvocationOnMock invocation) { + CommerceSubscriptionsStorage storage = + (CommerceSubscriptionsStorage) invocation.getArguments()[0]; + storage.setNativeCommerceSubscriptionDBForTesting((long) 123); + return null; + } + }) + .when(mCommerceSubscriptionsStorageJni) + .init(any(CommerceSubscriptionsStorage.class), any(BrowserContextHandle.class)); } @After
diff --git a/chrome/browser/commerce/subscriptions/test/android/java/src/org/chromium/chrome/browser/subscriptions/CommerceSubscriptionsServiceProxyUnitTest.java b/chrome/browser/commerce/subscriptions/test/android/java/src/org/chromium/chrome/browser/subscriptions/CommerceSubscriptionsServiceProxyUnitTest.java new file mode 100644 index 0000000..ce6412b --- /dev/null +++ b/chrome/browser/commerce/subscriptions/test/android/java/src/org/chromium/chrome/browser/subscriptions/CommerceSubscriptionsServiceProxyUnitTest.java
@@ -0,0 +1,260 @@ +// Copyright 2021 The Chromium Authors +// 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.subscriptions; + +import static org.junit.Assert.assertNotNull; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.anyLong; +import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.Mockito.doAnswer; +import static org.mockito.Mockito.doReturn; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; + +import androidx.test.filters.SmallTest; + +import org.json.JSONException; +import org.junit.After; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Rule; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.Mock; +import org.mockito.MockitoAnnotations; +import org.mockito.invocation.InvocationOnMock; +import org.mockito.stubbing.Answer; + +import org.chromium.base.Callback; +import org.chromium.base.test.UiThreadTest; +import org.chromium.base.test.util.Batch; +import org.chromium.base.test.util.CommandLineFlags; +import org.chromium.base.test.util.JniMocker; +import org.chromium.chrome.browser.endpoint_fetcher.EndpointFetcher; +import org.chromium.chrome.browser.endpoint_fetcher.EndpointFetcherJni; +import org.chromium.chrome.browser.endpoint_fetcher.EndpointResponse; +import org.chromium.chrome.browser.flags.ChromeFeatureList; +import org.chromium.chrome.browser.flags.ChromeSwitches; +import org.chromium.chrome.browser.profiles.Profile; +import org.chromium.chrome.test.ChromeBrowserTestRule; +import org.chromium.chrome.test.ChromeJUnit4ClassRunner; +import org.chromium.chrome.test.util.browser.Features.EnableFeatures; + +import java.util.ArrayList; + +/** + * Tests for {@link CommerceSubscriptionsServiceProxy}. + */ +@RunWith(ChromeJUnit4ClassRunner.class) +@Batch(Batch.PER_CLASS) +@EnableFeatures({ChromeFeatureList.COMMERCE_PRICE_TRACKING + "<Study"}) +@CommandLineFlags. +Add({ChromeSwitches.DISABLE_FIRST_RUN_EXPERIENCE, "force-fieldtrials=Study/Group"}) +public class CommerceSubscriptionsServiceProxyUnitTest { + @Rule + public final ChromeBrowserTestRule mBrowserTestRule = new ChromeBrowserTestRule(); + + @Rule + public JniMocker mMocker = new JniMocker(); + + private static final String EXPECTED_CONTENT_TYPE = "application/json; charset=UTF-8"; + private static final String[] EXPECTED_OAUTH_SCOPES = + new String[] {"https://www.googleapis.com/auth/chromememex"}; + private static final String HTTP_GET = "GET"; + private static final String HTTP_POST = "POST"; + private static final String EMPTY_RESPONSE = "{}"; + private static final String FAKE_GET_RESPONSE = + "{ \"subscriptions\": [ { \"type\": \"PRICE_TRACK\"," + + " \"managementType\": \"CHROME_MANAGED\"," + + "\"identifierType\": \"OFFER_ID\", \"identifier\": \"190190\"," + + "\"eventTimestampMicros\": \"200\" } ] }"; + + private static final String DEFAULT_ENDPOINT = "https://memex-pa.googleapis.com/v1/annotations"; + private static final String ENDPOINT_OVERRIDE = "my-endpoint.com"; + private static final CommerceSubscription FAKE_SUBSCRIPTION = + new CommerceSubscription(CommerceSubscription.CommerceSubscriptionType.PRICE_TRACK, + "190190", CommerceSubscription.SubscriptionManagementType.CHROME_MANAGED, + CommerceSubscription.TrackingIdType.OFFER_ID); + + @Mock + EndpointFetcher.Natives mEndpointFetcherJniMock; + + @Mock + private Profile mProfile; + + private CommerceSubscriptionsServiceProxy mServiceProxy; + + @Before + public void setUp() { + MockitoAnnotations.initMocks(this); + mMocker.mock(EndpointFetcherJni.TEST_HOOKS, mEndpointFetcherJniMock); + doReturn(false).when(mProfile).isOffTheRecord(); + Profile.setLastUsedProfileForTesting(mProfile); + mServiceProxy = new CommerceSubscriptionsServiceProxy(mProfile); + } + + @After + public void tearDown() throws Exception { + Profile.setLastUsedProfileForTesting(null); + } + + @UiThreadTest + @Test + @SmallTest + public void testGetSubscriptions() { + mockEndpointResponse(FAKE_GET_RESPONSE); + mServiceProxy.get(CommerceSubscription.CommerceSubscriptionType.PRICE_TRACK, (result) -> { + assertNotNull(result); + Assert.assertEquals(1, result.size()); + + CommerceSubscription subscription = result.get(0); + Assert.assertEquals(CommerceSubscription.CommerceSubscriptionType.PRICE_TRACK, + subscription.getType()); + Assert.assertEquals(CommerceSubscription.SubscriptionManagementType.CHROME_MANAGED, + subscription.getManagementType()); + Assert.assertEquals( + CommerceSubscription.TrackingIdType.OFFER_ID, subscription.getTrackingIdType()); + Assert.assertEquals(200L, subscription.getTimestamp()); + Assert.assertEquals("190190", subscription.getTrackingId()); + }); + } + + @UiThreadTest + @Test + @SmallTest + public void testGetSubscriptions_EmptyResponse() { + mockEndpointResponse(EMPTY_RESPONSE); + mServiceProxy.get(CommerceSubscription.CommerceSubscriptionType.PRICE_TRACK, + (result) -> { Assert.assertTrue(result.isEmpty()); }); + } + + @UiThreadTest + @Test + @SmallTest + @CommandLineFlags. + Add({"force-fieldtrial-params=Study.Group:subscriptions_service_base_url/my-endpoint.com"}) + public void testGetSubscriptions_ValidRequest() { + mServiceProxy.get( + CommerceSubscription.CommerceSubscriptionType.PRICE_TRACK, (result) -> {}); + verifyEndpointFetcherCalled( + 1, "my-endpoint.com?requestParams.subscriptionType=PRICE_TRACK", "GET", ""); + } + + @UiThreadTest + @Test + @SmallTest + @CommandLineFlags. + Add({"force-fieldtrial-params=Study.Group:subscriptions_service_base_url/my-endpoint.com"}) + public void testCreateSubscriptions_ValidRequest() throws JSONException { + String expectedJsonPayload = ""; + mServiceProxy.create(new ArrayList<CommerceSubscription>() { + { add(FAKE_SUBSCRIPTION); } + }, (success) -> {}); + verifyEndpointFetcherCalled(1, "my-endpoint.com", "POST", + "{\"createShoppingSubscriptionsParams\":" + + "{\"subscriptions\":[{\"type\":\"PRICE_TRACK\"," + + "\"managementType\":\"CHROME_MANAGED\"," + + "\"identifierType\":\"OFFER_ID\",\"identifier\":\"190190\"}]}}"); + } + + @UiThreadTest + @Test + @SmallTest + @CommandLineFlags. + Add({"force-fieldtrial-params=Study.Group:subscriptions_service_base_url/my-endpoint.com"}) + public void testCreateSubscriptions_InvalidResponse() throws JSONException { + mockEndpointResponse(EMPTY_RESPONSE); + mServiceProxy.create( + new ArrayList<CommerceSubscription>() { + { add(FAKE_SUBSCRIPTION); } + }, + (success) -> { Assert.assertFalse(success); }); + } + + @UiThreadTest + @Test + @SmallTest + @CommandLineFlags. + Add({"force-fieldtrial-params=Study.Group:subscriptions_service_base_url/my-endpoint.com"}) + public void testCreateSubscriptions() throws JSONException { + mockEndpointResponse("{ \"status\": { \"code\": 0 } }"); + mServiceProxy.create( + new ArrayList<CommerceSubscription>() { + { add(FAKE_SUBSCRIPTION); } + }, + (success) -> { Assert.assertTrue(success); }); + } + + @UiThreadTest + @Test + @SmallTest + @CommandLineFlags. + Add({"force-fieldtrial-params=Study.Group:subscriptions_service_base_url/my-endpoint.com"}) + public void testDeleteSubscriptions_ValidRequest() throws JSONException { + CommerceSubscription fakeSubscriptionToDelete = + new CommerceSubscription(CommerceSubscription.CommerceSubscriptionType.PRICE_TRACK, + "190190", CommerceSubscription.SubscriptionManagementType.CHROME_MANAGED, + CommerceSubscription.TrackingIdType.OFFER_ID, 1617309553897712L); + + mServiceProxy.delete(new ArrayList<CommerceSubscription>() { + { add(fakeSubscriptionToDelete); } + }, (success) -> {}); + verifyEndpointFetcherCalled(1, "my-endpoint.com", "POST", + "{\"removeShoppingSubscriptionsParams\":" + + "{\"eventTimestampMicros\":[1617309553897712]}}"); + } + + @UiThreadTest + @Test + @SmallTest + @CommandLineFlags. + Add({"force-fieldtrial-params=Study.Group:subscriptions_service_base_url/my-endpoint.com"}) + public void testDeleteSubscriptions_InvalidResponse() throws JSONException { + mockEndpointResponse(EMPTY_RESPONSE); + mServiceProxy.delete( + new ArrayList<CommerceSubscription>() { + { add(FAKE_SUBSCRIPTION); } + }, + (success) -> { Assert.assertFalse(success); }); + } + + @UiThreadTest + @Test + @SmallTest + @CommandLineFlags. + Add({"force-fieldtrial-params=Study.Group:subscriptions_service_base_url/my-endpoint.com"}) + public void testDeleteSubscriptions() throws JSONException { + mockEndpointResponse("{ \"status\": { \"code\": 0 } }"); + mServiceProxy.delete( + new ArrayList<CommerceSubscription>() { + { add(FAKE_SUBSCRIPTION); } + }, + (success) -> { Assert.assertTrue(success); }); + } + + private void verifyEndpointFetcherCalled( + int numTimes, String expectedUrl, String expectedMethod, String expectedPayload) { + verify(mEndpointFetcherJniMock, times(numTimes)) + .nativeFetchOAuth(any(Profile.class), any(String.class), eq(expectedUrl), + eq(expectedMethod), eq(EXPECTED_CONTENT_TYPE), eq(EXPECTED_OAUTH_SCOPES), + eq(expectedPayload), anyLong(), anyInt(), any(Callback.class)); + } + + private void mockEndpointResponse(String response) { + doAnswer(new Answer<Void>() { + @Override + public Void answer(InvocationOnMock invocation) { + Callback callback = (Callback) invocation.getArguments()[9]; + callback.onResult(new EndpointResponse(response)); + return null; + } + }) + .when(mEndpointFetcherJniMock) + .nativeFetchOAuth(any(Profile.class), any(String.class), any(String.class), + any(String.class), eq(EXPECTED_CONTENT_TYPE), eq(EXPECTED_OAUTH_SCOPES), + any(String.class), anyLong(), anyInt(), any(Callback.class)); + } +}
diff --git a/chrome/browser/commerce/subscriptions/test/android/java/src/org/chromium/chrome/browser/subscriptions/CommerceSubscriptionsServiceUnitTest.java b/chrome/browser/commerce/subscriptions/test/android/java/src/org/chromium/chrome/browser/subscriptions/CommerceSubscriptionsServiceUnitTest.java index 77a7f32..7a71601 100644 --- a/chrome/browser/commerce/subscriptions/test/android/java/src/org/chromium/chrome/browser/subscriptions/CommerceSubscriptionsServiceUnitTest.java +++ b/chrome/browser/commerce/subscriptions/test/android/java/src/org/chromium/chrome/browser/subscriptions/CommerceSubscriptionsServiceUnitTest.java
@@ -7,6 +7,9 @@ import static org.hamcrest.CoreMatchers.equalTo; import static org.junit.Assert.assertThat; import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyBoolean; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.times; @@ -27,6 +30,7 @@ import org.mockito.MockitoAnnotations; import org.robolectric.annotation.Config; +import org.chromium.base.Callback; import org.chromium.base.FeatureList; import org.chromium.base.metrics.RecordHistogram; import org.chromium.base.metrics.UmaRecorderHolder; @@ -35,6 +39,7 @@ import org.chromium.chrome.browser.flags.ChromeFeatureList; import org.chromium.chrome.browser.lifecycle.ActivityLifecycleDispatcher; import org.chromium.chrome.browser.lifecycle.PauseResumeWithNativeObserver; +import org.chromium.chrome.browser.preferences.Pref; import org.chromium.chrome.browser.preferences.SharedPreferencesManager; import org.chromium.chrome.browser.price_tracking.PriceDropNotificationManager; import org.chromium.chrome.browser.price_tracking.PriceDropNotificationManagerFactory; @@ -42,14 +47,20 @@ import org.chromium.chrome.browser.price_tracking.PriceTrackingFeatures; import org.chromium.chrome.browser.profiles.Profile; import org.chromium.chrome.browser.signin.services.IdentityServicesProvider; +import org.chromium.chrome.browser.subscriptions.CommerceSubscription.CommerceSubscriptionType; +import org.chromium.chrome.browser.subscriptions.CommerceSubscriptionsMetrics.AccountWaaStatus; import org.chromium.chrome.browser.tabmodel.TabModelSelector; import org.chromium.chrome.test.util.browser.Features; import org.chromium.components.browser_ui.notifications.MockNotificationManagerProxy; -import org.chromium.components.commerce.core.ShoppingService; import org.chromium.components.prefs.PrefService; +import org.chromium.components.signin.identitymanager.IdentityManager; +import org.chromium.components.signin.identitymanager.PrimaryAccountChangeEvent; import org.chromium.components.user_prefs.UserPrefs; import org.chromium.components.user_prefs.UserPrefsJni; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; import java.util.concurrent.TimeUnit; /** @@ -65,7 +76,11 @@ public JniMocker mJniMocker = new JniMocker(); @Mock - private ShoppingService mShoppingService; + private SubscriptionsManagerImpl mSubscriptionsManager; + @Mock + private IdentityManager mIdentityManager; + @Mock + private PrimaryAccountChangeEvent mChangeEvent; @Mock TabModelSelector mTabModelSelector; @Mock @@ -81,7 +96,11 @@ @Mock private UserPrefs.Natives mUserPrefsJni; @Captor + private ArgumentCaptor<IdentityManager.Observer> mIdentityManagerObserverCaptor; + @Captor private ArgumentCaptor<PauseResumeWithNativeObserver> mPauseResumeWithNativeObserverCaptor; + @Captor + private ArgumentCaptor<Callback<List<CommerceSubscription>>> mLocalSubscriptionsCallbackCaptor; private CommerceSubscriptionsService mService; private SharedPreferencesManager mSharedPreferencesManager; @@ -95,6 +114,7 @@ UmaRecorderHolder.resetForTesting(); doNothing().when(mActivityLifecycleDispatcher).register(any()); + doNothing().when(mSubscriptionsManager).getSubscriptions(anyString(), anyBoolean(), any()); mSharedPreferencesManager = SharedPreferencesManager.getInstance(); mSharedPreferencesManager.writeLong( CommerceSubscriptionsService.CHROME_MANAGED_SUBSCRIPTIONS_TIMESTAMP, @@ -116,10 +136,13 @@ mJniMocker.mock(UserPrefsJni.TEST_HOOKS, mUserPrefsJni); Profile.setLastUsedProfileForTesting(mProfile); when(mUserPrefsJni.get(mProfile)).thenReturn(mPrefService); + IdentityServicesProvider.setInstanceForTests(mIdentityServicesProvider); + when(mIdentityServicesProvider.getIdentityManager(mProfile)).thenReturn(mIdentityManager); mPriceDropNotificationManager = PriceDropNotificationManagerFactory.create(); - mService = - new CommerceSubscriptionsService(mShoppingService, mPriceDropNotificationManager); + mService = new CommerceSubscriptionsService( + mSubscriptionsManager, mIdentityManager, mPriceDropNotificationManager); + verify(mIdentityManager, times(1)).addObserver(mIdentityManagerObserverCaptor.capture()); mService.setImplicitSubscriptionsManagerForTesting(mImplicitSubscriptionsManager); } @@ -133,6 +156,8 @@ public void testDestroy() { mService.setImplicitSubscriptionsManagerForTesting(null); mService.destroy(); + verify(mIdentityManager, times(1)) + .removeObserver(eq(mIdentityManagerObserverCaptor.getValue())); } @Test @@ -143,6 +168,8 @@ .register(mPauseResumeWithNativeObserverCaptor.capture()); mService.destroy(); + verify(mIdentityManager, times(1)) + .removeObserver(eq(mIdentityManagerObserverCaptor.getValue())); verify(mActivityLifecycleDispatcher, times(1)) .unregister(eq(mPauseResumeWithNativeObserverCaptor.getValue())); verify(mImplicitSubscriptionsManager, times(1)).destroy(); @@ -150,6 +177,13 @@ @Test @SmallTest + public void testOnPrimaryAccountChanged() { + mIdentityManagerObserverCaptor.getValue().onPrimaryAccountChanged(mChangeEvent); + verify(mSubscriptionsManager, times(1)).onIdentityChanged(); + } + + @Test + @SmallTest public void testOnResume() { setupTestOnResume(); assertThat(RecordHistogram.getHistogramTotalCountForTesting( @@ -163,7 +197,37 @@ RecordHistogram.getHistogramTotalCountForTesting( PriceDropNotificationManagerImpl.NOTIFICATION_USER_MANAGED_COUNT_HISTOGRAM), equalTo(1)); + verify(mSubscriptionsManager, times(1)) + .getSubscriptions(eq(CommerceSubscriptionType.PRICE_TRACK), eq(false), + mLocalSubscriptionsCallbackCaptor.capture()); verify(mImplicitSubscriptionsManager, times(1)).initializeSubscriptions(); + + CommerceSubscription subscription1 = new CommerceSubscription( + CommerceSubscription.CommerceSubscriptionType.PRICE_TRACK, "offer_id_1", + CommerceSubscription.SubscriptionManagementType.CHROME_MANAGED, + CommerceSubscription.TrackingIdType.OFFER_ID); + CommerceSubscription subscription2 = + new CommerceSubscription(CommerceSubscription.CommerceSubscriptionType.PRICE_TRACK, + "offer_id_2", CommerceSubscription.SubscriptionManagementType.USER_MANAGED, + CommerceSubscription.TrackingIdType.PRODUCT_CLUSTER_ID); + + mLocalSubscriptionsCallbackCaptor.getValue().onResult( + new ArrayList<>(Arrays.asList(subscription1, subscription1, subscription2))); + assertThat( + RecordHistogram.getHistogramTotalCountForTesting( + CommerceSubscriptionsMetrics.SUBSCRIPTION_CHROME_MANAGED_COUNT_HISTOGRAM), + equalTo(1)); + assertThat(RecordHistogram.getHistogramValueCountForTesting( + CommerceSubscriptionsMetrics.SUBSCRIPTION_CHROME_MANAGED_COUNT_HISTOGRAM, + 2), + equalTo(1)); + assertThat(RecordHistogram.getHistogramTotalCountForTesting( + CommerceSubscriptionsMetrics.SUBSCRIPTION_USER_MANAGED_COUNT_HISTOGRAM), + equalTo(1)); + assertThat( + RecordHistogram.getHistogramValueCountForTesting( + CommerceSubscriptionsMetrics.SUBSCRIPTION_USER_MANAGED_COUNT_HISTOGRAM, 1), + equalTo(1)); } @Test @@ -177,6 +241,7 @@ assertThat(RecordHistogram.getHistogramTotalCountForTesting( PriceDropNotificationManagerImpl.NOTIFICATION_ENABLED_HISTOGRAM), equalTo(0)); + verify(mSubscriptionsManager, times(0)).getSubscriptions(anyString(), anyBoolean(), any()); verify(mImplicitSubscriptionsManager, times(0)).initializeSubscriptions(); } @@ -191,9 +256,59 @@ assertThat(RecordHistogram.getHistogramTotalCountForTesting( PriceDropNotificationManagerImpl.NOTIFICATION_ENABLED_HISTOGRAM), equalTo(0)); + verify(mSubscriptionsManager, times(0)).getSubscriptions(anyString(), anyBoolean(), any()); verify(mImplicitSubscriptionsManager, times(0)).initializeSubscriptions(); } + @Test + @SmallTest + public void testRecordAccountWaaStatus_SignOut() { + when(mIdentityManager.hasPrimaryAccount(anyInt())).thenReturn(false); + + setupTestOnResume(); + assertThat(RecordHistogram.getHistogramTotalCountForTesting( + CommerceSubscriptionsMetrics.ACCOUNT_WAA_STATUS_HISTOGRAM), + equalTo(1)); + assertThat(RecordHistogram.getHistogramValueCountForTesting( + CommerceSubscriptionsMetrics.ACCOUNT_WAA_STATUS_HISTOGRAM, + AccountWaaStatus.SIGN_OUT), + equalTo(1)); + } + + @Test + @SmallTest + public void testRecordAccountWaaStatus_SignInWaaDisabled() { + when(mIdentityManager.hasPrimaryAccount(anyInt())).thenReturn(true); + when(mPrefService.getBoolean(Pref.WEB_AND_APP_ACTIVITY_ENABLED_FOR_SHOPPING)) + .thenReturn(false); + + setupTestOnResume(); + assertThat(RecordHistogram.getHistogramTotalCountForTesting( + CommerceSubscriptionsMetrics.ACCOUNT_WAA_STATUS_HISTOGRAM), + equalTo(1)); + assertThat(RecordHistogram.getHistogramValueCountForTesting( + CommerceSubscriptionsMetrics.ACCOUNT_WAA_STATUS_HISTOGRAM, + AccountWaaStatus.SIGN_IN_WAA_DISABLED), + equalTo(1)); + } + + @Test + @SmallTest + public void testRecordAccountWaaStatus_SignInWaaEnabled() { + when(mIdentityManager.hasPrimaryAccount(anyInt())).thenReturn(true); + when(mPrefService.getBoolean(Pref.WEB_AND_APP_ACTIVITY_ENABLED_FOR_SHOPPING)) + .thenReturn(true); + + setupTestOnResume(); + assertThat(RecordHistogram.getHistogramTotalCountForTesting( + CommerceSubscriptionsMetrics.ACCOUNT_WAA_STATUS_HISTOGRAM), + equalTo(1)); + assertThat(RecordHistogram.getHistogramValueCountForTesting( + CommerceSubscriptionsMetrics.ACCOUNT_WAA_STATUS_HISTOGRAM, + AccountWaaStatus.SIGN_IN_WAA_ENABLED), + equalTo(1)); + } + private void setupTestOnResume() { mService.initDeferredStartupForActivity(mTabModelSelector, mActivityLifecycleDispatcher); verify(mActivityLifecycleDispatcher, times(1))
diff --git a/chrome/browser/commerce/subscriptions/test/android/java/src/org/chromium/chrome/browser/subscriptions/CommerceSubscriptionsStorageTest.java b/chrome/browser/commerce/subscriptions/test/android/java/src/org/chromium/chrome/browser/subscriptions/CommerceSubscriptionsStorageTest.java new file mode 100644 index 0000000..6f03f1d --- /dev/null +++ b/chrome/browser/commerce/subscriptions/test/android/java/src/org/chromium/chrome/browser/subscriptions/CommerceSubscriptionsStorageTest.java
@@ -0,0 +1,232 @@ +// Copyright 2021 The Chromium Authors +// 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.subscriptions; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; + +import androidx.test.filters.MediumTest; +import androidx.test.filters.SmallTest; + +import org.junit.After; +import org.junit.Before; +import org.junit.ClassRule; +import org.junit.Rule; +import org.junit.Test; +import org.junit.runner.RunWith; + +import org.chromium.base.ThreadUtils; +import org.chromium.base.test.util.Batch; +import org.chromium.base.test.util.CallbackHelper; +import org.chromium.base.test.util.CommandLineFlags; +import org.chromium.chrome.browser.flags.ChromeSwitches; +import org.chromium.chrome.browser.profiles.Profile; +import org.chromium.chrome.test.ChromeJUnit4ClassRunner; +import org.chromium.chrome.test.ChromeTabbedActivityTestRule; +import org.chromium.chrome.test.batch.BlankCTATabInitialStateRule; +import org.chromium.content_public.browser.test.util.TestThreadUtils; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import java.util.concurrent.TimeoutException; + +/** + * Tests related to {@link CommerceSubscriptionsStorage}. + */ +@RunWith(ChromeJUnit4ClassRunner.class) +@CommandLineFlags.Add({ChromeSwitches.DISABLE_FIRST_RUN_EXPERIENCE}) +@Batch(Batch.PER_CLASS) +public class CommerceSubscriptionsStorageTest { + @ClassRule + public static ChromeTabbedActivityTestRule sActivityTestRule = + new ChromeTabbedActivityTestRule(); + + @Rule + public BlankCTATabInitialStateRule mBlankCTATabInitialStateRule = + new BlankCTATabInitialStateRule(sActivityTestRule, false); + + private static final String OFFER_ID_1 = "offer_id_1"; + private static final String OFFER_ID_2 = "offer_id_2"; + private static final String OFFER_ID_3 = "offer_id_3"; + private static final String PRODUCT_CLUSTER_ID = "product_cluster_id"; + private static final String KEY_1 = "PRICE_TRACK_OFFER_ID_offer_id_1"; + private static final String KEY_2 = "PRICE_TRACK_OFFER_ID_offer_id_2"; + private static final String KEY_3 = "PRICE_TRACK_IDENTIFIER_TYPE_UNSPECIFIED_offer_id_3"; + + private CommerceSubscriptionsStorage mStorage; + private CommerceSubscription mSubscription1; + private CommerceSubscription mSubscription2; + private CommerceSubscription mSubscription3; + private CommerceSubscription mSubscription4; + + @Before + public void setUp() throws Exception { + TestThreadUtils.runOnUiThreadBlocking(() -> { + mStorage = new CommerceSubscriptionsStorage(Profile.getLastUsedRegularProfile()); + }); + + mSubscription1 = + new CommerceSubscription(CommerceSubscription.CommerceSubscriptionType.PRICE_TRACK, + OFFER_ID_1, CommerceSubscription.SubscriptionManagementType.CHROME_MANAGED, + CommerceSubscription.TrackingIdType.OFFER_ID); + mSubscription2 = + new CommerceSubscription(CommerceSubscription.CommerceSubscriptionType.PRICE_TRACK, + OFFER_ID_2, CommerceSubscription.SubscriptionManagementType.CHROME_MANAGED, + CommerceSubscription.TrackingIdType.OFFER_ID); + mSubscription3 = + new CommerceSubscription(CommerceSubscription.CommerceSubscriptionType.PRICE_TRACK, + OFFER_ID_3, CommerceSubscription.SubscriptionManagementType.CHROME_MANAGED, + CommerceSubscription.TrackingIdType.IDENTIFIER_TYPE_UNSPECIFIED); + mSubscription4 = new CommerceSubscription( + CommerceSubscription.CommerceSubscriptionType.PRICE_TRACK, PRODUCT_CLUSTER_ID, + CommerceSubscription.SubscriptionManagementType.USER_MANAGED, + CommerceSubscription.TrackingIdType.PRODUCT_CLUSTER_ID); + } + + @After + public void tearDown() throws Exception { + TestThreadUtils.runOnUiThreadBlocking(() -> { + mStorage.deleteAll(); + mStorage.destroy(); + }); + } + + @SmallTest + @Test + public void testGenerateStorageID() throws TimeoutException { + assertEquals(KEY_1, CommerceSubscriptionsStorage.getKey(mSubscription1)); + assertEquals(KEY_2, CommerceSubscriptionsStorage.getKey(mSubscription2)); + assertEquals(KEY_3, CommerceSubscriptionsStorage.getKey(mSubscription3)); + } + + @MediumTest + @Test + public void testSaveLoadDelete() throws TimeoutException { + save(mSubscription1); + loadSingleAndCheckResult( + CommerceSubscriptionsStorage.getKey(mSubscription1), mSubscription1); + save(mSubscription2); + loadSingleAndCheckResult( + CommerceSubscriptionsStorage.getKey(mSubscription2), mSubscription2); + delete(mSubscription1); + loadSingleAndCheckResult(CommerceSubscriptionsStorage.getKey(mSubscription1), null); + loadSingleAndCheckResult( + CommerceSubscriptionsStorage.getKey(mSubscription2), mSubscription2); + } + + @MediumTest + @Test + public void testLoadWithPrefix() throws TimeoutException { + save(mSubscription1); + loadSingleAndCheckResult( + CommerceSubscriptionsStorage.getKey(mSubscription1), mSubscription1); + save(mSubscription2); + loadSingleAndCheckResult( + CommerceSubscriptionsStorage.getKey(mSubscription2), mSubscription2); + save(mSubscription3); + loadSingleAndCheckResult( + CommerceSubscriptionsStorage.getKey(mSubscription3), mSubscription3); + save(mSubscription4); + loadSingleAndCheckResult( + CommerceSubscriptionsStorage.getKey(mSubscription4), mSubscription4); + String prefix1 = + String.format("%s_%s", CommerceSubscription.CommerceSubscriptionType.PRICE_TRACK, + CommerceSubscription.TrackingIdType.OFFER_ID); + loadPrefixAndCheckResult( + prefix1, new ArrayList<>(Arrays.asList(mSubscription1, mSubscription2))); + String prefix2 = CommerceSubscription.CommerceSubscriptionType.PRICE_TRACK; + loadPrefixAndCheckResult(prefix2, + new ArrayList<>(Arrays.asList( + mSubscription3, mSubscription1, mSubscription2, mSubscription4))); + } + + @MediumTest + @Test + public void testDeleteAll() throws TimeoutException { + save(mSubscription1); + loadSingleAndCheckResult( + CommerceSubscriptionsStorage.getKey(mSubscription1), mSubscription1); + save(mSubscription2); + loadSingleAndCheckResult( + CommerceSubscriptionsStorage.getKey(mSubscription2), mSubscription2); + deleteAll(); + loadSingleAndCheckResult(CommerceSubscriptionsStorage.getKey(mSubscription1), null); + loadSingleAndCheckResult(CommerceSubscriptionsStorage.getKey(mSubscription2), null); + } + + private void save(CommerceSubscription subscription) throws TimeoutException { + CallbackHelper ch = new CallbackHelper(); + int chCount = ch.getCallCount(); + TestThreadUtils.runOnUiThreadBlocking(() -> { + mStorage.saveWithCallback(subscription, new Runnable() { + @Override + public void run() { + ch.notifyCalled(); + } + }); + }); + ch.waitForCallback(chCount); + } + + private void delete(CommerceSubscription subscription) throws TimeoutException { + CallbackHelper ch = new CallbackHelper(); + int chCount = ch.getCallCount(); + ThreadUtils.runOnUiThreadBlocking(() -> { + mStorage.deleteForTesting(subscription, new Runnable() { + @Override + public void run() { + ch.notifyCalled(); + } + }); + }); + ch.waitForCallback(chCount); + } + + private void deleteAll() throws TimeoutException { + CallbackHelper ch = new CallbackHelper(); + int chCount = ch.getCallCount(); + ThreadUtils.runOnUiThreadBlocking(() -> { + mStorage.deleteAllForTesting(new Runnable() { + @Override + public void run() { + ch.notifyCalled(); + } + }); + }); + ch.waitForCallback(chCount); + } + + private void loadSingleAndCheckResult(String key, CommerceSubscription expected) + throws TimeoutException { + SubscriptionsLoadCallbackHelper ch = new SubscriptionsLoadCallbackHelper(); + int chCount = ch.getCallCount(); + ThreadUtils.runOnUiThreadBlocking(() -> mStorage.load(key, (res) -> ch.notifyCalled(res))); + ch.waitForCallback(chCount); + CommerceSubscription actual = ch.getSingleResult(); + if (expected == null) { + assertNull(actual); + return; + } + assertNotNull(actual); + assertEquals(expected, actual); + } + + private void loadPrefixAndCheckResult(String prefix, List<CommerceSubscription> expected) + throws TimeoutException { + SubscriptionsLoadCallbackHelper ch = new SubscriptionsLoadCallbackHelper(); + int chCount = ch.getCallCount(); + ThreadUtils.runOnUiThreadBlocking( + () -> mStorage.loadWithPrefix(prefix, (res) -> ch.notifyCalled(res))); + ch.waitForCallback(chCount); + List<CommerceSubscription> actual = ch.getResultList(); + assertNotNull(actual); + assertEquals(expected.size(), actual.size()); + for (int i = 0; i < expected.size(); i++) { + assertEquals(expected.get(i), actual.get(i)); + } + } +}
diff --git a/chrome/browser/commerce/subscriptions/test/android/java/src/org/chromium/chrome/browser/subscriptions/ImplicitPriceDropSubscriptionsManagerUnitTest.java b/chrome/browser/commerce/subscriptions/test/android/java/src/org/chromium/chrome/browser/subscriptions/ImplicitPriceDropSubscriptionsManagerUnitTest.java index 100b2b9..50cee4b 100644 --- a/chrome/browser/commerce/subscriptions/test/android/java/src/org/chromium/chrome/browser/subscriptions/ImplicitPriceDropSubscriptionsManagerUnitTest.java +++ b/chrome/browser/commerce/subscriptions/test/android/java/src/org/chromium/chrome/browser/subscriptions/ImplicitPriceDropSubscriptionsManagerUnitTest.java
@@ -29,6 +29,9 @@ import org.chromium.base.UserDataHost; import org.chromium.base.metrics.RecordHistogram; import org.chromium.base.test.BaseRobolectricTestRunner; +import org.chromium.chrome.browser.subscriptions.CommerceSubscription.CommerceSubscriptionType; +import org.chromium.chrome.browser.subscriptions.CommerceSubscription.SubscriptionManagementType; +import org.chromium.chrome.browser.subscriptions.CommerceSubscription.TrackingIdType; import org.chromium.chrome.browser.tab.Tab; import org.chromium.chrome.browser.tab.TabImpl; import org.chromium.chrome.browser.tab.TabSelectionType; @@ -38,11 +41,6 @@ import org.chromium.chrome.browser.tabmodel.TabModelObserver; import org.chromium.chrome.browser.tabmodel.TabModelSelector; import org.chromium.chrome.test.util.browser.Features; -import org.chromium.components.commerce.core.CommerceSubscription; -import org.chromium.components.commerce.core.IdentifierType; -import org.chromium.components.commerce.core.ManagementType; -import org.chromium.components.commerce.core.ShoppingService; -import org.chromium.components.commerce.core.SubscriptionType; import org.chromium.url.GURL; import java.util.concurrent.TimeUnit; @@ -74,8 +72,8 @@ private String mMockTab2OfferId; TestImplicitPriceDropSubscriptionsManager( - TabModelSelector tabModelSelector, ShoppingService shoppingService) { - super(tabModelSelector, shoppingService); + TabModelSelector tabModelSelector, SubscriptionsManagerImpl subscriptionsManager) { + super(tabModelSelector, subscriptionsManager); } @Override @@ -103,7 +101,7 @@ @Mock TabModelSelector mTabModelSelector; @Mock - ShoppingService mShoppingService; + SubscriptionsManagerImpl mSubscriptionsManager; @Mock CriticalPersistedTabData mCriticalPersistedTabData1; @Mock @@ -128,16 +126,16 @@ + TimeUnit.DAYS.toMillis(7); doReturn(fakeTimestamp).when(mCriticalPersistedTabData1).getTimestampMillis(); doReturn(fakeTimestamp).when(mCriticalPersistedTabData2).getTimestampMillis(); - mSubscription1 = new CommerceSubscription(SubscriptionType.PRICE_TRACK, - IdentifierType.OFFER_ID, OFFER1_ID, ManagementType.CHROME_MANAGED, null); - mSubscription2 = new CommerceSubscription(SubscriptionType.PRICE_TRACK, - IdentifierType.OFFER_ID, OFFER2_ID, ManagementType.CHROME_MANAGED, null); + mSubscription1 = new CommerceSubscription(CommerceSubscriptionType.PRICE_TRACK, OFFER1_ID, + SubscriptionManagementType.CHROME_MANAGED, TrackingIdType.OFFER_ID); + mSubscription2 = new CommerceSubscription(CommerceSubscriptionType.PRICE_TRACK, OFFER2_ID, + SubscriptionManagementType.CHROME_MANAGED, TrackingIdType.OFFER_ID); doReturn(2).when(mTabModel).getCount(); doReturn(mTabModel).when(mTabModelSelector).getModel(false); doNothing().when(mTabModel).addObserver(mTabModelObserverCaptor.capture()); - mImplicitSubscriptionsManager = - new TestImplicitPriceDropSubscriptionsManager(mTabModelSelector, mShoppingService); + mImplicitSubscriptionsManager = new TestImplicitPriceDropSubscriptionsManager( + mTabModelSelector, mSubscriptionsManager); mImplicitSubscriptionsManager.setupForFetchOfferId(mTab1, mTab2, OFFER1_ID, OFFER2_ID); } @@ -192,19 +190,22 @@ @Test public void testTabClosure() { mTabModelObserverCaptor.getValue().tabClosureCommitted(mTab1); - verify(mShoppingService, times(1)).unsubscribe(eq(mSubscription1), any(Callback.class)); + verify(mSubscriptionsManager, times(1)) + .unsubscribe(eq(mSubscription1), any(Callback.class)); } @Test public void testTabRemove() { mTabModelObserverCaptor.getValue().tabRemoved(mTab1); - verify(mShoppingService, times(1)).unsubscribe(eq(mSubscription1), any(Callback.class)); + verify(mSubscriptionsManager, times(1)) + .unsubscribe(eq(mSubscription1), any(Callback.class)); } @Test public void testTabSelected() { mTabModelObserverCaptor.getValue().didSelectTab(mTab1, TabSelectionType.FROM_USER, TAB2_ID); - verify(mShoppingService, times(1)).unsubscribe(eq(mSubscription1), any(Callback.class)); + verify(mSubscriptionsManager, times(1)) + .unsubscribe(eq(mSubscription1), any(Callback.class)); } @Test @@ -214,7 +215,8 @@ mImplicitSubscriptionsManager.setupForFetchOfferId(mTab1, mTab2, OFFER1_ID, OFFER2_ID); mTabModelObserverCaptor.getValue().tabClosureCommitted(mTab1); - verify(mShoppingService, times(0)).unsubscribe(eq(mSubscription1), any(Callback.class)); + verify(mSubscriptionsManager, times(0)) + .unsubscribe(eq(mSubscription1), any(Callback.class)); } @Test @@ -222,7 +224,8 @@ mImplicitSubscriptionsManager.setupForFetchOfferId(mTab1, mTab2, null, OFFER2_ID); mTabModelObserverCaptor.getValue().tabClosureCommitted(mTab1); - verify(mShoppingService, times(0)).unsubscribe(eq(mSubscription1), any(Callback.class)); + verify(mSubscriptionsManager, times(0)) + .unsubscribe(eq(mSubscription1), any(Callback.class)); } @Test @@ -249,9 +252,9 @@ private void initializeSubscriptionsAndVerify( boolean shouldSubscribeTab1, boolean shouldSubscribeTab2) { mImplicitSubscriptionsManager.initializeSubscriptions(); - verify(mShoppingService, times(shouldSubscribeTab1 ? 1 : 0)) + verify(mSubscriptionsManager, times(shouldSubscribeTab1 ? 1 : 0)) .subscribe(eq(mSubscription1), any(Callback.class)); - verify(mShoppingService, times(shouldSubscribeTab2 ? 1 : 0)) + verify(mSubscriptionsManager, times(shouldSubscribeTab2 ? 1 : 0)) .subscribe(eq(mSubscription2), any(Callback.class)); }
diff --git a/chrome/browser/commerce/subscriptions/test/android/java/src/org/chromium/chrome/browser/subscriptions/SubscriptionsLoadCallbackHelper.java b/chrome/browser/commerce/subscriptions/test/android/java/src/org/chromium/chrome/browser/subscriptions/SubscriptionsLoadCallbackHelper.java new file mode 100644 index 0000000..7a915f2f --- /dev/null +++ b/chrome/browser/commerce/subscriptions/test/android/java/src/org/chromium/chrome/browser/subscriptions/SubscriptionsLoadCallbackHelper.java
@@ -0,0 +1,51 @@ +// Copyright 2021 The Chromium Authors +// 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.subscriptions; + +import org.chromium.base.test.util.CallbackHelper; + +import java.util.List; + +/** + * Helper class for load operations to get load results from {@link CommerceSubscriptionsStorage}. + */ +public class SubscriptionsLoadCallbackHelper extends CallbackHelper { + private CommerceSubscription mSingleResult; + private List<CommerceSubscription> mResultList; + + /** + * Notifies that the callback has returned with single subscription and cache the result. + * @param subscription The {@link CommerceSubscription} returned in callback. + */ + void notifyCalled(CommerceSubscription subscription) { + mSingleResult = subscription; + notifyCalled(); + } + + /** + * Notifies that the callback has returned with a list of subscriptions and cache the result. + * @param subscriptions The list of {@link CommerceSubscription} returned in callback. + */ + void notifyCalled(List<CommerceSubscription> subscriptions) { + mResultList = subscriptions; + notifyCalled(); + } + + /** + * Gets the single {@link CommerceSubscription} from callback. + * @return The single {@link CommerceSubscription} in callback. + */ + CommerceSubscription getSingleResult() { + return mSingleResult; + } + + /** + * Gets the list of {@link CommerceSubscription} from callback. + * @return The list of {@link CommerceSubscription} in callback. + */ + List<CommerceSubscription> getResultList() { + return mResultList; + } +}
diff --git a/chrome/browser/commerce/subscriptions/test/android/java/src/org/chromium/chrome/browser/subscriptions/SubscriptionsManagerImplTest.java b/chrome/browser/commerce/subscriptions/test/android/java/src/org/chromium/chrome/browser/subscriptions/SubscriptionsManagerImplTest.java new file mode 100644 index 0000000..e6cfa27 --- /dev/null +++ b/chrome/browser/commerce/subscriptions/test/android/java/src/org/chromium/chrome/browser/subscriptions/SubscriptionsManagerImplTest.java
@@ -0,0 +1,582 @@ +// Copyright 2021 The Chromium Authors +// 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.subscriptions; + +import static org.junit.Assert.assertEquals; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.Mockito.doAnswer; +import static org.mockito.Mockito.never; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; + +import androidx.test.filters.MediumTest; + +import org.junit.After; +import org.junit.Before; +import org.junit.Rule; +import org.junit.Test; +import org.junit.rules.TestRule; +import org.junit.runner.RunWith; +import org.mockito.ArgumentCaptor; +import org.mockito.Mock; +import org.mockito.Mockito; +import org.mockito.MockitoAnnotations; +import org.mockito.invocation.InvocationOnMock; +import org.mockito.stubbing.Answer; +import org.robolectric.annotation.Config; + +import org.chromium.base.Callback; +import org.chromium.base.FeatureList; +import org.chromium.base.test.BaseRobolectricTestRunner; +import org.chromium.base.test.util.JniMocker; +import org.chromium.chrome.browser.flags.ChromeFeatureList; +import org.chromium.chrome.browser.price_tracking.PriceDropNotificationManager; +import org.chromium.chrome.browser.price_tracking.PriceDropNotificationManagerFactory; +import org.chromium.chrome.browser.price_tracking.PriceTrackingFeatures; +import org.chromium.chrome.browser.profiles.Profile; +import org.chromium.chrome.test.util.browser.Features; +import org.chromium.content_public.browser.test.util.TestThreadUtils; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.Comparator; +import java.util.List; + +/** + * Tests related to {@link SubscriptionsManagerImpl}. + */ +@RunWith(BaseRobolectricTestRunner.class) +@Config(manifest = Config.NONE) +public class SubscriptionsManagerImplTest { + @Rule + public TestRule mProcessor = new Features.JUnitProcessor(); + + @Rule + public JniMocker mMocker = new JniMocker(); + + private static final String OFFER_ID_1 = "offer_id_1"; + private static final String OFFER_ID_2 = "offer_id_2"; + private static final String OFFER_ID_3 = "offer_id_3"; + private static final String OFFER_ID_4 = "offer_id_4"; + + @Mock + private Profile mProfile; + @Mock + private CommerceSubscriptionsStorage.Natives mCommerceSubscriptionsStorageJni; + @Mock + private CommerceSubscriptionsStorage mStorage; + @Mock + private CommerceSubscriptionsServiceProxy mProxy; + + private SubscriptionsManagerImpl mSubscriptionsManager; + private CommerceSubscription mSubscription1; + private CommerceSubscription mSubscription2; + private CommerceSubscription mSubscription3; + private CommerceSubscription mSubscription4; + private FeatureList.TestValues mTestValues; + + private final class SubscriptionsComparator implements Comparator<CommerceSubscription> { + @Override + public int compare(CommerceSubscription s1, CommerceSubscription s2) { + return s1.getTrackingId().compareTo(s2.getTrackingId()); + } + } + + @Before + public void setUp() throws Exception { + MockitoAnnotations.initMocks(this); + + mTestValues = new FeatureList.TestValues(); + mTestValues.addFeatureFlagOverride(ChromeFeatureList.COMMERCE_PRICE_TRACKING, true); + mTestValues.addFieldTrialParamOverride(ChromeFeatureList.COMMERCE_PRICE_TRACKING, + PriceTrackingFeatures.PRICE_NOTIFICATION_PARAM, "true"); + FeatureList.setTestValues(mTestValues); + PriceTrackingFeatures.setIsSignedInAndSyncEnabledForTesting(true); + + PriceDropNotificationManager priceDropNotificationManager = + PriceDropNotificationManagerFactory.create(); + mMocker.mock(CommerceSubscriptionsStorageJni.TEST_HOOKS, mCommerceSubscriptionsStorageJni); + mSubscriptionsManager = new SubscriptionsManagerImpl( + mProfile, mStorage, mProxy, priceDropNotificationManager); + + mSubscription1 = + new CommerceSubscription(CommerceSubscription.CommerceSubscriptionType.PRICE_TRACK, + OFFER_ID_1, CommerceSubscription.SubscriptionManagementType.CHROME_MANAGED, + CommerceSubscription.TrackingIdType.OFFER_ID); + mSubscription2 = + new CommerceSubscription(CommerceSubscription.CommerceSubscriptionType.PRICE_TRACK, + OFFER_ID_2, CommerceSubscription.SubscriptionManagementType.CHROME_MANAGED, + CommerceSubscription.TrackingIdType.OFFER_ID); + mSubscription3 = + new CommerceSubscription(CommerceSubscription.CommerceSubscriptionType.PRICE_TRACK, + OFFER_ID_3, CommerceSubscription.SubscriptionManagementType.CHROME_MANAGED, + CommerceSubscription.TrackingIdType.OFFER_ID); + mSubscription4 = + new CommerceSubscription(CommerceSubscription.CommerceSubscriptionType.PRICE_TRACK, + OFFER_ID_4, CommerceSubscription.SubscriptionManagementType.CHROME_MANAGED, + CommerceSubscription.TrackingIdType.OFFER_ID); + } + + @After + public void tearDown() throws Exception { + TestThreadUtils.runOnUiThreadBlocking(() -> { + mStorage.deleteAll(); + mStorage.destroy(); + mSubscriptionsManager.setRemoteSubscriptionsForTesting(null); + }); + } + + @MediumTest + @Test + public void testSubscribeDeferred() { + List<CommerceSubscription> remoteSubscriptions = + new ArrayList<>(Arrays.asList(mSubscription1, mSubscription2)); + + Callback<Integer> subsCallback = Mockito.mock(Callback.class); + + // Call subscribe before the service is ready. + mSubscriptionsManager.subscribe(mSubscription1, subsCallback); + verify(subsCallback, never()).onResult(any(Integer.class)); + + // Capture the getSubscriptions callback but don't resolve it. + ArgumentCaptor<Callback<List<CommerceSubscription>>> getSubscriptionsCallbackCaptor = + ArgumentCaptor.forClass(Callback.class); + verify(mProxy, times(1)) + .get(eq(CommerceSubscription.CommerceSubscriptionType.PRICE_TRACK), + getSubscriptionsCallbackCaptor.capture()); + + setLoadWithPrefixMockResponse(new ArrayList<>()); + setMockProxyCreateResponse(true); + + // Resolve the original callback to getSubscriptions started through initTypes. + getSubscriptionsCallbackCaptor.getValue().onResult(remoteSubscriptions); + + // Resolve the callback for getSubscriptions started through subscribe. + verify(mProxy, times(2)) + .get(eq(CommerceSubscription.CommerceSubscriptionType.PRICE_TRACK), + getSubscriptionsCallbackCaptor.capture()); + getSubscriptionsCallbackCaptor.getValue().onResult(remoteSubscriptions); + + verify(subsCallback, times(1)).onResult(eq(SubscriptionsManager.StatusCode.OK)); + } + + @MediumTest + @Test + public void testSubscribeDeferredInternalError() { + List<CommerceSubscription> remoteSubscriptions = + new ArrayList<>(Arrays.asList(mSubscription1, mSubscription2)); + + Callback<Integer> subsCallback = Mockito.mock(Callback.class); + + // Call subscribe before the service is ready. + mSubscriptionsManager.subscribe(mSubscription1, subsCallback); + verify(subsCallback, never()).onResult(any(Integer.class)); + + ArgumentCaptor<Callback<List<CommerceSubscription>>> getSubscriptionsCallbackCaptor = + ArgumentCaptor.forClass(Callback.class); + verify(mProxy, times(1)) + .get(eq(CommerceSubscription.CommerceSubscriptionType.PRICE_TRACK), + getSubscriptionsCallbackCaptor.capture()); + + setLoadWithPrefixMockResponse(new ArrayList<>()); + setMockProxyCreateResponse(false); + + // Resolve the original callback to getSubscriptions started through initTypes. + getSubscriptionsCallbackCaptor.getValue().onResult(remoteSubscriptions); + verify(subsCallback, times(1)).onResult(eq(SubscriptionsManager.StatusCode.NETWORK_ERROR)); + } + + @MediumTest + @Test + public void testSubscribeSingle() { + CommerceSubscription newSubscription = mSubscription4; + List<CommerceSubscription> remoteSubscriptions = + new ArrayList<>(Arrays.asList(mSubscription1, mSubscription2, newSubscription)); + List<CommerceSubscription> localSubscriptions = + new ArrayList<>(Arrays.asList(mSubscription2, mSubscription3)); + + mSubscriptionsManager.setCanHandlerequests(true); + + setMockProxyCreateResponse(true); + setLoadWithPrefixMockResponse(localSubscriptions); + + mSubscriptionsManager.setRemoteSubscriptionsForTesting(remoteSubscriptions); + Callback<Integer> subsCallback = Mockito.mock(Callback.class); + + // Call subscribe and verify the result. + mSubscriptionsManager.subscribe(newSubscription, subsCallback); + verify(subsCallback, times(1)).onResult(SubscriptionsManager.StatusCode.OK); + + ArgumentCaptor<CommerceSubscription> storageSaveCaptor = + ArgumentCaptor.forClass(CommerceSubscription.class); + verify(mStorage, times(2)).save(storageSaveCaptor.capture()); + System.out.println(storageSaveCaptor.getAllValues()); + + ArgumentCaptor<CommerceSubscription> storageDeleteCaptor = + ArgumentCaptor.forClass(CommerceSubscription.class); + verify(mStorage, times(1)).delete(storageDeleteCaptor.capture()); + System.out.println(storageDeleteCaptor.getAllValues()); + + List<CommerceSubscription> subscriptionsToSave = storageSaveCaptor.getAllValues(); + Collections.sort(subscriptionsToSave, new SubscriptionsComparator()); + + List<CommerceSubscription> subscriptionsToDelete = storageDeleteCaptor.getAllValues(); + Collections.sort(subscriptionsToDelete, new SubscriptionsComparator()); + + assertEquals(new ArrayList<>(Arrays.asList(mSubscription1, newSubscription)), + subscriptionsToSave); + assertEquals(new ArrayList<>(Arrays.asList(mSubscription3)), subscriptionsToDelete); + } + + @MediumTest + @Test + public void testSubscribeInvalidSubscription() { + mSubscriptionsManager.setCanHandlerequests(true); + // Null subscription. + CommerceSubscription newSubscription = null; + Callback<Integer> subsCallback = Mockito.mock(Callback.class); + mSubscriptionsManager.subscribe(newSubscription, subsCallback); + verify(subsCallback, times(1)).onResult(SubscriptionsManager.StatusCode.INVALID_ARGUMENT); + + // Invalid type. + newSubscription = new CommerceSubscription( + CommerceSubscription.CommerceSubscriptionType.TYPE_UNSPECIFIED, OFFER_ID_1, + CommerceSubscription.SubscriptionManagementType.CHROME_MANAGED, + CommerceSubscription.TrackingIdType.OFFER_ID); + Callback<Integer> subsCallback2 = Mockito.mock(Callback.class); + mSubscriptionsManager.subscribe(newSubscription, subsCallback2); + verify(subsCallback, times(1)).onResult(SubscriptionsManager.StatusCode.INVALID_ARGUMENT); + } + + @MediumTest + @Test + public void testSubscribeDuplicatesNop() { + mSubscriptionsManager.setCanHandlerequests(true); + List<CommerceSubscription> localSubscriptions = + new ArrayList<>(Arrays.asList(mSubscription2, mSubscription3)); + List<CommerceSubscription> newSubscriptions = localSubscriptions; + + setLoadWithPrefixMockResponse(localSubscriptions); + + Callback<Integer> subsCallback = Mockito.mock(Callback.class); + mSubscriptionsManager.subscribe(newSubscriptions, subsCallback); + verify(subsCallback, times(1)).onResult(SubscriptionsManager.StatusCode.OK); + verify(mProxy, never()).create(any(List.class), any(Callback.class)); + } + + @MediumTest + @Test + public void testSubscribeCreateUnique() { + mSubscriptionsManager.setCanHandlerequests(true); + List<CommerceSubscription> localSubscriptions = + new ArrayList<>(Arrays.asList(mSubscription2, mSubscription3)); + List<CommerceSubscription> newSubscriptions = + new ArrayList<>(Arrays.asList(mSubscription1, mSubscription2)); + + setLoadWithPrefixMockResponse(localSubscriptions); + setMockProxyCreateResponse(true); + + Callback<Integer> subsCallback = Mockito.mock(Callback.class); + mSubscriptionsManager.subscribe(newSubscriptions, subsCallback); + + ArgumentCaptor<List<CommerceSubscription>> subscriptionsToCreateCaptor = + ArgumentCaptor.forClass(List.class); + verify(mProxy, times(1)).create(subscriptionsToCreateCaptor.capture(), any(Callback.class)); + assertEquals(new ArrayList<>(Arrays.asList(mSubscription1)), + subscriptionsToCreateCaptor.getValue()); + } + + @MediumTest + @Test + public void testSubscribeList() { + mSubscriptionsManager.setCanHandlerequests(true); + List<CommerceSubscription> newSubscriptions = + new ArrayList<>(Arrays.asList(mSubscription1, mSubscription2)); + List<CommerceSubscription> remoteSubscriptions = + new ArrayList<>(Arrays.asList(mSubscription1, mSubscription2, mSubscription4)); + List<CommerceSubscription> localSubscriptions = + new ArrayList<>(Arrays.asList(mSubscription2, mSubscription3)); + + setMockProxyCreateResponse(true); + setLoadWithPrefixMockResponse(localSubscriptions); + + mSubscriptionsManager.setRemoteSubscriptionsForTesting(remoteSubscriptions); + Callback<Integer> subsCallback = Mockito.mock(Callback.class); + + // Call subscribe and verify the result. + mSubscriptionsManager.subscribe(newSubscriptions, subsCallback); + verify(subsCallback, times(1)).onResult(SubscriptionsManager.StatusCode.OK); + + ArgumentCaptor<CommerceSubscription> storageSaveCaptor = + ArgumentCaptor.forClass(CommerceSubscription.class); + verify(mStorage, times(2)).save(storageSaveCaptor.capture()); + + ArgumentCaptor<CommerceSubscription> storageDeleteCaptor = + ArgumentCaptor.forClass(CommerceSubscription.class); + verify(mStorage, times(1)).delete(storageDeleteCaptor.capture()); + System.out.println(storageDeleteCaptor.getAllValues()); + + List<CommerceSubscription> subscriptionsToSave = storageSaveCaptor.getAllValues(); + Collections.sort(subscriptionsToSave, new SubscriptionsComparator()); + + List<CommerceSubscription> subscriptionsToDelete = storageDeleteCaptor.getAllValues(); + Collections.sort(subscriptionsToDelete, new SubscriptionsComparator()); + + assertEquals(new ArrayList<>(Arrays.asList(mSubscription1, mSubscription4)), + subscriptionsToSave); + assertEquals(new ArrayList<>(Arrays.asList(mSubscription3)), subscriptionsToDelete); + } + + @MediumTest + @Test + public void testUnsubscribe() { + mSubscriptionsManager.setCanHandlerequests(true); + CommerceSubscription removedSubscription = mSubscription3; + List<CommerceSubscription> remoteSubscriptions = + new ArrayList<>(Arrays.asList(mSubscription2, mSubscription4)); + List<CommerceSubscription> localSubscriptions = + new ArrayList<>(Arrays.asList(mSubscription2, removedSubscription, mSubscription4)); + + setMockProxyDeleteResponse(true); + setLoadWithPrefixMockResponse(localSubscriptions); + + mSubscriptionsManager.setRemoteSubscriptionsForTesting(remoteSubscriptions); + Callback<Integer> subsCallback = Mockito.mock(Callback.class); + + // Call unsubscribe and verify the result. + mSubscriptionsManager.unsubscribe(removedSubscription, subsCallback); + verify(subsCallback, times(1)).onResult(SubscriptionsManager.StatusCode.OK); + + ArgumentCaptor<CommerceSubscription> storageSaveCaptor = + ArgumentCaptor.forClass(CommerceSubscription.class); + verify(mStorage, never()).save(storageSaveCaptor.capture()); + + ArgumentCaptor<CommerceSubscription> storageDeleteCaptor = + ArgumentCaptor.forClass(CommerceSubscription.class); + verify(mStorage, times(1)).delete(storageDeleteCaptor.capture()); + System.out.println(storageDeleteCaptor.getAllValues()); + + List<CommerceSubscription> subscriptionsToDelete = storageDeleteCaptor.getAllValues(); + Collections.sort(subscriptionsToDelete, new SubscriptionsComparator()); + + assertEquals(new ArrayList<>(Arrays.asList(removedSubscription)), subscriptionsToDelete); + } + + @MediumTest + @Test + public void testUnsubscribeNop() { + mSubscriptionsManager.setCanHandlerequests(true); + List<CommerceSubscription> localSubscriptions = + new ArrayList<>(Arrays.asList(mSubscription2, mSubscription3)); + + setLoadWithPrefixMockResponse(localSubscriptions); + + Callback<Integer> subsCallback = Mockito.mock(Callback.class); + mSubscriptionsManager.unsubscribe(mSubscription4, subsCallback); + + ArgumentCaptor<List<CommerceSubscription>> subscriptionsToDeleteCaptor = + ArgumentCaptor.forClass(List.class); + verify(mProxy, never()).delete(subscriptionsToDeleteCaptor.capture(), any(Callback.class)); + } + + @MediumTest + @Test + public void testUnsubscribeDeleteIfInCache() { + mSubscriptionsManager.setCanHandlerequests(true); + List<CommerceSubscription> localSubscriptions = + new ArrayList<>(Arrays.asList(mSubscription2, mSubscription3)); + + setLoadWithPrefixMockResponse(localSubscriptions); + + Callback<Integer> subsCallback = Mockito.mock(Callback.class); + mSubscriptionsManager.unsubscribe(mSubscription2, subsCallback); + + ArgumentCaptor<List<CommerceSubscription>> subscriptionsToDeleteCaptor = + ArgumentCaptor.forClass(List.class); + verify(mProxy, times(1)).delete(subscriptionsToDeleteCaptor.capture(), any(Callback.class)); + assertEquals(new ArrayList<>(Arrays.asList(mSubscription2)), + subscriptionsToDeleteCaptor.getValue()); + } + + @MediumTest + @Test + public void testGetLocalSubscriptions() { + mSubscriptionsManager.setCanHandlerequests(true); + List<CommerceSubscription> localSubscriptions = + new ArrayList<>(Arrays.asList(mSubscription1, mSubscription2)); + + setLoadWithPrefixMockResponse(localSubscriptions); + + Callback<List<CommerceSubscription>> getSubscriptionsCallback = + Mockito.mock(Callback.class); + mSubscriptionsManager.getSubscriptions( + CommerceSubscription.CommerceSubscriptionType.PRICE_TRACK, false, + getSubscriptionsCallback); + + ArgumentCaptor<List<CommerceSubscription>> resultCaptor = + ArgumentCaptor.forClass(List.class); + verify(getSubscriptionsCallback, times(1)).onResult(resultCaptor.capture()); + + Collections.sort(resultCaptor.getValue(), new SubscriptionsComparator()); + Collections.sort(localSubscriptions, new SubscriptionsComparator()); + assertEquals(localSubscriptions, resultCaptor.getValue()); + } + + @MediumTest + @Test + public void testIsSubscribedDifferentTrackingIdType() { + mSubscriptionsManager.setCanHandlerequests(true); + List<CommerceSubscription> localSubscriptions = + new ArrayList<>(Arrays.asList(mSubscription2)); + + setLoadWithPrefixMockResponse(localSubscriptions); + + CommerceSubscription subscriptionToCheck = + new CommerceSubscription(CommerceSubscription.CommerceSubscriptionType.PRICE_TRACK, + mSubscription1.getTrackingId(), mSubscription1.getType(), + CommerceSubscription.TrackingIdType.PRODUCT_CLUSTER_ID); + + Callback<Boolean> isSubscribedCallback = Mockito.mock(Callback.class); + mSubscriptionsManager.isSubscribed(subscriptionToCheck, isSubscribedCallback); + + ArgumentCaptor<Boolean> resultCaptor = ArgumentCaptor.forClass(Boolean.class); + verify(isSubscribedCallback, times(1)).onResult(resultCaptor.capture()); + assertEquals(false, resultCaptor.getValue()); + } + + @MediumTest + @Test + public void testIsSubscribedDifferentTimestamps() { + mSubscriptionsManager.setCanHandlerequests(true); + CommerceSubscription subscription3 = + new CommerceSubscription(CommerceSubscription.CommerceSubscriptionType.PRICE_TRACK, + mSubscription1.getTrackingId(), mSubscription1.getType(), + mSubscription1.getTrackingIdType(), 1234L); + List<CommerceSubscription> localSubscriptions = + new ArrayList<>(Arrays.asList(mSubscription1, subscription3)); + + setLoadWithPrefixMockResponse(localSubscriptions); + + CommerceSubscription subscriptionToCheck = + new CommerceSubscription(CommerceSubscription.CommerceSubscriptionType.PRICE_TRACK, + mSubscription1.getTrackingId(), mSubscription1.getType(), + mSubscription1.getTrackingIdType(), 222L); + + Callback<Boolean> isSubscribedCallback = Mockito.mock(Callback.class); + mSubscriptionsManager.isSubscribed(subscriptionToCheck, isSubscribedCallback); + + ArgumentCaptor<Boolean> resultCaptor = ArgumentCaptor.forClass(Boolean.class); + verify(isSubscribedCallback, times(1)).onResult(resultCaptor.capture()); + assertEquals(true, resultCaptor.getValue()); + } + + @MediumTest + @Test + public void testIsSubscribed() { + mSubscriptionsManager.setCanHandlerequests(true); + List<CommerceSubscription> localSubscriptions = + new ArrayList<>(Arrays.asList(mSubscription1, mSubscription2)); + + setLoadWithPrefixMockResponse(localSubscriptions); + + CommerceSubscription subscriptionToCheck = + new CommerceSubscription(CommerceSubscription.CommerceSubscriptionType.PRICE_TRACK, + mSubscription1.getTrackingId(), mSubscription1.getType(), + mSubscription1.getTrackingIdType()); + + Callback<Boolean> isSubscribedCallback = Mockito.mock(Callback.class); + mSubscriptionsManager.isSubscribed(subscriptionToCheck, isSubscribedCallback); + + ArgumentCaptor<Boolean> resultCaptor = ArgumentCaptor.forClass(Boolean.class); + verify(isSubscribedCallback, times(1)).onResult(resultCaptor.capture()); + assertEquals(true, resultCaptor.getValue()); + } + + @MediumTest + @Test + public void testOnIdentityChanged_AccountCleared() { + // Fetch subscriptions when SubscriptionManager is created. + verify(mStorage, times(1)).deleteAll(); + verify(mProxy, times(1)) + .get(eq(CommerceSubscription.CommerceSubscriptionType.PRICE_TRACK), + any(Callback.class)); + + // Simulate user signs out. We should delete local storage but not fetch data from server. + PriceTrackingFeatures.setIsSignedInAndSyncEnabledForTesting(false); + mSubscriptionsManager.onIdentityChanged(); + verify(mStorage, times(2)).deleteAll(); + verify(mProxy, times(1)) + .get(eq(CommerceSubscription.CommerceSubscriptionType.PRICE_TRACK), + any(Callback.class)); + verify(mProxy, times(0)).queryAndUpdateWaaEnabled(); + } + + @MediumTest + @Test + public void testOnIdentityChanged_AccountChanged() { + // Fetch subscriptions when SubscriptionManager is created. + verify(mStorage, times(1)).deleteAll(); + verify(mProxy, times(1)) + .get(eq(CommerceSubscription.CommerceSubscriptionType.PRICE_TRACK), + any(Callback.class)); + + // Simulate user switches account. We should delete local storage and also fetch new data + // from server. + PriceTrackingFeatures.setIsSignedInAndSyncEnabledForTesting(true); + mSubscriptionsManager.onIdentityChanged(); + verify(mStorage, times(3)).deleteAll(); + verify(mProxy, times(2)) + .get(eq(CommerceSubscription.CommerceSubscriptionType.PRICE_TRACK), + any(Callback.class)); + verify(mProxy, times(1)).queryAndUpdateWaaEnabled(); + } + + private void setLoadWithPrefixMockResponse(List<CommerceSubscription> subscriptions) { + doAnswer(new Answer<Void>() { + @Override + public Void answer(InvocationOnMock invocation) { + Callback callback = (Callback) invocation.getArguments()[1]; + callback.onResult(subscriptions); + return null; + } + }) + .when(mStorage) + .loadWithPrefix(any(String.class), any(Callback.class)); + } + + private void setMockProxyCreateResponse(boolean expectedResult) { + doAnswer(new Answer<Void>() { + @Override + public Void answer(InvocationOnMock invocation) { + Callback callback = (Callback) invocation.getArguments()[1]; + callback.onResult(expectedResult); + return null; + } + }) + .when(mProxy) + .create(any(List.class), any(Callback.class)); + } + + private void setMockProxyDeleteResponse(boolean expectedResult) { + doAnswer(new Answer<Void>() { + @Override + public Void answer(InvocationOnMock invocation) { + Callback callback = (Callback) invocation.getArguments()[1]; + callback.onResult(expectedResult); + return null; + } + }) + .when(mProxy) + .delete(any(List.class), any(Callback.class)); + } + + private void printList(List<CommerceSubscription> list) { + for (CommerceSubscription ss : list) { + System.out.println(ss.getTrackingId()); + } + } +}
diff --git a/chrome/browser/commerce/subscriptions/test/android/test_java_sources.gni b/chrome/browser/commerce/subscriptions/test/android/test_java_sources.gni index afb59c2..4b0514b 100644 --- a/chrome/browser/commerce/subscriptions/test/android/test_java_sources.gni +++ b/chrome/browser/commerce/subscriptions/test/android/test_java_sources.gni
@@ -5,9 +5,11 @@ # TODO(crbug/1210158): This should be a separate build target when circular # dependencies are removed. commerce_subscriptions_junit_test_sources = [ + "//chrome/browser/commerce/subscriptions/test/android/java/src/org/chromium/chrome/browser/subscriptions/CommerceSubscriptionJsonSerializerUnitTest.java", "//chrome/browser/commerce/subscriptions/test/android/java/src/org/chromium/chrome/browser/subscriptions/CommerceSubscriptionsServiceFactoryUnitTest.java", "//chrome/browser/commerce/subscriptions/test/android/java/src/org/chromium/chrome/browser/subscriptions/CommerceSubscriptionsServiceUnitTest.java", "//chrome/browser/commerce/subscriptions/test/android/java/src/org/chromium/chrome/browser/subscriptions/ImplicitPriceDropSubscriptionsManagerUnitTest.java", + "//chrome/browser/commerce/subscriptions/test/android/java/src/org/chromium/chrome/browser/subscriptions/SubscriptionsManagerImplTest.java", ] commerce_subscriptions_junit_test_deps = [ @@ -33,3 +35,29 @@ "//url:gurl_java", "//url:gurl_junit_test_support", ] + +commerce_subscriptions_java_test_sources = [ + "//chrome/browser/commerce/subscriptions/test/android/java/src/org/chromium/chrome/browser/subscriptions/CommerceSubscriptionsServiceProxyUnitTest.java", + "//chrome/browser/commerce/subscriptions/test/android/java/src/org/chromium/chrome/browser/subscriptions/CommerceSubscriptionsStorageTest.java", + "//chrome/browser/commerce/subscriptions/test/android/java/src/org/chromium/chrome/browser/subscriptions/SubscriptionsLoadCallbackHelper.java", +] + +commerce_subscriptions_java_test_deps = [ + "//base:base_java", + "//base:base_java_test_support", + "//base:jni_java", + "//build/android:build_java", + "//chrome/android:base_module_java", + "//chrome/browser/android/lifecycle:java", + "//chrome/browser/endpoint_fetcher:java", + "//chrome/browser/flags:java", + "//chrome/browser/profiles/android:java", + "//chrome/browser/tabmodel:java", + "//chrome/test/android:chrome_java_integration_test_support", + "//content/public/test/android:content_java_test_support", + "//third_party/androidx:androidx_test_core_java", + "//third_party/androidx:androidx_test_runner_java", + "//third_party/hamcrest:hamcrest_java", + "//third_party/junit", + "//third_party/mockito:mockito_java", +]
diff --git a/chrome/browser/extensions/api/BUILD.gn b/chrome/browser/extensions/api/BUILD.gn index 4c418db8..e995542f 100644 --- a/chrome/browser/extensions/api/BUILD.gn +++ b/chrome/browser/extensions/api/BUILD.gn
@@ -34,6 +34,11 @@ if (enable_pdf) { public_deps += [ "//chrome/browser/extensions/api/pdf_viewer_private" ] } + + if (is_chromeos) { + public_deps += + [ "//chrome/browser/chromeos/extensions/smart_card_provider_private" ] + } } # The step necessary to generate the code to register the corresponding
diff --git a/chrome/browser/page_load_metrics/observers/media_page_load_metrics_observer.cc b/chrome/browser/page_load_metrics/observers/media_page_load_metrics_observer.cc deleted file mode 100644 index 9f319c7..0000000 --- a/chrome/browser/page_load_metrics/observers/media_page_load_metrics_observer.cc +++ /dev/null
@@ -1,109 +0,0 @@ -// Copyright 2017 The Chromium Authors -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#include "chrome/browser/page_load_metrics/observers/media_page_load_metrics_observer.h" - -#include "components/page_load_metrics/browser/page_load_metrics_util.h" -#include "components/page_load_metrics/common/page_load_timing.h" - -namespace { - -const char kHistogramMediaPageLoadNetworkBytes[] = - "PageLoad.Clients.MediaPageLoad2.Experimental.Bytes.Network"; -const char kHistogramMediaPageLoadCacheBytes[] = - "PageLoad.Clients.MediaPageLoad2.Experimental.Bytes.Cache2"; -const char kHistogramMediaPageLoadTotalBytes[] = - "PageLoad.Clients.MediaPageLoad2.Experimental.Bytes.Total2"; - -} // namespace - -MediaPageLoadMetricsObserver::MediaPageLoadMetricsObserver() - : cache_bytes_(0), network_bytes_(0), played_media_(false) {} - -MediaPageLoadMetricsObserver::~MediaPageLoadMetricsObserver() = default; - -const char* MediaPageLoadMetricsObserver::GetObserverName() const { - static const char kName[] = "MediaPageLoadMetricsObserver"; - return kName; -} - -page_load_metrics::PageLoadMetricsObserver::ObservePolicy -MediaPageLoadMetricsObserver::OnFencedFramesStart( - content::NavigationHandle* navigation_handle, - const GURL& currently_committed_url) { - // This class needs forwarding for the events MediaStartedPlaying. - return FORWARD_OBSERVING; -} - -page_load_metrics::PageLoadMetricsObserver::ObservePolicy -MediaPageLoadMetricsObserver::OnPrerenderStart( - content::NavigationHandle* navigation_handle, - const GURL& currently_committed_url) { - // Records if prerendered page is activated. - return CONTINUE_OBSERVING; -} - -void MediaPageLoadMetricsObserver::OnResourceDataUseObserved( - content::RenderFrameHost* rfh, - const std::vector<page_load_metrics::mojom::ResourceDataUpdatePtr>& - resources) { - for (auto const& resource : resources) { - if (resource->is_complete) { - if (resource->cache_type == - page_load_metrics::mojom::CacheType::kNotCached) - network_bytes_ += resource->encoded_body_length; - else - cache_bytes_ += resource->encoded_body_length; - } - } -} - -page_load_metrics::PageLoadMetricsObserver::ObservePolicy -MediaPageLoadMetricsObserver::FlushMetricsOnAppEnterBackground( - const page_load_metrics::mojom::PageLoadTiming& timing) { - // FlushMetricsOnAppEnterBackground is invoked on Android in cases where the - // app is about to be backgrounded, as part of the Activity.onPause() - // flow. After this method is invoked, Chrome may be killed without further - // notification, so we record final metrics collected up to this point. - if (!GetDelegate().DidCommit()) - return STOP_OBSERVING; - if (GetDelegate().GetPrerenderingState() == - page_load_metrics::PrerenderingState::kInPrerendering) - return STOP_OBSERVING; - if (!played_media_) - return STOP_OBSERVING; - - RecordByteHistograms(); - return STOP_OBSERVING; -} - -void MediaPageLoadMetricsObserver::OnComplete( - const page_load_metrics::mojom::PageLoadTiming& timing) { - if (GetDelegate().GetPrerenderingState() == - page_load_metrics::PrerenderingState::kInPrerendering) - return; - if (!played_media_) - return; - RecordByteHistograms(); -} - -void MediaPageLoadMetricsObserver::MediaStartedPlaying( - const content::WebContentsObserver::MediaPlayerInfo& video_type, - content::RenderFrameHost* render_frame_host) { - if (played_media_) - return; - // Track media (audio or video) in all frames of the page load. - played_media_ = true; -} - -void MediaPageLoadMetricsObserver::RecordByteHistograms() { - DCHECK_NE(GetDelegate().GetPrerenderingState(), - page_load_metrics::PrerenderingState::kInPrerendering); - DCHECK(played_media_); - - PAGE_BYTES_HISTOGRAM(kHistogramMediaPageLoadNetworkBytes, network_bytes_); - PAGE_BYTES_HISTOGRAM(kHistogramMediaPageLoadCacheBytes, cache_bytes_); - PAGE_BYTES_HISTOGRAM(kHistogramMediaPageLoadTotalBytes, - network_bytes_ + cache_bytes_); -}
diff --git a/chrome/browser/page_load_metrics/observers/media_page_load_metrics_observer.h b/chrome/browser/page_load_metrics/observers/media_page_load_metrics_observer.h deleted file mode 100644 index 8404817f..0000000 --- a/chrome/browser/page_load_metrics/observers/media_page_load_metrics_observer.h +++ /dev/null
@@ -1,59 +0,0 @@ -// Copyright 2017 The Chromium Authors -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef CHROME_BROWSER_PAGE_LOAD_METRICS_OBSERVERS_MEDIA_PAGE_LOAD_METRICS_OBSERVER_H_ -#define CHROME_BROWSER_PAGE_LOAD_METRICS_OBSERVERS_MEDIA_PAGE_LOAD_METRICS_OBSERVER_H_ - -#include <stdint.h> - -#include "components/page_load_metrics/browser/page_load_metrics_observer.h" -#include "content/public/browser/web_contents_observer.h" - -// Observer responsible for recording metrics on pages that play at least one -// MEDIA request. -class MediaPageLoadMetricsObserver - : public page_load_metrics::PageLoadMetricsObserver { - public: - MediaPageLoadMetricsObserver(); - - MediaPageLoadMetricsObserver(const MediaPageLoadMetricsObserver&) = delete; - MediaPageLoadMetricsObserver& operator=(const MediaPageLoadMetricsObserver&) = - delete; - - ~MediaPageLoadMetricsObserver() override; - - // page_load_metrics::PageLoadMetricsObserver: - const char* GetObserverName() const override; - ObservePolicy OnFencedFramesStart( - content::NavigationHandle* navigation_handle, - const GURL& currently_committed_url) override; - ObservePolicy OnPrerenderStart(content::NavigationHandle* navigation_handle, - const GURL& currently_committed_url) override; - void OnComplete( - const page_load_metrics::mojom::PageLoadTiming& timing) override; - page_load_metrics::PageLoadMetricsObserver::ObservePolicy - FlushMetricsOnAppEnterBackground( - const page_load_metrics::mojom::PageLoadTiming& timing) override; - void OnResourceDataUseObserved( - content::RenderFrameHost* rfh, - const std::vector<page_load_metrics::mojom::ResourceDataUpdatePtr>& - resources) override; - void MediaStartedPlaying( - const content::WebContentsObserver::MediaPlayerInfo& video_type, - content::RenderFrameHost* render_frame_host) override; - - private: - // Records histograms for byte information. - void RecordByteHistograms(); - - // The number of body (not header) prefilter bytes consumed by requests for - // the page. - int64_t cache_bytes_; - int64_t network_bytes_; - - // Whether the page load played a media element. - bool played_media_; -}; - -#endif // CHROME_BROWSER_PAGE_LOAD_METRICS_OBSERVERS_MEDIA_PAGE_LOAD_METRICS_OBSERVER_H_
diff --git a/chrome/browser/page_load_metrics/observers/media_page_load_metrics_observer_unittest.cc b/chrome/browser/page_load_metrics/observers/media_page_load_metrics_observer_unittest.cc deleted file mode 100644 index 863c448..0000000 --- a/chrome/browser/page_load_metrics/observers/media_page_load_metrics_observer_unittest.cc +++ /dev/null
@@ -1,204 +0,0 @@ -// Copyright 2017 The Chromium Authors -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#include "chrome/browser/page_load_metrics/observers/media_page_load_metrics_observer.h" - -#include <memory> - -#include "base/test/metrics/histogram_tester.h" -#include "base/time/time.h" -#include "chrome/browser/page_load_metrics/observers/page_load_metrics_observer_test_harness.h" -#include "components/page_load_metrics/browser/page_load_metrics_observer.h" -#include "components/page_load_metrics/browser/page_load_tracker.h" -#include "components/page_load_metrics/common/page_load_metrics.mojom.h" -#include "components/page_load_metrics/common/page_load_timing.h" -#include "components/page_load_metrics/common/test/page_load_metrics_test_util.h" -#include "content/public/browser/web_contents.h" -#include "content/public/test/navigation_simulator.h" -#include "third_party/blink/public/common/loader/loading_behavior_flag.h" -#include "url/gurl.h" - -namespace { - -const char kDefaultTestUrl[] = "https://google.com"; - -} // namespace - -class MediaPageLoadMetricsObserverTest - : public page_load_metrics::PageLoadMetricsObserverTestHarness { - public: - MediaPageLoadMetricsObserverTest() {} - - MediaPageLoadMetricsObserverTest(const MediaPageLoadMetricsObserverTest&) = - delete; - MediaPageLoadMetricsObserverTest& operator=( - const MediaPageLoadMetricsObserverTest&) = delete; - - ~MediaPageLoadMetricsObserverTest() override = default; - - void ResetTest() { - page_load_metrics::InitPageLoadTimingForTest(&timing_); - // Reset to the default testing state. Does not reset histogram state. - timing_.navigation_start = base::Time::FromDoubleT(1); - timing_.response_start = base::Seconds(2); - timing_.parse_timing->parse_start = base::Seconds(3); - timing_.paint_timing->first_contentful_paint = base::Seconds(4); - timing_.paint_timing->first_image_paint = base::Seconds(5); - timing_.document_timing->load_event_start = base::Seconds(7); - PopulateRequiredTimingFields(&timing_); - - network_bytes_ = 0; - cache_bytes_ = 0; - } - - void SimulateEvents(content::RenderFrameHost* rfh, - bool simulate_play_media, - bool simulate_app_background) { - if (simulate_play_media) - tester()->SimulateMediaPlayed(rfh); - - tester()->SimulateTimingUpdate(timing_); - - auto resources = - GetSampleResourceDataUpdateForTesting(10 * 1024 /* resource_size */); - tester()->SimulateResourceDataUseUpdate(resources); - for (const auto& resource : resources) { - if (resource->is_complete) { - if (resource->cache_type == - page_load_metrics::mojom::CacheType::kNotCached) - network_bytes_ += resource->encoded_body_length; - else - cache_bytes_ += resource->encoded_body_length; - } - } - - if (simulate_app_background) { - // The histograms should be logged when the app is backgrounded. - tester()->SimulateAppEnterBackground(); - } else { - tester()->NavigateToUntrackedUrl(); - } - } - - protected: - void RegisterObservers(page_load_metrics::PageLoadTracker* tracker) override { - tracker->AddObserver(std::make_unique<MediaPageLoadMetricsObserver>()); - } - - // Simulated byte usage since the last time the test was reset. - int64_t network_bytes_; - int64_t cache_bytes_; - - private: - page_load_metrics::mojom::PageLoadTiming timing_; -}; - -TEST_F(MediaPageLoadMetricsObserverTest, MediaNotPlayed) { - ResetTest(); - - NavigateAndCommit(GURL(kDefaultTestUrl)); - content::RenderFrameHost* mainframe = web_contents()->GetPrimaryMainFrame(); - - SimulateEvents(mainframe, false /* simulate_play_media */, - false /* simulate_app_background */); - - tester()->histogram_tester().ExpectTotalCount( - "PageLoad.Clients.MediaPageLoad2.Experimental.Bytes.Network", 0); - tester()->histogram_tester().ExpectTotalCount( - "PageLoad.Clients.MediaPageLoad2.Experimental.Bytes.Cache2", 0); - tester()->histogram_tester().ExpectTotalCount( - "PageLoad.Clients.MediaPageLoad2.Experimental.Bytes.Total2", 0); -} - -TEST_F(MediaPageLoadMetricsObserverTest, MediaPlayed) { - ResetTest(); - - NavigateAndCommit(GURL(kDefaultTestUrl)); - content::RenderFrameHost* mainframe = web_contents()->GetPrimaryMainFrame(); - - SimulateEvents(mainframe, true /* simulate_play_media */, - false /* simulate_app_background */); - - tester()->histogram_tester().ExpectUniqueSample( - "PageLoad.Clients.MediaPageLoad2.Experimental.Bytes.Network", - static_cast<int>(network_bytes_ / 1024), 1); - tester()->histogram_tester().ExpectUniqueSample( - "PageLoad.Clients.MediaPageLoad2.Experimental.Bytes.Cache2", - static_cast<int>(cache_bytes_ / 1024), 1); - tester()->histogram_tester().ExpectUniqueSample( - "PageLoad.Clients.MediaPageLoad2.Experimental.Bytes.Total2", - static_cast<int>((network_bytes_ + cache_bytes_) / 1024), 1); -} - -TEST_F(MediaPageLoadMetricsObserverTest, MediaPlayedAppBackground) { - ResetTest(); - - NavigateAndCommit(GURL(kDefaultTestUrl)); - content::RenderFrameHost* mainframe = web_contents()->GetPrimaryMainFrame(); - - SimulateEvents(mainframe, true /* simulate_play_media */, - true /* simulate_app_background */); - - tester()->histogram_tester().ExpectUniqueSample( - "PageLoad.Clients.MediaPageLoad2.Experimental.Bytes.Network", - static_cast<int>(network_bytes_ / 1024), 1); - tester()->histogram_tester().ExpectUniqueSample( - "PageLoad.Clients.MediaPageLoad2.Experimental.Bytes.Cache2", - static_cast<int>(cache_bytes_ / 1024), 1); - tester()->histogram_tester().ExpectUniqueSample( - "PageLoad.Clients.MediaPageLoad2.Experimental.Bytes.Total2", - static_cast<int>((network_bytes_ + cache_bytes_) / 1024), 1); -} - -TEST_F(MediaPageLoadMetricsObserverTest, MediaPlayedInSubframe) { - ResetTest(); - - NavigateAndCommit(GURL(kDefaultTestUrl)); - content::RenderFrameHost* mainframe = web_contents()->GetPrimaryMainFrame(); - content::RenderFrameHost* subframe = - content::RenderFrameHostTester::For(mainframe)->AppendChild("subframe"); - std::unique_ptr<content::NavigationSimulator> simulator = - content::NavigationSimulator::CreateRendererInitiated( - GURL(kDefaultTestUrl), subframe); - simulator->Commit(); - - SimulateEvents(subframe, true /* simulate_play_media */, - false /* simulate_app_background */); - - tester()->histogram_tester().ExpectUniqueSample( - "PageLoad.Clients.MediaPageLoad2.Experimental.Bytes.Network", - static_cast<int>(network_bytes_ / 1024), 1); - tester()->histogram_tester().ExpectUniqueSample( - "PageLoad.Clients.MediaPageLoad2.Experimental.Bytes.Cache2", - static_cast<int>(cache_bytes_ / 1024), 1); - tester()->histogram_tester().ExpectUniqueSample( - "PageLoad.Clients.MediaPageLoad2.Experimental.Bytes.Total2", - static_cast<int>((network_bytes_ + cache_bytes_) / 1024), 1); -} - -TEST_F(MediaPageLoadMetricsObserverTest, MediaPlayedInFencedFrame) { - ResetTest(); - - NavigateAndCommit(GURL(kDefaultTestUrl)); - content::RenderFrameHost* mainframe = web_contents()->GetPrimaryMainFrame(); - content::RenderFrameHost* subframe = - content::RenderFrameHostTester::For(mainframe)->AppendFencedFrame(); - std::unique_ptr<content::NavigationSimulator> simulator = - content::NavigationSimulator::CreateRendererInitiated( - GURL(kDefaultTestUrl), subframe); - simulator->Commit(); - - SimulateEvents(subframe, true /* simulate_play_media */, - false /* simulate_app_background */); - - tester()->histogram_tester().ExpectUniqueSample( - "PageLoad.Clients.MediaPageLoad2.Experimental.Bytes.Network", - static_cast<int>(network_bytes_ / 1024), 1); - tester()->histogram_tester().ExpectUniqueSample( - "PageLoad.Clients.MediaPageLoad2.Experimental.Bytes.Cache2", - static_cast<int>(cache_bytes_ / 1024), 1); - tester()->histogram_tester().ExpectUniqueSample( - "PageLoad.Clients.MediaPageLoad2.Experimental.Bytes.Total2", - static_cast<int>((network_bytes_ + cache_bytes_) / 1024), 1); -}
diff --git a/chrome/browser/page_load_metrics/observers/tab_restore_page_load_metrics_observer.cc b/chrome/browser/page_load_metrics/observers/tab_restore_page_load_metrics_observer.cc deleted file mode 100644 index 096fdb3..0000000 --- a/chrome/browser/page_load_metrics/observers/tab_restore_page_load_metrics_observer.cc +++ /dev/null
@@ -1,111 +0,0 @@ -// Copyright 2017 The Chromium Authors -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#include "chrome/browser/page_load_metrics/observers/tab_restore_page_load_metrics_observer.h" - -#include <string> - -#include "base/metrics/histogram_macros.h" -#include "components/page_load_metrics/browser/page_load_metrics_util.h" -#include "content/public/browser/navigation_controller.h" -#include "content/public/browser/navigation_entry.h" -#include "content/public/browser/navigation_handle.h" -#include "content/public/browser/restore_type.h" -#include "content/public/browser/web_contents.h" -#include "ui/base/page_transition_types.h" - -namespace { - -const char kHistogramTabRestoreNetworkBytes[] = - "PageLoad.Clients.TabRestore.Experimental.Bytes.Network"; -const char kHistogramTabRestoreCacheBytes[] = - "PageLoad.Clients.TabRestore.Experimental.Bytes.Cache"; -const char kHistogramTabRestoreTotalBytes[] = - "PageLoad.Clients.TabRestore.Experimental.Bytes.Total"; - -} // namespace - -TabRestorePageLoadMetricsObserver::TabRestorePageLoadMetricsObserver() - : cache_bytes_(0), network_bytes_(0) {} - -TabRestorePageLoadMetricsObserver::~TabRestorePageLoadMetricsObserver() {} - -page_load_metrics::PageLoadMetricsObserver::ObservePolicy -TabRestorePageLoadMetricsObserver::OnStart( - content::NavigationHandle* navigation_handle, - const GURL& currently_committed_url, - bool started_in_foreground) { - return IsTabRestore(navigation_handle) ? CONTINUE_OBSERVING : STOP_OBSERVING; -} - -page_load_metrics::PageLoadMetricsObserver::ObservePolicy -TabRestorePageLoadMetricsObserver::OnFencedFramesStart( - content::NavigationHandle* navigation_handle, - const GURL& currently_committed_url) { - // This class is interested only in the primary page's performance to - // report at OnComplete or FlushMetricsOnAppEnterBackground. Events for - // OnResourceDataUseObserved are forwarded at PageLoadTracker and observer - // doesn't need to forward it. - return STOP_OBSERVING; -} - -page_load_metrics::PageLoadMetricsObserver::ObservePolicy -TabRestorePageLoadMetricsObserver::OnPrerenderStart( - content::NavigationHandle* navigation_handle, - const GURL& currently_committed_url) { - // This class is interested in performance on tab restoration. Prerendering - // doesn't occur in such a case. - return STOP_OBSERVING; -} - -void TabRestorePageLoadMetricsObserver::OnResourceDataUseObserved( - content::RenderFrameHost* rfh, - const std::vector<page_load_metrics::mojom::ResourceDataUpdatePtr>& - resources) { - for (auto const& resource : resources) { - if (resource->is_complete) { - if (resource->cache_type == - page_load_metrics::mojom::CacheType::kNotCached) - network_bytes_ += resource->encoded_body_length; - else - cache_bytes_ += resource->encoded_body_length; - } - } -} - -page_load_metrics::PageLoadMetricsObserver::ObservePolicy -TabRestorePageLoadMetricsObserver::FlushMetricsOnAppEnterBackground( - const page_load_metrics::mojom::PageLoadTiming& timing) { - // FlushMetricsOnAppEnterBackground is invoked on Android in cases where the - // app is about to be backgrounded, as part of the Activity.onPause() - // flow. After this method is invoked, Chrome may be killed without further - // notification, so we record final metrics collected up to this point. - if (GetDelegate().DidCommit()) { - RecordByteHistograms(); - } - return STOP_OBSERVING; -} - -void TabRestorePageLoadMetricsObserver::OnComplete( - const page_load_metrics::mojom::PageLoadTiming& timing) { - RecordByteHistograms(); -} - -void TabRestorePageLoadMetricsObserver::RecordByteHistograms() { - PAGE_BYTES_HISTOGRAM(kHistogramTabRestoreNetworkBytes, network_bytes_); - PAGE_BYTES_HISTOGRAM(kHistogramTabRestoreCacheBytes, cache_bytes_); - PAGE_BYTES_HISTOGRAM(kHistogramTabRestoreTotalBytes, - network_bytes_ + cache_bytes_); -} - -bool TabRestorePageLoadMetricsObserver::IsTabRestore( - content::NavigationHandle* navigation_handle) { - // Only count restored tabs, and eliminate forward-back navigations, as - // restored tab history is considered a restored navigation until they are - // loaded the first time. - return navigation_handle->GetRestoreType() == - content::RestoreType::kRestored && - !(navigation_handle->GetPageTransition() & - ui::PAGE_TRANSITION_FORWARD_BACK); -}
diff --git a/chrome/browser/page_load_metrics/observers/tab_restore_page_load_metrics_observer.h b/chrome/browser/page_load_metrics/observers/tab_restore_page_load_metrics_observer.h deleted file mode 100644 index 94b5b895..0000000 --- a/chrome/browser/page_load_metrics/observers/tab_restore_page_load_metrics_observer.h +++ /dev/null
@@ -1,66 +0,0 @@ -// Copyright 2017 The Chromium Authors -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef CHROME_BROWSER_PAGE_LOAD_METRICS_OBSERVERS_TAB_RESTORE_PAGE_LOAD_METRICS_OBSERVER_H_ -#define CHROME_BROWSER_PAGE_LOAD_METRICS_OBSERVERS_TAB_RESTORE_PAGE_LOAD_METRICS_OBSERVER_H_ - -#include <stdint.h> - -#include "components/page_load_metrics/browser/page_load_metrics_observer.h" - -namespace content { -class NavigationHandle; -} - -// Observer responsible for recording core page load metrics relevant to -// restored tabs. -class TabRestorePageLoadMetricsObserver - : public page_load_metrics::PageLoadMetricsObserver { - public: - TabRestorePageLoadMetricsObserver(); - - TabRestorePageLoadMetricsObserver(const TabRestorePageLoadMetricsObserver&) = - delete; - TabRestorePageLoadMetricsObserver& operator=( - const TabRestorePageLoadMetricsObserver&) = delete; - - ~TabRestorePageLoadMetricsObserver() override; - - // page_load_metrics::PageLoadMetricsObserver: - page_load_metrics::PageLoadMetricsObserver::ObservePolicy OnStart( - content::NavigationHandle* navigation_handle, - const GURL& currently_committed_url, - bool started_in_foreground) override; - page_load_metrics::PageLoadMetricsObserver::ObservePolicy OnFencedFramesStart( - content::NavigationHandle* navigation_handle, - const GURL& currently_committed_url) override; - page_load_metrics::PageLoadMetricsObserver::ObservePolicy OnPrerenderStart( - content::NavigationHandle* navigation_handle, - const GURL& currently_committed_url) override; - void OnComplete( - const page_load_metrics::mojom::PageLoadTiming& timing) override; - void OnResourceDataUseObserved( - content::RenderFrameHost* rfh, - const std::vector<page_load_metrics::mojom::ResourceDataUpdatePtr>& - resources) override; - page_load_metrics::PageLoadMetricsObserver::ObservePolicy - FlushMetricsOnAppEnterBackground( - const page_load_metrics::mojom::PageLoadTiming& timing) override; - - protected: - // Whether the navigation handle is a tab restore. - // Overridden in testing. - virtual bool IsTabRestore(content::NavigationHandle* navigation_handle); - - private: - // Records histograms for byte information. - void RecordByteHistograms(); - - // The number of body (not header) prefilter bytes consumed by requests for - // the page. - int64_t cache_bytes_; - int64_t network_bytes_; -}; - -#endif // CHROME_BROWSER_PAGE_LOAD_METRICS_OBSERVERS_TAB_RESTORE_PAGE_LOAD_METRICS_OBSERVER_H_
diff --git a/chrome/browser/page_load_metrics/observers/tab_restore_page_load_metrics_observer_unittest.cc b/chrome/browser/page_load_metrics/observers/tab_restore_page_load_metrics_observer_unittest.cc deleted file mode 100644 index ead44e4..0000000 --- a/chrome/browser/page_load_metrics/observers/tab_restore_page_load_metrics_observer_unittest.cc +++ /dev/null
@@ -1,153 +0,0 @@ -// Copyright 2016 The Chromium Authors -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#include "chrome/browser/page_load_metrics/observers/tab_restore_page_load_metrics_observer.h" - -#include <memory> -#include <string> - -#include "base/memory/ptr_util.h" -#include "base/test/metrics/histogram_tester.h" -#include "base/time/time.h" -#include "chrome/browser/page_load_metrics/observers/page_load_metrics_observer_test_harness.h" -#include "components/page_load_metrics/browser/page_load_metrics_observer.h" -#include "components/page_load_metrics/browser/page_load_tracker.h" -#include "components/page_load_metrics/common/page_load_metrics.mojom.h" -#include "components/page_load_metrics/common/page_load_timing.h" -#include "components/page_load_metrics/common/test/page_load_metrics_test_util.h" -#include "content/public/browser/restore_type.h" -#include "content/public/browser/web_contents.h" -#include "third_party/abseil-cpp/absl/types/optional.h" -#include "url/gurl.h" - -namespace { - -const char kDefaultTestUrl[] = "https://google.com"; - -class TestTabRestorePageLoadMetricsObserver - : public TabRestorePageLoadMetricsObserver { - public: - explicit TestTabRestorePageLoadMetricsObserver(bool is_restore) - : is_restore_(is_restore) {} - - TestTabRestorePageLoadMetricsObserver( - const TestTabRestorePageLoadMetricsObserver&) = delete; - TestTabRestorePageLoadMetricsObserver& operator=( - const TestTabRestorePageLoadMetricsObserver&) = delete; - - ~TestTabRestorePageLoadMetricsObserver() override {} - - private: - bool IsTabRestore(content::NavigationHandle* navigation_handle) override { - return is_restore_; - } - - const bool is_restore_; -}; - -} // namespace - -class TabRestorePageLoadMetricsObserverTest - : public page_load_metrics::PageLoadMetricsObserverTestHarness { - public: - TabRestorePageLoadMetricsObserverTest() {} - - TabRestorePageLoadMetricsObserverTest( - const TabRestorePageLoadMetricsObserverTest&) = delete; - TabRestorePageLoadMetricsObserverTest& operator=( - const TabRestorePageLoadMetricsObserverTest&) = delete; - - void ResetTest() { - page_load_metrics::InitPageLoadTimingForTest(&timing_); - // Reset to the default testing state. Does not reset histogram state. - timing_.navigation_start = base::Time::FromDoubleT(1); - timing_.response_start = base::Seconds(2); - timing_.parse_timing->parse_start = base::Seconds(3); - timing_.paint_timing->first_contentful_paint = base::Seconds(4); - timing_.paint_timing->first_image_paint = base::Seconds(5); - timing_.document_timing->load_event_start = base::Seconds(7); - PopulateRequiredTimingFields(&timing_); - - network_bytes_ = 0; - cache_bytes_ = 0; - } - - void SimulatePageLoad(bool is_restore, bool simulate_app_background) { - is_restore_ = is_restore; - NavigateAndCommit(GURL(kDefaultTestUrl)); - tester()->SimulateTimingUpdate(timing_); - - auto resources = GetSampleResourceDataUpdateForTesting(10 * 1024); - tester()->SimulateResourceDataUseUpdate(resources); - for (const auto& resource : resources) { - if (resource->is_complete) { - if (resource->cache_type == - page_load_metrics::mojom::CacheType::kNotCached) - network_bytes_ += resource->encoded_body_length; - else - cache_bytes_ += resource->encoded_body_length; - } - } - - if (simulate_app_background) { - // The histograms should be logged when the app is backgrounded. - tester()->SimulateAppEnterBackground(); - } else { - tester()->NavigateToUntrackedUrl(); - } - } - - protected: - void RegisterObservers(page_load_metrics::PageLoadTracker* tracker) override { - tracker->AddObserver(base::WrapUnique( - new TestTabRestorePageLoadMetricsObserver(is_restore_.value()))); - } - - // Simulated byte usage since the last time the test was reset. - int64_t network_bytes_; - int64_t cache_bytes_; - - private: - absl::optional<bool> is_restore_; - page_load_metrics::mojom::PageLoadTiming timing_; -}; - -TEST_F(TabRestorePageLoadMetricsObserverTest, NotRestored) { - ResetTest(); - SimulatePageLoad(false /* is_restore */, false /* simulate_app_background */); - tester()->histogram_tester().ExpectTotalCount( - "PageLoad.Clients.TabRestore.Experimental.Bytes.Network", 0); - tester()->histogram_tester().ExpectTotalCount( - "PageLoad.Clients.TabRestore.Experimental.Bytes.Cache", 0); - tester()->histogram_tester().ExpectTotalCount( - "PageLoad.Clients.TabRestore.Experimental.Bytes.Total", 0); -} - -TEST_F(TabRestorePageLoadMetricsObserverTest, Restored) { - ResetTest(); - SimulatePageLoad(true /* is_restore */, false /* simulate_app_background */); - tester()->histogram_tester().ExpectUniqueSample( - "PageLoad.Clients.TabRestore.Experimental.Bytes.Network", - static_cast<int>(network_bytes_ / 1024), 1); - tester()->histogram_tester().ExpectUniqueSample( - "PageLoad.Clients.TabRestore.Experimental.Bytes.Cache", - static_cast<int>(cache_bytes_ / 1024), 1); - tester()->histogram_tester().ExpectUniqueSample( - "PageLoad.Clients.TabRestore.Experimental.Bytes.Total", - static_cast<int>((network_bytes_ + cache_bytes_) / 1024), 1); -} - -TEST_F(TabRestorePageLoadMetricsObserverTest, RestoredAppBackground) { - ResetTest(); - SimulatePageLoad(true /* is_restore */, true /* simulate_app_background */); - tester()->histogram_tester().ExpectUniqueSample( - "PageLoad.Clients.TabRestore.Experimental.Bytes.Network", - static_cast<int>(network_bytes_ / 1024), 1); - tester()->histogram_tester().ExpectUniqueSample( - "PageLoad.Clients.TabRestore.Experimental.Bytes.Cache", - static_cast<int>(cache_bytes_ / 1024), 1); - tester()->histogram_tester().ExpectUniqueSample( - "PageLoad.Clients.TabRestore.Experimental.Bytes.Total", - static_cast<int>((network_bytes_ + cache_bytes_) / 1024), 1); -}
diff --git a/chrome/browser/page_load_metrics/page_load_metrics_initialize.cc b/chrome/browser/page_load_metrics/page_load_metrics_initialize.cc index f507e3e..eefaf084 100644 --- a/chrome/browser/page_load_metrics/page_load_metrics_initialize.cc +++ b/chrome/browser/page_load_metrics/page_load_metrics_initialize.cc
@@ -24,7 +24,6 @@ #include "chrome/browser/page_load_metrics/observers/live_tab_count_page_load_metrics_observer.h" #include "chrome/browser/page_load_metrics/observers/loading_predictor_page_load_metrics_observer.h" #include "chrome/browser/page_load_metrics/observers/local_network_requests_page_load_metrics_observer.h" -#include "chrome/browser/page_load_metrics/observers/media_page_load_metrics_observer.h" #include "chrome/browser/page_load_metrics/observers/multi_tab_loading_page_load_metrics_observer.h" #include "chrome/browser/page_load_metrics/observers/omnibox_suggestion_used_page_load_metrics_observer.h" #include "chrome/browser/page_load_metrics/observers/optimization_guide_page_load_metrics_observer.h" @@ -36,7 +35,6 @@ #include "chrome/browser/page_load_metrics/observers/security_state_page_load_metrics_observer.h" #include "chrome/browser/page_load_metrics/observers/service_worker_page_load_metrics_observer.h" #include "chrome/browser/page_load_metrics/observers/signed_exchange_page_load_metrics_observer.h" -#include "chrome/browser/page_load_metrics/observers/tab_restore_page_load_metrics_observer.h" #include "chrome/browser/page_load_metrics/observers/third_party_metrics_observer.h" #include "chrome/browser/page_load_metrics/observers/translate_page_load_metrics_observer.h" #include "chrome/browser/page_load_metrics/page_load_metrics_memory_tracker_factory.h" @@ -137,7 +135,6 @@ std::make_unique<PrefetchProxyPageLoadMetricsObserver>()); tracker->AddObserver( std::make_unique<LiveTabCountPageLoadMetricsObserver>()); - tracker->AddObserver(std::make_unique<MediaPageLoadMetricsObserver>()); tracker->AddObserver( std::make_unique<MultiTabLoadingPageLoadMetricsObserver>()); tracker->AddObserver( @@ -150,7 +147,6 @@ std::make_unique<HttpsEngagementPageLoadMetricsObserver>( web_contents()->GetBrowserContext())); tracker->AddObserver(std::make_unique<ProtocolPageLoadMetricsObserver>()); - tracker->AddObserver(std::make_unique<TabRestorePageLoadMetricsObserver>()); std::unique_ptr<page_load_metrics::AdsPageLoadMetricsObserver> ads_observer = page_load_metrics::AdsPageLoadMetricsObserver::CreateIfNeeded(
diff --git a/chrome/browser/password_manager/account_password_store_factory.cc b/chrome/browser/password_manager/account_password_store_factory.cc index eedd023..c152aec 100644 --- a/chrome/browser/password_manager/account_password_store_factory.cc +++ b/chrome/browser/password_manager/account_password_store_factory.cc
@@ -14,6 +14,8 @@ #include "base/memory/weak_ptr.h" #include "build/build_config.h" #include "chrome/browser/browser_process.h" +#include "chrome/browser/password_manager/affiliation_service_factory.h" +#include "chrome/browser/password_manager/affiliations_prefetcher_factory.h" #include "chrome/browser/password_manager/chrome_password_manager_client.h" #include "chrome/browser/password_manager/credentials_cleaner_runner_factory.h" #include "chrome/browser/password_manager/password_reuse_manager_factory.h" @@ -22,6 +24,7 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile_manager.h" #include "components/keyed_service/content/browser_context_dependency_manager.h" +#include "components/password_manager/core/browser/affiliation/affiliations_prefetcher.h" #include "components/password_manager/core/browser/login_database.h" #include "components/password_manager/core/browser/password_manager_constants.h" #include "components/password_manager/core/browser/password_manager_util.h" @@ -51,6 +54,7 @@ #include "chrome/browser/ash/profiles/profile_helper.h" #endif // BUILDFLAG(IS_CHROMEOS_ASH) +using password_manager::AffiliatedMatchHelper; using password_manager::PasswordStore; using password_manager::PasswordStoreInterface; using password_manager::UnsyncedCredentialsDeletionNotifier; @@ -175,7 +179,12 @@ profile))); #endif - ps->Init(profile->GetPrefs(), /*affiliated_match_helper=*/nullptr); + password_manager::AffiliationService* affiliation_service = + AffiliationServiceFactory::GetForProfile(profile); + std::unique_ptr<AffiliatedMatchHelper> affiliated_match_helper = + std::make_unique<AffiliatedMatchHelper>(affiliation_service); + + ps->Init(profile->GetPrefs(), std::move(affiliated_match_helper)); auto network_context_getter = base::BindRepeating( [](Profile* profile) -> network::mojom::NetworkContext* { @@ -188,6 +197,9 @@ CredentialsCleanerRunnerFactory::GetForProfile(profile), ps, profile->GetPrefs(), base::Seconds(60), network_context_getter); + AffiliationsPrefetcherFactory::GetForProfile(profile)->RegisterPasswordStore( + ps.get()); + return ps; }
diff --git a/chrome/browser/policy/policy_value_and_status_aggregator.cc b/chrome/browser/policy/policy_value_and_status_aggregator.cc index ec65d9b..14fcc1e 100644 --- a/chrome/browser/policy/policy_value_and_status_aggregator.cc +++ b/chrome/browser/policy/policy_value_and_status_aggregator.cc
@@ -273,6 +273,9 @@ } void PolicyValueAndStatusAggregator::Refresh() { + for (auto* value_provider : value_providers_unowned_) { + value_provider->Refresh(); + } for (auto& value_provider : value_providers_) { value_provider->Refresh(); }
diff --git a/chrome/browser/policy/profile_policy_connector_unittest.cc b/chrome/browser/policy/profile_policy_connector_unittest.cc index 41469ba..b0f58674 100644 --- a/chrome/browser/policy/profile_policy_connector_unittest.cc +++ b/chrome/browser/policy/profile_policy_connector_unittest.cc
@@ -128,6 +128,11 @@ void TearDown() override { task_environment_.RunUntilIdle(); + + // Some tests override the policy service via this global singleton. Unset + // it here to make sure the cleanup happens. + BrowserPolicyConnectorBase::SetPolicyServiceForTesting(nullptr); + TestingBrowserProcess::GetGlobal()->ShutdownBrowserPolicyConnector(); cloud_policy_manager_->Shutdown(); } @@ -262,8 +267,7 @@ // the local policy provider but never get destroyed until the very end. This // will cause DCHECK failure as the local policy provider observer list is not // clear. - g_browser_process->browser_policy_connector()->SetPolicyServiceForTesting( - &mock_policy_service_); + BrowserPolicyConnectorBase::SetPolicyServiceForTesting(&mock_policy_service_); ProfilePolicyConnector connector; connector.Init(nullptr /* user */, &schema_registry_, cloud_policy_manager_.get(), &cloud_policy_store_,
diff --git a/chrome/browser/policy/status_provider/user_policy_status_provider_lacros.cc b/chrome/browser/policy/status_provider/user_policy_status_provider_lacros.cc index ef2381e..490220723 100644 --- a/chrome/browser/policy/status_provider/user_policy_status_provider_lacros.cc +++ b/chrome/browser/policy/status_provider/user_policy_status_provider_lacros.cc
@@ -9,6 +9,7 @@ #include "chrome/browser/policy/profile_policy_connector.h" #include "chrome/browser/policy/status_provider/status_provider_util.h" #include "chrome/browser/profiles/profile.h" +#include "chromeos/lacros/lacros_service.h" #include "components/policy/core/browser/cloud/message_util.h" #include "components/policy/core/browser/webui/policy_status_provider.h" #include "components/policy/core/common/cloud/cloud_policy_store.h" @@ -18,9 +19,19 @@ UserPolicyStatusProviderLacros::UserPolicyStatusProviderLacros( policy::PolicyLoaderLacros* loader, Profile* profile) - : profile_(profile), loader_(loader) {} + : profile_(profile), loader_(loader) { + auto* lacros_service = chromeos::LacrosService::Get(); + if (lacros_service) { + lacros_service->AddObserver(this); + } +} -UserPolicyStatusProviderLacros::~UserPolicyStatusProviderLacros() = default; +UserPolicyStatusProviderLacros::~UserPolicyStatusProviderLacros() { + auto* lacros_service = chromeos::LacrosService::Get(); + if (lacros_service) { + lacros_service->RemoveObserver(this); + } +} base::Value::Dict UserPolicyStatusProviderLacros::GetStatus() { enterprise_management::PolicyData* policy = loader_->GetPolicyData(); @@ -59,3 +70,17 @@ SetProfileId(&dict, profile_); return dict; } + +void UserPolicyStatusProviderLacros::OnPolicyUpdated( + const std::vector<uint8_t>& policy_fetch_response) { + NotifyStatusChange(); +} + +void UserPolicyStatusProviderLacros::OnPolicyFetchAttempt() { + NotifyStatusChange(); +} + +void UserPolicyStatusProviderLacros::OnComponentPolicyUpdated( + const policy::ComponentPolicyMap& component_policy) { + NotifyStatusChange(); +}
diff --git a/chrome/browser/policy/status_provider/user_policy_status_provider_lacros.h b/chrome/browser/policy/status_provider/user_policy_status_provider_lacros.h index f6bf0ea1..491adf5 100644 --- a/chrome/browser/policy/status_provider/user_policy_status_provider_lacros.h +++ b/chrome/browser/policy/status_provider/user_policy_status_provider_lacros.h
@@ -5,7 +5,9 @@ #ifndef CHROME_BROWSER_POLICY_STATUS_PROVIDER_USER_POLICY_STATUS_PROVIDER_LACROS_H_ #define CHROME_BROWSER_POLICY_STATUS_PROVIDER_USER_POLICY_STATUS_PROVIDER_LACROS_H_ +#include "chromeos/lacros/lacros_service.h" #include "components/policy/core/browser/webui/policy_status_provider.h" +#include "components/policy/core/common/values_util.h" class Profile; @@ -14,7 +16,8 @@ } // namespace policy // A cloud policy status provider for device account. -class UserPolicyStatusProviderLacros : public policy::PolicyStatusProvider { +class UserPolicyStatusProviderLacros : public policy::PolicyStatusProvider, + chromeos::LacrosService::Observer { public: UserPolicyStatusProviderLacros(policy::PolicyLoaderLacros* loader, Profile* profile); @@ -29,6 +32,13 @@ // CloudPolicyCoreStatusProvider implementation. base::Value::Dict GetStatus() override; + // chromeos::LacrosService::Observer implementations. + void OnPolicyUpdated( + const std::vector<uint8_t>& policy_fetch_response) override; + void OnPolicyFetchAttempt() override; + void OnComponentPolicyUpdated( + const policy::ComponentPolicyMap& component_policy) override; + private: raw_ptr<Profile> profile_; raw_ptr<policy::PolicyLoaderLacros> loader_;
diff --git a/chrome/browser/privacy_guide/android/java/src/org/chromium/chrome/browser/privacy_guide/CookiesFragment.java b/chrome/browser/privacy_guide/android/java/src/org/chromium/chrome/browser/privacy_guide/CookiesFragment.java index c396f59..df0302f 100644 --- a/chrome/browser/privacy_guide/android/java/src/org/chromium/chrome/browser/privacy_guide/CookiesFragment.java +++ b/chrome/browser/privacy_guide/android/java/src/org/chromium/chrome/browser/privacy_guide/CookiesFragment.java
@@ -68,7 +68,7 @@ } @CookieControlsMode - int cookieControlsMode = getCookieControlsMode(); + int cookieControlsMode = PrivacyGuideUtils.getCookieControlsMode(); switch (cookieControlsMode) { case CookieControlsMode.INCOGNITO_ONLY: mBlockThirdPartyIncognito.setChecked(true); @@ -89,9 +89,4 @@ UserPrefs.get(Profile.getLastUsedRegularProfile()) .setInteger(PrefNames.COOKIE_CONTROLS_MODE, cookieControlsMode); } - - private @CookieControlsMode int getCookieControlsMode() { - return UserPrefs.get(Profile.getLastUsedRegularProfile()) - .getInteger(PrefNames.COOKIE_CONTROLS_MODE); - } }
diff --git a/chrome/browser/privacy_guide/android/java/src/org/chromium/chrome/browser/privacy_guide/HistorySyncFragment.java b/chrome/browser/privacy_guide/android/java/src/org/chromium/chrome/browser/privacy_guide/HistorySyncFragment.java index f533a5c..4c94f55fb 100644 --- a/chrome/browser/privacy_guide/android/java/src/org/chromium/chrome/browser/privacy_guide/HistorySyncFragment.java +++ b/chrome/browser/privacy_guide/android/java/src/org/chromium/chrome/browser/privacy_guide/HistorySyncFragment.java
@@ -40,7 +40,7 @@ mInitialKeepEverythingSynced = mSyncService.hasKeepEverythingSynced(); SwitchCompat historySyncSwitch = view.findViewById(R.id.history_sync_switch); - historySyncSwitch.setChecked(isHistoryEnabled()); + historySyncSwitch.setChecked(PrivacyGuideUtils.isHistorySyncEnabled()); historySyncSwitch.setOnCheckedChangeListener(this); } @@ -60,9 +60,4 @@ mSyncService.setSelectedTypes(keepEverythingSynced, syncTypes); } - - private boolean isHistoryEnabled() { - Set<Integer> syncTypes = mSyncService.getSelectedTypes(); - return syncTypes.contains(UserSelectableType.HISTORY); - } }
diff --git a/chrome/browser/privacy_guide/android/java/src/org/chromium/chrome/browser/privacy_guide/MSBBFragment.java b/chrome/browser/privacy_guide/android/java/src/org/chromium/chrome/browser/privacy_guide/MSBBFragment.java index c7e1451c..3d0bc64 100644 --- a/chrome/browser/privacy_guide/android/java/src/org/chromium/chrome/browser/privacy_guide/MSBBFragment.java +++ b/chrome/browser/privacy_guide/android/java/src/org/chromium/chrome/browser/privacy_guide/MSBBFragment.java
@@ -28,8 +28,7 @@ @Override public void onViewCreated(View view, Bundle savedInstanceState) { SwitchCompat msbbSwitch = view.findViewById(R.id.msbb_switch); - msbbSwitch.setChecked(UnifiedConsentServiceBridge.isUrlKeyedAnonymizedDataCollectionEnabled( - Profile.getLastUsedRegularProfile())); + msbbSwitch.setChecked(PrivacyGuideUtils.isMsbbEnabled()); msbbSwitch.setOnCheckedChangeListener((button, isChecked) -> { PrivacyGuideMetricsDelegate.recordMetricsOnMSBBChange(isChecked);
diff --git a/chrome/browser/privacy_guide/android/java/src/org/chromium/chrome/browser/privacy_guide/PrivacyGuideUtils.java b/chrome/browser/privacy_guide/android/java/src/org/chromium/chrome/browser/privacy_guide/PrivacyGuideUtils.java index e20cd3c..2714fba 100644 --- a/chrome/browser/privacy_guide/android/java/src/org/chromium/chrome/browser/privacy_guide/PrivacyGuideUtils.java +++ b/chrome/browser/privacy_guide/android/java/src/org/chromium/chrome/browser/privacy_guide/PrivacyGuideUtils.java
@@ -19,8 +19,6 @@ /** * A utility class for Privacy Guide that fetches the current state of {@link * PrivacyGuideFragment.FragmentType}s. - * - * TODO(crbug.com/1393960): Utilize the methods on this class on the PG fragments */ class PrivacyGuideUtils { public static boolean isMsbbEnabled() {
diff --git a/chrome/browser/privacy_guide/android/java/src/org/chromium/chrome/browser/privacy_guide/SafeBrowsingFragment.java b/chrome/browser/privacy_guide/android/java/src/org/chromium/chrome/browser/privacy_guide/SafeBrowsingFragment.java index e85c962..c17b394a 100644 --- a/chrome/browser/privacy_guide/android/java/src/org/chromium/chrome/browser/privacy_guide/SafeBrowsingFragment.java +++ b/chrome/browser/privacy_guide/android/java/src/org/chromium/chrome/browser/privacy_guide/SafeBrowsingFragment.java
@@ -51,7 +51,7 @@ private void initialRadioButtonConfig() { @SafeBrowsingState - int safeBrowsingState = SafeBrowsingBridge.getSafeBrowsingState(); + int safeBrowsingState = PrivacyGuideUtils.getSafeBrowsingState(); switch (safeBrowsingState) { case (SafeBrowsingState.ENHANCED_PROTECTION): mEnhancedProtection.setChecked(true);
diff --git a/chrome/browser/privacy_guide/android/java/src/org/chromium/chrome/browser/privacy_guide/StepDisplayHandlerImpl.java b/chrome/browser/privacy_guide/android/java/src/org/chromium/chrome/browser/privacy_guide/StepDisplayHandlerImpl.java index d97e89b..241e58c 100644 --- a/chrome/browser/privacy_guide/android/java/src/org/chromium/chrome/browser/privacy_guide/StepDisplayHandlerImpl.java +++ b/chrome/browser/privacy_guide/android/java/src/org/chromium/chrome/browser/privacy_guide/StepDisplayHandlerImpl.java
@@ -5,14 +5,11 @@ package org.chromium.chrome.browser.privacy_guide; import org.chromium.chrome.browser.profiles.Profile; -import org.chromium.chrome.browser.safe_browsing.SafeBrowsingBridge; import org.chromium.chrome.browser.safe_browsing.SafeBrowsingState; import org.chromium.chrome.browser.sync.SyncService; import org.chromium.components.browser_ui.site_settings.WebsitePreferenceBridge; import org.chromium.components.content_settings.ContentSettingsType; import org.chromium.components.content_settings.CookieControlsMode; -import org.chromium.components.content_settings.PrefNames; -import org.chromium.components.user_prefs.UserPrefs; /** * Computes for each privacy guide step whether it should be displayed or not. @@ -26,7 +23,7 @@ @Override public boolean shouldDisplaySafeBrowsing() { - return SafeBrowsingBridge.getSafeBrowsingState() != SafeBrowsingState.NO_SAFE_BROWSING; + return PrivacyGuideUtils.getSafeBrowsingState() != SafeBrowsingState.NO_SAFE_BROWSING; } @Override @@ -34,8 +31,7 @@ boolean allowCookies = WebsitePreferenceBridge.isCategoryEnabled( Profile.getLastUsedRegularProfile(), ContentSettingsType.COOKIES); @CookieControlsMode - int cookieControlsMode = UserPrefs.get(Profile.getLastUsedRegularProfile()) - .getInteger(PrefNames.COOKIE_CONTROLS_MODE); + int cookieControlsMode = PrivacyGuideUtils.getCookieControlsMode(); return allowCookies && cookieControlsMode != CookieControlsMode.OFF; } }
diff --git a/chrome/browser/privacy_sandbox/android/java/res/xml/fledge_preference_v4.xml b/chrome/browser/privacy_sandbox/android/java/res/xml/fledge_preference_v4.xml index 19b730cf..0af37099 100644 --- a/chrome/browser/privacy_sandbox/android/java/res/xml/fledge_preference_v4.xml +++ b/chrome/browser/privacy_sandbox/android/java/res/xml/fledge_preference_v4.xml
@@ -13,23 +13,22 @@ android:summary="@string/settings_fledge_page_toggle_sub_label" /> <org.chromium.chrome.browser.privacy_sandbox.v4.PreferenceCategoryWithClickableSummary + android:key="fledge_heading" + android:title="@string/settings_fledge_page_current_sites_heading" + android:summary="@string/settings_fledge_page_current_sites_description" + app:allowDividerAbove="true" /> + + <PreferenceCategory android:key="current_fledge_sites" - android:title="@string/settings_fledge_page_current_sites_heading" - android:summary="@string/settings_fledge_page_current_sites_description" /> + android:layout="@layout/preference_category_no_title_or_padding" /> - <org.chromium.chrome.browser.privacy_sandbox.v4.PreferenceCategoryWithClickableSummary + <org.chromium.components.browser_ui.settings.TextMessagePreference android:key="fledge_disabled" - android:title="@string/settings_fledge_page_current_sites_heading" - android:summary="@string/settings_fledge_page_current_sites_description_disabled" - app:allowDividerAbove="true" - app:allowDividerBelow="true" /> + android:summary="@string/settings_fledge_page_current_sites_description_disabled" /> - <org.chromium.chrome.browser.privacy_sandbox.v4.PreferenceCategoryWithClickableSummary + <org.chromium.components.browser_ui.settings.TextMessagePreference android:key="fledge_empty" - android:title="@string/settings_fledge_page_current_sites_heading" - android:summary="@string/settings_fledge_page_current_sites_description_empty" - app:allowDividerAbove="true" - app:allowDividerBelow="true" /> + android:summary="@string/settings_fledge_page_current_sites_description_empty" /> <org.chromium.components.browser_ui.settings.ChromeBasePreference android:key="fledge_all_sites"
diff --git a/chrome/browser/privacy_sandbox/android/java/res/xml/topics_preference_v4.xml b/chrome/browser/privacy_sandbox/android/java/res/xml/topics_preference_v4.xml index 95e640a..5b3c648d 100644 --- a/chrome/browser/privacy_sandbox/android/java/res/xml/topics_preference_v4.xml +++ b/chrome/browser/privacy_sandbox/android/java/res/xml/topics_preference_v4.xml
@@ -13,23 +13,22 @@ android:summary="@string/settings_topics_page_toggle_sub_label" /> <org.chromium.chrome.browser.privacy_sandbox.v4.PreferenceCategoryWithClickableSummary + android:key="topics_heading" + android:title="@string/settings_topics_page_current_topics_heading" + android:summary="@string/settings_topics_page_current_topics_description" + app:allowDividerAbove="true" /> + + <PreferenceCategory android:key="current_topics" - android:title="@string/settings_topics_page_current_topics_heading" - android:summary="@string/settings_topics_page_current_topics_description" /> + android:layout="@layout/preference_category_no_title_or_padding" /> - <org.chromium.chrome.browser.privacy_sandbox.v4.PreferenceCategoryWithClickableSummary + <org.chromium.components.browser_ui.settings.TextMessagePreference android:key="topics_disabled" - android:title="@string/settings_topics_page_current_topics_heading" - android:summary="@string/settings_topics_page_current_topics_description_disabled" - app:allowDividerAbove="true" - app:allowDividerBelow="true" /> + android:summary="@string/settings_topics_page_current_topics_description_disabled" /> - <org.chromium.chrome.browser.privacy_sandbox.v4.PreferenceCategoryWithClickableSummary + <org.chromium.components.browser_ui.settings.TextMessagePreference android:key="topics_empty" - android:title="@string/settings_topics_page_current_topics_heading" - android:summary="@string/settings_topics_page_current_topics_description_empty" - app:allowDividerAbove="true" - app:allowDividerBelow="true" /> + android:summary="@string/settings_topics_page_current_topics_description_empty" /> <org.chromium.components.browser_ui.settings.ChromeBasePreference android:key="blocked_topics"
diff --git a/chrome/browser/privacy_sandbox/android/java/src/org/chromium/chrome/browser/privacy_sandbox/v4/FledgeFragmentV4.java b/chrome/browser/privacy_sandbox/android/java/src/org/chromium/chrome/browser/privacy_sandbox/v4/FledgeFragmentV4.java index e7664c64..7e9e222 100644 --- a/chrome/browser/privacy_sandbox/android/java/src/org/chromium/chrome/browser/privacy_sandbox/v4/FledgeFragmentV4.java +++ b/chrome/browser/privacy_sandbox/android/java/src/org/chromium/chrome/browser/privacy_sandbox/v4/FledgeFragmentV4.java
@@ -11,6 +11,7 @@ import androidx.annotation.Nullable; import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; +import androidx.preference.PreferenceCategory; import org.chromium.base.metrics.RecordUserAction; import org.chromium.chrome.browser.preferences.Pref; @@ -25,6 +26,7 @@ import org.chromium.components.browser_ui.settings.ChromeSwitchPreference; import org.chromium.components.browser_ui.settings.ClickableSpansTextMessagePreference; import org.chromium.components.browser_ui.settings.SettingsUtils; +import org.chromium.components.browser_ui.settings.TextMessagePreference; import org.chromium.components.favicon.LargeIconBridge; import org.chromium.components.prefs.PrefService; import org.chromium.components.user_prefs.UserPrefs; @@ -42,6 +44,7 @@ static final int MAX_DISPLAYED_SITES = 15; private static final String FLEDGE_TOGGLE_PREFERENCE = "fledge_toggle"; + private static final String HEADING_PREFERENCE = "fledge_heading"; private static final String CURRENT_SITES_PREFERENCE = "current_fledge_sites"; private static final String EMPTY_FLEDGE_PREFERENCE = "fledge_empty"; private static final String DISABLED_FLEDGE_PREFERENCE = "fledge_disabled"; @@ -49,9 +52,10 @@ private static final String FOOTER_PREFERENCE = "fledge_page_footer"; private ChromeSwitchPreference mFledgeTogglePreference; - private PreferenceCategoryWithClickableSummary mCurrentSitesCategory; - private PreferenceCategoryWithClickableSummary mEmptyFledgePreference; - private PreferenceCategoryWithClickableSummary mDisabledFledgePreference; + private PreferenceCategoryWithClickableSummary mHeadingPreference; + private PreferenceCategory mCurrentSitesCategory; + private TextMessagePreference mEmptyFledgePreference; + private TextMessagePreference mDisabledFledgePreference; private ChromeBasePreference mAllSitesPreference; private LargeIconBridge mLargeIconBridge; private ClickableSpansTextMessagePreference mFooterPreference; @@ -79,6 +83,7 @@ SettingsUtils.addPreferencesFromResource(this, R.xml.fledge_preference_v4); mFledgeTogglePreference = findPreference(FLEDGE_TOGGLE_PREFERENCE); + mHeadingPreference = findPreference(HEADING_PREFERENCE); mCurrentSitesCategory = findPreference(CURRENT_SITES_PREFERENCE); mEmptyFledgePreference = findPreference(EMPTY_FLEDGE_PREFERENCE); mDisabledFledgePreference = findPreference(DISABLED_FLEDGE_PREFERENCE); @@ -90,23 +95,11 @@ mFledgeTogglePreference.setManagedPreferenceDelegate(createManagedPreferenceDelegate()); mMoreThanMaxSitesToDisplay = false; - mCurrentSitesCategory.setSummary(SpanApplier.applySpans( + mHeadingPreference.setSummary(SpanApplier.applySpans( getResources().getString(R.string.settings_fledge_page_current_sites_description), new SpanApplier.SpanInfo("<link>", "</link>", new NoUnderlineClickableSpan(getContext(), this::onLearnMoreClicked)))); - mEmptyFledgePreference.setSummary(SpanApplier.applySpans( - getResources().getString( - R.string.settings_fledge_page_current_sites_description_empty), - new SpanApplier.SpanInfo("<link>", "</link>", - new NoUnderlineClickableSpan(getContext(), this::onLearnMoreClicked)))); - - mDisabledFledgePreference.setSummary(SpanApplier.applySpans( - getResources().getString( - R.string.settings_fledge_page_current_sites_description_disabled), - new SpanApplier.SpanInfo("<link>", "</link>", - new NoUnderlineClickableSpan(getContext(), this::onLearnMoreClicked)))); - mFooterPreference.setSummary(SpanApplier.applySpans( getResources().getString(R.string.settings_fledge_page_footer), new SpanApplier.SpanInfo("<link1>", "</link1>",
diff --git a/chrome/browser/privacy_sandbox/android/java/src/org/chromium/chrome/browser/privacy_sandbox/v4/TopicsFragmentV4.java b/chrome/browser/privacy_sandbox/android/java/src/org/chromium/chrome/browser/privacy_sandbox/v4/TopicsFragmentV4.java index 759c0c21..13286ee 100644 --- a/chrome/browser/privacy_sandbox/android/java/src/org/chromium/chrome/browser/privacy_sandbox/v4/TopicsFragmentV4.java +++ b/chrome/browser/privacy_sandbox/android/java/src/org/chromium/chrome/browser/privacy_sandbox/v4/TopicsFragmentV4.java
@@ -10,6 +10,7 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.preference.Preference; +import androidx.preference.PreferenceCategory; import org.chromium.base.metrics.RecordUserAction; import org.chromium.chrome.browser.preferences.Pref; @@ -24,6 +25,7 @@ import org.chromium.components.browser_ui.settings.ChromeSwitchPreference; import org.chromium.components.browser_ui.settings.ClickableSpansTextMessagePreference; import org.chromium.components.browser_ui.settings.SettingsUtils; +import org.chromium.components.browser_ui.settings.TextMessagePreference; import org.chromium.components.prefs.PrefService; import org.chromium.components.user_prefs.UserPrefs; import org.chromium.ui.text.NoUnderlineClickableSpan; @@ -37,15 +39,17 @@ public class TopicsFragmentV4 extends PrivacySandboxSettingsBaseFragment implements Preference.OnPreferenceChangeListener, Preference.OnPreferenceClickListener { private static final String TOPICS_TOGGLE_PREFERENCE = "topics_toggle"; + private static final String TOPICS_HEADING_PREFERENCE = "topics_heading"; private static final String CURRENT_TOPICS_PREFERENCE = "current_topics"; private static final String EMPTY_TOPICS_PREFERENCE = "topics_empty"; private static final String DISABLED_TOPICS_PREFERENCE = "topics_disabled"; private static final String TOPICS_PAGE_FOOTER_PREFERENCE = "topics_page_footer"; private ChromeSwitchPreference mTopicsTogglePreference; - private PreferenceCategoryWithClickableSummary mCurrentTopicsCategory; - private PreferenceCategoryWithClickableSummary mEmptyTopicsPreference; - private PreferenceCategoryWithClickableSummary mDisabledTopicsPreference; + private PreferenceCategoryWithClickableSummary mTopicsHeadingPreference; + private PreferenceCategory mCurrentTopicsCategory; + private TextMessagePreference mEmptyTopicsPreference; + private TextMessagePreference mDisabledTopicsPreference; private ClickableSpansTextMessagePreference mTopicsPageFooterPreference; static boolean isTopicsPrefEnabled() { @@ -70,6 +74,7 @@ SettingsUtils.addPreferencesFromResource(this, R.xml.topics_preference_v4); mTopicsTogglePreference = findPreference(TOPICS_TOGGLE_PREFERENCE); + mTopicsHeadingPreference = findPreference(TOPICS_HEADING_PREFERENCE); mCurrentTopicsCategory = findPreference(CURRENT_TOPICS_PREFERENCE); mEmptyTopicsPreference = findPreference(EMPTY_TOPICS_PREFERENCE); mDisabledTopicsPreference = findPreference(DISABLED_TOPICS_PREFERENCE); @@ -79,7 +84,7 @@ mTopicsTogglePreference.setOnPreferenceChangeListener(this); mTopicsTogglePreference.setManagedPreferenceDelegate(createManagedPreferenceDelegate()); - mCurrentTopicsCategory.setSummary(SpanApplier.applySpans( + mTopicsHeadingPreference.setSummary(SpanApplier.applySpans( getResources().getString(R.string.settings_topics_page_current_topics_description), new SpanApplier.SpanInfo("<link>", "</link>", new NoUnderlineClickableSpan(getContext(), this::onLearnMoreClicked))));
diff --git a/chrome/browser/privacy_sandbox/android/javatests/src/org/chromium/chrome/browser/privacy_sandbox/v4/FledgeFragmentV4Test.java b/chrome/browser/privacy_sandbox/android/javatests/src/org/chromium/chrome/browser/privacy_sandbox/v4/FledgeFragmentV4Test.java index 9ac960e..09584fe 100644 --- a/chrome/browser/privacy_sandbox/android/javatests/src/org/chromium/chrome/browser/privacy_sandbox/v4/FledgeFragmentV4Test.java +++ b/chrome/browser/privacy_sandbox/android/javatests/src/org/chromium/chrome/browser/privacy_sandbox/v4/FledgeFragmentV4Test.java
@@ -43,6 +43,7 @@ import org.chromium.base.test.util.Batch; import org.chromium.base.test.util.CommandLineFlags; +import org.chromium.base.test.util.DisabledTest; import org.chromium.base.test.util.Feature; import org.chromium.base.test.util.JniMocker; import org.chromium.base.test.util.UserActionTester; @@ -490,7 +491,10 @@ @Test @SmallTest - public void testFooterTopicsLink() throws IOException { + @DisabledTest( + message = "The test is tempoprary disabled until we fix the duplicate string problem") + public void + testFooterTopicsLink() throws IOException { setFledgePrefEnabled(true); startFledgeSettings(); // Open a Topics settings activity.
diff --git a/chrome/browser/privacy_sandbox/android/javatests/src/org/chromium/chrome/browser/privacy_sandbox/v4/PrivacySandboxSettingsFragmentV4Test.java b/chrome/browser/privacy_sandbox/android/javatests/src/org/chromium/chrome/browser/privacy_sandbox/v4/PrivacySandboxSettingsFragmentV4Test.java index 51c32062..95715dd 100644 --- a/chrome/browser/privacy_sandbox/android/javatests/src/org/chromium/chrome/browser/privacy_sandbox/v4/PrivacySandboxSettingsFragmentV4Test.java +++ b/chrome/browser/privacy_sandbox/android/javatests/src/org/chromium/chrome/browser/privacy_sandbox/v4/PrivacySandboxSettingsFragmentV4Test.java
@@ -31,6 +31,7 @@ import org.chromium.base.test.util.Batch; import org.chromium.base.test.util.CommandLineFlags; +import org.chromium.base.test.util.DisabledTest; import org.chromium.base.test.util.Feature; import org.chromium.base.test.util.UserActionTester; import org.chromium.chrome.browser.flags.ChromeFeatureList; @@ -169,7 +170,10 @@ @Test @SmallTest - public void testNavigateToTopicsPage() { + @DisabledTest( + message = "The test is tempoprary disabled until we fix the duplicate string problem") + public void + testNavigateToTopicsPage() { startPrivacySandboxSettingsV4(); onView(withText(R.string.ad_privacy_page_topics_link_row_label)).perform(click());
diff --git a/chrome/browser/privacy_sandbox/android/javatests/src/org/chromium/chrome/browser/privacy_sandbox/v4/TopicsFragmentV4Test.java b/chrome/browser/privacy_sandbox/android/javatests/src/org/chromium/chrome/browser/privacy_sandbox/v4/TopicsFragmentV4Test.java index 457371da..127a0ba 100644 --- a/chrome/browser/privacy_sandbox/android/javatests/src/org/chromium/chrome/browser/privacy_sandbox/v4/TopicsFragmentV4Test.java +++ b/chrome/browser/privacy_sandbox/android/javatests/src/org/chromium/chrome/browser/privacy_sandbox/v4/TopicsFragmentV4Test.java
@@ -42,6 +42,7 @@ import org.chromium.base.test.util.Batch; import org.chromium.base.test.util.CommandLineFlags; +import org.chromium.base.test.util.DisabledTest; import org.chromium.base.test.util.Feature; import org.chromium.base.test.util.JniMocker; import org.chromium.base.test.util.UserActionTester; @@ -72,6 +73,7 @@ @Batch(Batch.PER_CLASS) @CommandLineFlags.Add({ChromeSwitches.DISABLE_FIRST_RUN_EXPERIENCE}) @EnableFeatures(ChromeFeatureList.PRIVACY_SANDBOX_SETTINGS_4) +@DisabledTest(message = "The test is tempoprary disabled until we fix the duplicate string problem") public final class TopicsFragmentV4Test { private static final String TOPIC_NAME_1 = "Topic 1"; private static final String TOPIC_NAME_2 = "Topic 2"; @@ -427,7 +429,7 @@ mFakePrivacySandboxBridge.setCurrentTopTopics(TOPIC_NAME_1, TOPIC_NAME_2); startTopicsSettings(); // Open a Fledge settings activity. - onView(withText(containsString("fledge settings"))).perform(clickOnClickableSpan(0)); + onView(withText(containsString("Site-suggested ads"))).perform(clickOnClickableSpan(0)); onViewWaiting(withText(R.string.settings_fledge_page_toggle_sub_label)) .check(matches(isDisplayed())); // Close the additional activity by navigating back.
diff --git a/chrome/browser/resources/password_manager/BUILD.gn b/chrome/browser/resources/password_manager/BUILD.gn index 64a1d6c2..9a7eabd9 100644 --- a/chrome/browser/resources/password_manager/BUILD.gn +++ b/chrome/browser/resources/password_manager/BUILD.gn
@@ -22,6 +22,7 @@ web_component_files = [ "checkup_section.ts", "checkup_details_section.ts", + "checkup_list_item.ts", "dialogs/add_password_dialog.ts", "dialogs/passwords_export_dialog.ts", "password_details_card.ts",
diff --git a/chrome/browser/resources/password_manager/checkup_details_section.html b/chrome/browser/resources/password_manager/checkup_details_section.html index c681676e..88faa5b 100644 --- a/chrome/browser/resources/password_manager/checkup_details_section.html +++ b/chrome/browser/resources/password_manager/checkup_details_section.html
@@ -8,13 +8,40 @@ #header { align-items: center; display: flex; - margin-bottom: 28px; + padding-top: 28px; + } + + #title { + font-family: 'Roboto'; + font-size: 14px; + font-style: normal; + font-weight: 500; + line-height: 20px; + } + + #body { + margin-top: 40px; + padding-inline-end: 20px; + padding-inline-start: 20px; + } + + #subtitle { + color: var(--cr-secondary-text-color); + font-weight: 500; + } + + #description { + margin-top: 12px; } #backButton { --cr-icon-button-margin-end: 6px; --cr-icon-button-margin-start: 0px; } + + #insecureCredentials { + margin-top: 24px; + } </style> <div id="header"> <cr-icon-button class="icon-arrow-back" id="backButton" @@ -22,3 +49,22 @@ </cr-icon-button> <h2 id="title" class="page-title">[[pageTitle_]]</h2> </div> +<div id="body"> + <div id="subtitle" class="label"> + [[getSubTitle_(insecurityType_)]] + </div> + <div id="description" class="cr-secondary-text label"> + [[getDescription_(insecurityType_)]] + </div> + </template> +</div> +<template is="dom-if" if="[[!isReusedSection(insecurityType_)]]"> + <template id="insecureCredentials" is="dom-repeat" + items="[[shownInsecureCredentials_]]" initial-count="50"> + <checkup-list-item item="[[item]]" first="[[!index]]" + show-details="[[isCompromisedSection(insecurityType_)]]"> + </checkup-list-item> + </template> + <!-- TODO(crbug.com/1401001): Display muted compromised credentials --> +</template> +<!-- TODO(crbug.com/1401001): Display reused credentials -->
diff --git a/chrome/browser/resources/password_manager/checkup_details_section.ts b/chrome/browser/resources/password_manager/checkup_details_section.ts index 6ff7b22..188a2f1 100644 --- a/chrome/browser/resources/password_manager/checkup_details_section.ts +++ b/chrome/browser/resources/password_manager/checkup_details_section.ts
@@ -3,7 +3,9 @@ // found in the LICENSE file. import 'chrome://resources/cr_elements/cr_icon_button/cr_icon_button.js'; import './shared_style.css.js'; +import './checkup_list_item.js'; +import {I18nMixin} from 'chrome://resources/cr_elements/i18n_mixin.js'; import {assert} from 'chrome://resources/js/assert_ts.js'; import {PluralStringProxyImpl} from 'chrome://resources/js/plural_string_proxy.js'; import {PolymerElement} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js'; @@ -12,8 +14,15 @@ import {CredentialsChangedListener, PasswordManagerImpl} from './password_manager_proxy.js'; import {CheckupSubpage, Page, Route, RouteObserverMixin, Router} from './router.js'; +export interface CheckupDetailsSectionElement { + $: { + subtitle: HTMLElement, + description: HTMLElement, + }; +} -const CheckupDetailsSectionElementBase = RouteObserverMixin(PolymerElement); +const CheckupDetailsSectionElementBase = + I18nMixin(RouteObserverMixin(PolymerElement)); export class CheckupDetailsSectionElement extends CheckupDetailsSectionElementBase { @@ -34,12 +43,12 @@ observer: 'updateShownCredentials_', }, - allInsecureCredentials: { + allInsecureCredentials_: { type: Array, observer: 'updateShownCredentials_', }, - shownInsecureCredentials: { + shownInsecureCredentials_: { type: Array, observer: 'onCredentialsChanged_', }, @@ -48,8 +57,8 @@ private pageTitle_: string; private insecurityType_: CheckupSubpage|undefined; - private allInsecureCredentials: chrome.passwordsPrivate.PasswordUiEntry[]; - private shownInsecureCredentials: chrome.passwordsPrivate.PasswordUiEntry[]; + private allInsecureCredentials_: chrome.passwordsPrivate.PasswordUiEntry[]; + private shownInsecureCredentials_: chrome.passwordsPrivate.PasswordUiEntry[]; private insecureCredentialsChangedListener_: CredentialsChangedListener|null = null; @@ -57,7 +66,7 @@ super.connectedCallback(); this.insecureCredentialsChangedListener_ = insecureCredentials => { - this.allInsecureCredentials = insecureCredentials; + this.allInsecureCredentials_ = insecureCredentials; }; PasswordManagerImpl.getInstance().getInsecureCredentials().then( @@ -79,22 +88,23 @@ } private updateShownCredentials_() { - if (!this.insecurityType_ || !this.allInsecureCredentials) { + if (!this.insecurityType_ || !this.allInsecureCredentials_) { return; } - this.shownInsecureCredentials = this.allInsecureCredentials.filter(cred => { - return !cred.compromisedInfo!.isMuted && - cred.compromisedInfo!.compromiseTypes.some(type => { - return this.getInsecurityType_().includes(type); - }); - }); + this.shownInsecureCredentials_ = + this.allInsecureCredentials_.filter(cred => { + return !cred.compromisedInfo!.isMuted && + cred.compromisedInfo!.compromiseTypes.some(type => { + return this.getInsecurityType_().includes(type); + }); + }); } private async onCredentialsChanged_() { assert(this.insecurityType_); this.pageTitle_ = await PluralStringProxyImpl.getInstance().getPluralString( this.insecurityType_.concat('Passwords'), - this.shownInsecureCredentials.length); + this.shownInsecureCredentials_.length); } private getInsecurityType_(): chrome.passwordsPrivate.CompromiseType[] { @@ -111,6 +121,24 @@ return [chrome.passwordsPrivate.CompromiseType.WEAK]; } } + + private getSubTitle_() { + assert(this.insecurityType_); + return this.i18n(`${this.insecurityType_}PasswordsTitle`); + } + + private getDescription_() { + assert(this.insecurityType_); + return this.i18n(`${this.insecurityType_}PasswordsDescription`); + } + + private isCompromisedSection(): boolean { + return this.insecurityType_ === CheckupSubpage.COMPROMISED; + } + + private isReusedSection(): boolean { + return this.insecurityType_ === CheckupSubpage.REUSED; + } } declare global {
diff --git a/chrome/browser/resources/password_manager/checkup_list_item.html b/chrome/browser/resources/password_manager/checkup_list_item.html new file mode 100644 index 0000000..ea8234c6 --- /dev/null +++ b/chrome/browser/resources/password_manager/checkup_list_item.html
@@ -0,0 +1,84 @@ +<style include="shared-style cr-shared-style"> + :host { + display: flex; + flex-direction: column; + } + + site-favicon { + margin-inline-end: 20px; + } + + #list-item { + align-items: center; + display: flex; + padding: 16px 20px; + } + + #credentialInfo { + display: flex; + flex: 2; + } + + #insecurePassword { + background-color: transparent; + border: none; + color: var(--cr-secondary-text-color); + font-size: inherit; + margin-inline-start: 4px; + } + + #changeButton { + align-items: flex-end; + display: flex; + flex-direction: column; + } + + #change-password-link-icon { + --iron-icon-width: 16px; + margin-inline-start: 10px; + } + + #separator { + margin-inline-start: 56px; + } +</style> +<div id="separator" class="hr" hidden="[[first]]"></div> +<div id="list-item" focus-row-container> + <!-- TODO(crbug.com/): Consider using group icon. --> + <site-favicon domain="[[item.changePasswordUrl]]"></site-favicon> + <div id="credentialInfo"> + <div id="infoColumn"> + <div id="shownUrl" class="label"> + [[getShownDomain_(item)]] + </div> + <div class="cr-secondary-text label"> + <span id="username">[[item.username]]</span> + <input id="insecurePassword" focus-row-control + focus-type="passwordField" readonly + type="[[getPasswordInputType(isPasswordVisible)]]" + value="[[getPasswordValue_(item, isPasswordVisible)]]"> + </div> + <template is="dom-if" if="[[showDetails]]"> + <div class="cr-secondary-text label" id="compromiseType"> + [[getCompromiseDescription_(item)]] + </div> + <div class="cr-secondary-text label" id="elapsedTime"> + [[item.compromisedInfo.elapsedTimeSinceCompromise]] + </div> + </template> + </div> + </div> + <div id="changeButton"> + <!-- TODO(crbug.com/): Open change password URL. --> + <!-- TODO(crbug.com/): Add already changed dialog. --> + <!-- TODO(crbug.com/): Hide change password button for android apps. --> + <cr-button id="changePasswordButton" on-click="onChangePasswordClick_"> + $i18n{changePassword} + <iron-icon icon="cr:open-in-new" id="change-password-link-icon"> + </iron-icon> + </cr-button> + </div> + <!-- TODO(crbug.com/): Implement more actions. --> + <cr-icon-button class="icon-more-vert" id="more" title="$i18n{moreActions}"> + </cr-icon-button> +</div>
diff --git a/chrome/browser/resources/password_manager/checkup_list_item.ts b/chrome/browser/resources/password_manager/checkup_list_item.ts new file mode 100644 index 0000000..f1a53b2 --- /dev/null +++ b/chrome/browser/resources/password_manager/checkup_list_item.ts
@@ -0,0 +1,87 @@ +// Copyright 2023 The Chromium Authors +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. +import 'chrome://resources/cr_elements/cr_icon_button/cr_icon_button.js'; +import 'chrome://resources/cr_elements/cr_button/cr_button.js'; +import 'chrome://resources/cr_elements/cr_icons.css.js'; +import 'chrome://resources/cr_elements/cr_shared_style.css.js'; +import './site_favicon.js'; +import './shared_style.css.js'; + +import {I18nMixin} from 'chrome://resources/cr_elements/i18n_mixin.js'; +import {assert, assertNotReached} from 'chrome://resources/js/assert_ts.js'; +import {PolymerElement} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js'; + +import {getTemplate} from './checkup_list_item.html.js'; +import {ShowPasswordMixin} from './show_password_mixin.js'; + +export interface CheckupListItemElement { + $: { + shownUrl: HTMLElement, + username: HTMLElement, + insecurePassword: HTMLInputElement, + }; +} + +const CheckupListItemElementBase = ShowPasswordMixin(I18nMixin(PolymerElement)); + +export class CheckupListItemElement extends CheckupListItemElementBase { + static get is() { + return 'checkup-list-item'; + } + + static get template() { + return getTemplate(); + } + + static get properties() { + return { + item: Object, + + first: Boolean, + + showDetails: Boolean, + }; + } + + item: chrome.passwordsPrivate.PasswordUiEntry; + first: boolean; + showDetails: boolean; + + private getShownDomain_(): string { + // TODO(crbug.com/1401001): Use group name here. + return this.item.urls.shown; + } + + private getPasswordValue_(): string|undefined { + return this.isPasswordVisible ? this.item.password : ' '.repeat(10); + } + + private getCompromiseDescription_(): string { + assert(this.item.compromisedInfo); + const isLeaked = this.item.compromisedInfo.compromiseTypes.some( + type => type === chrome.passwordsPrivate.CompromiseType.LEAKED); + const isPhished = this.item.compromisedInfo.compromiseTypes.some( + type => type === chrome.passwordsPrivate.CompromiseType.PHISHED); + if (isLeaked && isPhished) { + return this.i18n('phishedAndLeakedPassword'); + } + if (isPhished) { + return this.i18n('phishedPassword'); + } + if (isLeaked) { + return this.i18n('leakedPassword'); + } + + assertNotReached( + 'Can\'t find a string for type: ' + this.item.compromisedInfo); + } +} + +declare global { + interface HTMLElementTagNameMap { + 'checkup-list-item': CheckupListItemElement; + } +} + +customElements.define(CheckupListItemElement.is, CheckupListItemElement);
diff --git a/chrome/browser/resources/settings/site_settings/site_settings_permissions_browser_proxy.ts b/chrome/browser/resources/settings/site_settings/site_settings_permissions_browser_proxy.ts index 84f3080..207702c 100644 --- a/chrome/browser/resources/settings/site_settings/site_settings_permissions_browser_proxy.ts +++ b/chrome/browser/resources/settings/site_settings/site_settings_permissions_browser_proxy.ts
@@ -27,8 +27,7 @@ * Mark revoked permissions of unused sites as reviewed by the user so they * will not be shown again. */ - acknowledgeRevokedUnusedSitePermissionsList( - unusedSitePermissionsList: UnusedSitePermissions[]): void; + acknowledgeRevokedUnusedSitePermissionsList(): void; /** * Allow permissions again for an unused site where permissions were @@ -60,11 +59,8 @@ export class SiteSettingsPermissionsBrowserProxyImpl implements SiteSettingsPermissionsBrowserProxy { - acknowledgeRevokedUnusedSitePermissionsList(unusedSitePermissionsList: - UnusedSitePermissions[]) { - chrome.send( - 'acknowledgeRevokedUnusedSitePermissionsList', - [unusedSitePermissionsList]); + acknowledgeRevokedUnusedSitePermissionsList() { + chrome.send('acknowledgeRevokedUnusedSitePermissionsList'); } allowPermissionsAgainForUnusedSite(origin: string) {
diff --git a/chrome/browser/resources/settings/site_settings_page/unused_site_permissions.ts b/chrome/browser/resources/settings/site_settings_page/unused_site_permissions.ts index 481b7d1..c2fbd05 100644 --- a/chrome/browser/resources/settings/site_settings_page/unused_site_permissions.ts +++ b/chrome/browser/resources/settings/site_settings_page/unused_site_permissions.ts
@@ -247,7 +247,7 @@ this.lastUserAction_ = Action.GOT_IT; this.lastUnusedSitePermissionsListAcknowledged_ = this.sites_; - this.browserProxy_.acknowledgeRevokedUnusedSitePermissionsList(this.sites_); + this.browserProxy_.acknowledgeRevokedUnusedSitePermissionsList(); const toastText = await PluralStringProxyImpl.getInstance().getPluralString( 'safetyCheckUnusedSitePermissionsToastBulkLabel', this.sites_.length); this.showUndoToast_(toastText);
diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd index 7b3f7a0..550c8a2 100644 --- a/chrome/browser/ui/android/strings/android_chrome_strings.grd +++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd
@@ -1111,20 +1111,20 @@ <!-- Privacy Sandbox v4 - Topics Page --> <!-- Where possible, these strings have been unified on Desktop & Android in privacy_sandox_strings.grdp. The strings here either only appear on one platform, or have platform specific requirements, e.g. the format of placeholders, and so cannot be unified. For the latter case, they have corresponding _CANONICAL representations used when consent is recorded on either platform, and so they must stay in sync --> - <message name="IDS_SETTINGS_TOPICS_PAGE_BLOCKED_TOPICS_SUB_PAGE_TITLE" translateable="false" desc=""> - Integer faucibus metus + <message name="IDS_SETTINGS_TOPICS_PAGE_BLOCKED_TOPICS_SUB_PAGE_TITLE" desc="A page title. Topics that the user blocked appear on this page."> + Topics you blocked </message> - <message name="IDS_SETTINGS_TOPICS_PAGE_CURRENT_TOPICS_DESCRIPTION" translateable="false" desc="Section description for the current Topics list."> - Nulla tincidunt iaculis nulla, sit amet viverra massa luctus nec. Integer eget pellentesque magna, et venenatis lorem. Integer a porta elit, eget bibendum neque. <ph name="BEGIN_LINK"><link></ph>Learn more<ph name="END_LINK"></link></ph> + <message name="IDS_SETTINGS_TOPICS_PAGE_CURRENT_TOPICS_DESCRIPTION" desc="A description that appear beneath the 'Your topics' label. * 'You can block': There is a 'Block' button (or an X on mobile) that appears next to each topic in the list. * 'auto-deletes': this could also read 'Chrome deletes...' We included the 'auto' to reinforce that this is part of a system and the deletion is done regularly."> + You can block topics you don't want shared with sites. Chrome also auto-deletes your topics older than 4 weeks. <ph name="BEGIN_LINK"><link></ph>Learn more<ph name="END_LINK"></link></ph> </message> - <message name="IDS_SETTINGS_TOPICS_PAGE_CURRENT_TOPICS_DESCRIPTION_DISABLED" translateable="false" desc="Section description for the current Topics list when Topics is disabled in the Topics preferences page."> - Sed porta viverra lacus ut euismod. Integer a cursus metus, ac ultricies libero. |Insert learn more link here|. + <message name="IDS_SETTINGS_TOPICS_PAGE_CURRENT_TOPICS_DESCRIPTION_DISABLED" desc="A description that appear beneath the 'Your topics' title. If this setting is off, no interests appear. The link opens a dialog box that provides more information about Ad topics."> + When on, a list of topics appears here based on your recent browsing history. </message> - <message name="IDS_SETTINGS_TOPICS_PAGE_CURRENT_TOPICS_DESCRIPTION_EMPTY" translateable="false" desc="Section description for the current Topics list when the Topics list is empty in the Topics preferences page."> - Curabitur sagittis sapien ut turpis interdum, vitae porttitor sem pretium. Vestibulum sem mauris, ultrices ac massa sit amet, sodales aliquet est. |Insert learn more link here| + <message name="IDS_SETTINGS_TOPICS_PAGE_CURRENT_TOPICS_DESCRIPTION_EMPTY" desc="A description that appear beneath the 'Your topics' title. This setting could be on but no topics appear in the list. This text explains why."> + It can take up to a week for a list of topics to appear here based on your recent browsing history. </message> - <message name="IDS_SETTINGS_TOPICS_PAGE_FOOTER" translateable="false" desc="Footer for the Topics preference page."> - Fledge footer. Quisque eu auctor purus, id tempus nulla. Pellentesque porta orci purus. Donec dictum, <ph name="BEGIN_LINK_1"><link1></ph>fledge settings<ph name="END_LINK_1"></link1></ph>, <ph name="BEGIN_LINK_2"><link2></ph>cookie settings<ph name="END_LINK_2"></link2></ph>, sit amet molestie quam arcu id urna. Donec vulputate dui ut lorem egestas, ac sollicitudin metus fermentum. + <message name="IDS_SETTINGS_TOPICS_PAGE_FOOTER" desc="This footer helps the user understand that this setting is just one signal among others that affect whether this user sees personalized ads on a site. We define 'personalize' as 'when Google provides recommendations and other content for users based on their data'. At a high level, there are 4 things that affect whether an ad is personalized in this context: * 'this setting' refers to the 'Ad topics' setting. The user is on this page. * 'Site-suggested ads': this is a link to the other new ad setting Chrome is launching and that sites can use to personalize ads a user sees. * 'cookie settings': this is a link to the cookies control section in Chrome settings. The Privacy Sandbox project deprecates third-party cookies, but it's a process, and we're launching new functionality that will replace important functionality of cookies. Until third-party cookies are deprecated, the two systems remain active in Chrome. * 'site you're viewing personalizes ads': When a user engages with a site, Chrome has no control over whether that site shows the user personalized ads. Imagine you visit www.interesting-site.com and they know a lot about you already based on previous visits. They can personalize content and ads to you if they like. They can use an ad-serving product, like Facebook or Google Ads to deliver personalized ads. They can also use the new Privacy Sandbox APIs (if they so choose) in order to get more information about the user that could be helpful to them in order to personalize ads. Those 2 APIs (settings, from the user's perspective), are 'Ad topics' and 'Site-suggested ads'."> + As you browse, whether an ad you see is personalized depends on this setting, <ph name="BEGIN_LINK_1"><link1></ph>Site-suggested ads<ph name="END_LINK_1"></link1></ph>, your <ph name="BEGIN_LINK_2"><link2></ph>cookie settings<ph name="END_LINK_2"></link2></ph>, and if the site you're viewing personalizes ads. </message> <!-- Privacy Sandbox v4 - Fledge Page --> @@ -1144,10 +1144,10 @@ You can block sites you don’t want. Chrome also auto-deletes sites from the list that are older than 4 weeks. <ph name="BEGIN_LINK"><link></ph>Learn more<ph name="END_LINK"></link></ph> </message> <message name="IDS_SETTINGS_FLEDGE_PAGE_CURRENT_SITES_DESCRIPTION_DISABLED" desc="1 of 3 possible descriptions that appear beneath the 'Sites' title. If this setting is off, no sites appear. The link opens a dialog box that provides more information about Site-suggested ads."> - When on, a list of sites you visit that guess your interests appears here. <ph name="BEGIN_LINK"><link></ph>Learn more<ph name="END_LINK"></link></ph> + When on, a list of sites you visit that guess your interests appears here. </message> <message name="IDS_SETTINGS_FLEDGE_PAGE_CURRENT_SITES_DESCRIPTION_EMPTY" desc="1 of 3 possible descriptions that appear beneath the 'Sites' title. This setting could be on but no topics appear in the list. This text explains why."> - It can take up to a week for a list of sites to appear here based on your browsing history. <ph name="BEGIN_LINK"><link></ph>Learn more<ph name="END_LINK"></link></ph> + It can take up to a week for a list of sites to appear here based on your browsing history. </message> <message name="IDS_SETTINGS_FLEDGE_PAGE_SEE_ALL_SITES_LABEL" desc="Text that serves as a button. Because the list of sites might be long, we only show the most recent sites. This button allows the user to browse all sites (because sites are auto-deleted every 4 weeks, the list is never older than 4 weeks)."> See all sites
diff --git a/chrome/browser/ui/android/strings/android_chrome_strings_grd/IDS_SETTINGS_FLEDGE_PAGE_CURRENT_SITES_DESCRIPTION_DISABLED.png.sha1 b/chrome/browser/ui/android/strings/android_chrome_strings_grd/IDS_SETTINGS_FLEDGE_PAGE_CURRENT_SITES_DESCRIPTION_DISABLED.png.sha1 index afb110a2..e5d33f75 100644 --- a/chrome/browser/ui/android/strings/android_chrome_strings_grd/IDS_SETTINGS_FLEDGE_PAGE_CURRENT_SITES_DESCRIPTION_DISABLED.png.sha1 +++ b/chrome/browser/ui/android/strings/android_chrome_strings_grd/IDS_SETTINGS_FLEDGE_PAGE_CURRENT_SITES_DESCRIPTION_DISABLED.png.sha1
@@ -1 +1 @@ -b7c078408e28a9b060c67fb4ac5ffcf6dda495ff \ No newline at end of file +9ef542202b8399d3c1abf137ba11ad65f5181d38 \ No newline at end of file
diff --git a/chrome/browser/ui/android/strings/android_chrome_strings_grd/IDS_SETTINGS_FLEDGE_PAGE_CURRENT_SITES_DESCRIPTION_EMPTY.png.sha1 b/chrome/browser/ui/android/strings/android_chrome_strings_grd/IDS_SETTINGS_FLEDGE_PAGE_CURRENT_SITES_DESCRIPTION_EMPTY.png.sha1 index cf8fcd11..bc49d556b2d 100644 --- a/chrome/browser/ui/android/strings/android_chrome_strings_grd/IDS_SETTINGS_FLEDGE_PAGE_CURRENT_SITES_DESCRIPTION_EMPTY.png.sha1 +++ b/chrome/browser/ui/android/strings/android_chrome_strings_grd/IDS_SETTINGS_FLEDGE_PAGE_CURRENT_SITES_DESCRIPTION_EMPTY.png.sha1
@@ -1 +1 @@ -c114d5e7394c81212547af1bd83c067d602e0e3d \ No newline at end of file +e3bb356eec46b37ca4ff1ba460e44ac446d59c72 \ No newline at end of file
diff --git a/chrome/browser/ui/android/strings/android_chrome_strings_grd/IDS_SETTINGS_TOPICS_PAGE_BLOCKED_TOPICS_SUB_PAGE_TITLE.png.sha1 b/chrome/browser/ui/android/strings/android_chrome_strings_grd/IDS_SETTINGS_TOPICS_PAGE_BLOCKED_TOPICS_SUB_PAGE_TITLE.png.sha1 new file mode 100644 index 0000000..e41689e --- /dev/null +++ b/chrome/browser/ui/android/strings/android_chrome_strings_grd/IDS_SETTINGS_TOPICS_PAGE_BLOCKED_TOPICS_SUB_PAGE_TITLE.png.sha1
@@ -0,0 +1 @@ +774ba4ad91243a125502ec243279afaccf956f6f \ No newline at end of file
diff --git a/chrome/browser/ui/android/strings/android_chrome_strings_grd/IDS_SETTINGS_TOPICS_PAGE_CURRENT_TOPICS_DESCRIPTION.png.sha1 b/chrome/browser/ui/android/strings/android_chrome_strings_grd/IDS_SETTINGS_TOPICS_PAGE_CURRENT_TOPICS_DESCRIPTION.png.sha1 new file mode 100644 index 0000000..63a45e3 --- /dev/null +++ b/chrome/browser/ui/android/strings/android_chrome_strings_grd/IDS_SETTINGS_TOPICS_PAGE_CURRENT_TOPICS_DESCRIPTION.png.sha1
@@ -0,0 +1 @@ +85c9f6f499a0f5cb0d71afb84d9876561c412be6 \ No newline at end of file
diff --git a/chrome/browser/ui/android/strings/android_chrome_strings_grd/IDS_SETTINGS_TOPICS_PAGE_CURRENT_TOPICS_DESCRIPTION_DISABLED.png.sha1 b/chrome/browser/ui/android/strings/android_chrome_strings_grd/IDS_SETTINGS_TOPICS_PAGE_CURRENT_TOPICS_DESCRIPTION_DISABLED.png.sha1 new file mode 100644 index 0000000..d1dd02c --- /dev/null +++ b/chrome/browser/ui/android/strings/android_chrome_strings_grd/IDS_SETTINGS_TOPICS_PAGE_CURRENT_TOPICS_DESCRIPTION_DISABLED.png.sha1
@@ -0,0 +1 @@ +1a1c977215f102a4f67a48a7f00cce16b72b4b83 \ No newline at end of file
diff --git a/chrome/browser/ui/android/strings/android_chrome_strings_grd/IDS_SETTINGS_TOPICS_PAGE_CURRENT_TOPICS_DESCRIPTION_EMPTY.png.sha1 b/chrome/browser/ui/android/strings/android_chrome_strings_grd/IDS_SETTINGS_TOPICS_PAGE_CURRENT_TOPICS_DESCRIPTION_EMPTY.png.sha1 new file mode 100644 index 0000000..e8bb808 --- /dev/null +++ b/chrome/browser/ui/android/strings/android_chrome_strings_grd/IDS_SETTINGS_TOPICS_PAGE_CURRENT_TOPICS_DESCRIPTION_EMPTY.png.sha1
@@ -0,0 +1 @@ +c1678b14604fd59d808c32f24d2ae3c6f27888e4 \ No newline at end of file
diff --git a/chrome/browser/ui/android/strings/android_chrome_strings_grd/IDS_SETTINGS_TOPICS_PAGE_FOOTER.png.sha1 b/chrome/browser/ui/android/strings/android_chrome_strings_grd/IDS_SETTINGS_TOPICS_PAGE_FOOTER.png.sha1 new file mode 100644 index 0000000..63a45e3 --- /dev/null +++ b/chrome/browser/ui/android/strings/android_chrome_strings_grd/IDS_SETTINGS_TOPICS_PAGE_FOOTER.png.sha1
@@ -0,0 +1 @@ +85c9f6f499a0f5cb0d71afb84d9876561c412be6 \ No newline at end of file
diff --git a/chrome/browser/ui/views/autofill/payments/autofill_error_dialog_view_native_views.cc b/chrome/browser/ui/views/autofill/payments/autofill_error_dialog_view_native_views.cc index 3342ba9..0cbffef 100644 --- a/chrome/browser/ui/views/autofill/payments/autofill_error_dialog_view_native_views.cc +++ b/chrome/browser/ui/views/autofill/payments/autofill_error_dialog_view_native_views.cc
@@ -16,6 +16,7 @@ #include "ui/views/bubble/bubble_frame_view.h" #include "ui/views/controls/image_view.h" #include "ui/views/layout/box_layout.h" +#include "ui/views/style/typography.h" namespace autofill { @@ -75,7 +76,8 @@ auto* label = AddChildView(std::make_unique<views::Label>( controller_->GetDescription(), - ChromeTextContext::CONTEXT_DIALOG_BODY_TEXT_SMALL)); + ChromeTextContext::CONTEXT_DIALOG_BODY_TEXT_SMALL, + views::style::STYLE_SECONDARY)); label->SetHorizontalAlignment(gfx::ALIGN_LEFT); label->SetMultiLine(true); return this;
diff --git a/chrome/browser/ui/views/autofill/payments/card_unmask_prompt_views.cc b/chrome/browser/ui/views/autofill/payments/card_unmask_prompt_views.cc index 1333f92..7c6e2f5d 100644 --- a/chrome/browser/ui/views/autofill/payments/card_unmask_prompt_views.cc +++ b/chrome/browser/ui/views/autofill/payments/card_unmask_prompt_views.cc
@@ -134,16 +134,13 @@ std::make_unique<views::ImageView>(ui::ImageModel::FromVectorIcon( kBrowserToolsErrorIcon, ui::kColorAlertHighSeverity))); - // Create and add the label of the overlay, and show the error in red. - auto error_label = std::make_unique<views::Label>(error_message); - views::SetCascadingColorProviderColor(error_label.get(), - views::kCascadingLabelEnabledColor, - ui::kColorAlertHighSeverity); + // Create and add the label of the overlay, and show the error in gray. + auto* error_label = overlay_->AddChildView(std::make_unique<views::Label>( + error_message, views::style::CONTEXT_LABEL, + views::style::STYLE_SECONDARY)); error_label->SetHorizontalAlignment(gfx::HorizontalAlignment::ALIGN_LEFT); error_label->SetMultiLine(true); - overlay_->AddChildView(std::move(error_label)); - // Re-layout to correctly format the views on the overlay. overlay_->Layout();
diff --git a/chrome/browser/ui/webui/password_manager/password_manager_ui.cc b/chrome/browser/ui/webui/password_manager/password_manager_ui.cc index 524b22c..5dff398 100644 --- a/chrome/browser/ui/webui/password_manager/password_manager_ui.cc +++ b/chrome/browser/ui/webui/password_manager/password_manager_ui.cc
@@ -45,10 +45,6 @@ IDR_PASSWORD_MANAGER_PASSWORD_MANAGER_HTML); static constexpr webui::LocalizedString kStrings[] = { - {"usernameCopiedToClipboard", - IDS_PASSWORD_MANAGER_UI_USERNAME_COPIED_TO_CLIPBOARD}, - {"passwordCopiedToClipboard", - IDS_PASSWORD_MANAGER_UI_PASSWORD_COPIED_TO_CLIPBOARD}, {"addPassword", IDS_PASSWORD_MANAGER_UI_ADD_PASSWORD_BUTTON}, {"addPasswordFooter", IDS_PASSWORD_MANAGER_UI_ADD_PASSWORD_FOOTNOTE}, {"addPasswordTitle", IDS_PASSWORD_MANAGER_UI_ADD_PASSWORD}, @@ -63,10 +59,13 @@ IDS_PASSWORD_MANAGER_UI_NO_BLOCKED_SITES_DESCRIPTION}, {"blockedSitesTitle", IDS_PASSWORD_MANAGER_UI_BLOCKED_SITES_TITLE}, {"cancel", IDS_CANCEL}, + {"changePassword", IDS_PASSWORD_MANAGER_UI_CHANGE_PASSWORD_BUTTON}, {"checkup", IDS_PASSWORD_MANAGER_UI_CHECKUP}, {"checkupTitle", IDS_PASSWORD_MANAGER_UI_CHECKUP_TITLE}, {"clearSearch", IDS_CLEAR_SEARCH}, {"close", IDS_CLOSE}, + {"compromisedPasswordsDescription", + IDS_PASSWORD_MANAGER_UI_COMPROMISED_PASSWORDS_DESCRIPTION}, {"compromisedPasswordsEmpty", IDS_PASSWORD_MANAGER_UI_NO_COMPROMISED_PASSWORDS}, {"compromisedPasswordsTitle", @@ -76,29 +75,38 @@ {"deletePassword", IDS_DELETE}, {"editPassword", IDS_EDIT}, {"emptyNote", IDS_PASSWORD_MANAGER_UI_NO_NOTE_SAVED}, - {"exportingPasswordsTitle", IDS_PASSWORD_MANAGER_UI_EXPORTING_TITLE}, {"exportPasswords", IDS_PASSWORD_MANAGER_UI_EXPORT_TITLE}, {"exportPasswordsDescription", IDS_PASSWORD_MANAGER_UI_EXPORT_BANNER_DESCRIPTION}, {"exportPasswordsDialogBody", IDS_PASSWORD_MANAGER_UI_EXPORT_DIALOG_BODY}, - {"exportPasswordsTryAgain", IDS_PASSWORD_MANAGER_UI_EXPORT_TRY_AGAIN}, - {"exportPasswordsFailTitle", - IDS_PASSWORD_MANAGER_UI_EXPORTING_FAILURE_TITLE}, {"exportPasswordsFailTips", IDS_PASSWORD_MANAGER_UI_EXPORTING_FAILURE_TIPS}, - {"exportPasswordsFailTipsEnoughSpace", - IDS_PASSWORD_MANAGER_UI_EXPORTING_FAILURE_TIP_ENOUGH_SPACE}, {"exportPasswordsFailTipsAnotherFolder", IDS_PASSWORD_MANAGER_UI_EXPORTING_FAILURE_TIP_ANOTHER_FOLDER}, + {"exportPasswordsFailTipsEnoughSpace", + IDS_PASSWORD_MANAGER_UI_EXPORTING_FAILURE_TIP_ENOUGH_SPACE}, + {"exportPasswordsFailTitle", + IDS_PASSWORD_MANAGER_UI_EXPORTING_FAILURE_TITLE}, + {"exportPasswordsTryAgain", IDS_PASSWORD_MANAGER_UI_EXPORT_TRY_AGAIN}, + {"exportingPasswordsTitle", IDS_PASSWORD_MANAGER_UI_EXPORTING_TITLE}, {"federationLabel", IDS_PASSWORD_MANAGER_UI_FEDERATION_LABEL}, {"hidePassword", IDS_PASSWORD_MANAGER_UI_HIDE_PASSWORD}, {"importPasswords", IDS_PASSWORD_MANAGER_UI_IMPORT_BANNER_TITLE}, {"importPasswordsDescription", IDS_PASSWORD_MANAGER_UI_IMPORT_BANNER_DESCRIPTION}, {"justNow", IDS_PASSWORD_MANAGER_UI_JUST_NOW}, + {"leakedPassword", IDS_PASSWORD_MANAGER_UI_PASSWORD_LEAKED}, + {"moreActions", IDS_PASSWORD_MANAGER_UI_MORE_ACTIONS}, {"notesLabel", IDS_PASSWORD_MANAGER_UI_NOTES_LABEL}, + {"passwordCopiedToClipboard", + IDS_PASSWORD_MANAGER_UI_PASSWORD_COPIED_TO_CLIPBOARD}, {"passwordLabel", IDS_PASSWORD_MANAGER_UI_PASSWORD_LABEL}, {"passwords", IDS_PASSWORD_MANAGER_UI_PASSWORDS}, + {"phishedAndLeakedPassword", + IDS_PASSWORD_MANAGER_UI_PASSWORD_PHISHED_AND_LEAKED}, + {"phishedPassword", IDS_PASSWORD_MANAGER_UI_PASSWORD_PHISHED}, + {"reusedPasswordsDescription", + IDS_PASSWORD_MANAGER_UI_REUSED_PASSWORDS_DESCRIPTION}, {"reusedPasswordsEmpty", IDS_PASSWORD_MANAGER_UI_NO_REUSED_PASSWORDS}, {"reusedPasswordsTitle", IDS_PASSWORD_MANAGER_UI_HAS_REUSED_PASSWORDS}, {"save", IDS_SAVE}, @@ -114,7 +122,11 @@ {"trustedVaultBannerSubLabelOfferOptIn", IDS_PASSWORD_MANAGER_UI_RUSTED_VAULT_OPT_IN_DESCRIPTION}, {"tryAgain", IDS_PASSWORD_MANAGER_UI_CHECK_PASSWORDS_AFTER_ERROR}, + {"usernameCopiedToClipboard", + IDS_PASSWORD_MANAGER_UI_USERNAME_COPIED_TO_CLIPBOARD}, {"usernameLabel", IDS_PASSWORD_MANAGER_UI_USERNAME_LABEL}, + {"weakPasswordsDescription", + IDS_PASSWORD_MANAGER_UI_WEAK_PASSWORDS_DESCRIPTION}, {"weakPasswordsEmpty", IDS_PASSWORD_MANAGER_UI_NO_WEAK_PASSWORDS}, {"weakPasswordsTitle", IDS_PASSWORD_MANAGER_UI_HAS_WEAK_PASSWORDS}, {"websiteLabel", IDS_PASSWORD_MANAGER_UI_WEBSITE_LABEL},
diff --git a/chrome/browser/ui/webui/settings/site_settings_permissions_handler.cc b/chrome/browser/ui/webui/settings/site_settings_permissions_handler.cc index 96e68fd..ecaaa8a7 100644 --- a/chrome/browser/ui/webui/settings/site_settings_permissions_handler.cc +++ b/chrome/browser/ui/webui/settings/site_settings_permissions_handler.cc
@@ -50,6 +50,16 @@ SendUnusedSitePermissionsReviewList(); } +void SiteSettingsPermissionsHandler:: + HandleAcknowledgeRevokedUnusedSitePermissionsList( + const base::Value::List& args) { + permissions::UnusedSitePermissionsService* service = + UnusedSitePermissionsServiceFactory::GetForProfile(profile_); + service->ClearRevokedPermissionsList(); + + SendUnusedSitePermissionsReviewList(); +} + base::Value::List SiteSettingsPermissionsHandler::PopulateUnusedSitePermissionsData() { base::Value::List result; @@ -106,6 +116,11 @@ base::BindRepeating(&SiteSettingsPermissionsHandler:: HandleAllowPermissionsAgainForUnusedSite, base::Unretained(this))); + web_ui()->RegisterMessageCallback( + "acknowledgeRevokedUnusedSitePermissionsList", + base::BindRepeating(&SiteSettingsPermissionsHandler:: + HandleAcknowledgeRevokedUnusedSitePermissionsList, + base::Unretained(this))); } void SiteSettingsPermissionsHandler::SendUnusedSitePermissionsReviewList() {
diff --git a/chrome/browser/ui/webui/settings/site_settings_permissions_handler.h b/chrome/browser/ui/webui/settings/site_settings_permissions_handler.h index 208d00e..c61d0c8 100644 --- a/chrome/browser/ui/webui/settings/site_settings_permissions_handler.h +++ b/chrome/browser/ui/webui/settings/site_settings_permissions_handler.h
@@ -26,6 +26,8 @@ PopulateUnusedSitePermissionsData); FRIEND_TEST_ALL_PREFIXES(SiteSettingsPermissionsHandlerTest, HandleAllowPermissionsAgainForUnusedSite); + FRIEND_TEST_ALL_PREFIXES(SiteSettingsPermissionsHandlerTest, + HandleAcknowledgeRevokedUnusedSitePermissionsList); // SettingsPageUIHandler implementation. void OnJavascriptAllowed() override; @@ -42,6 +44,11 @@ // permissions list. void HandleAllowPermissionsAgainForUnusedSite(const base::Value::List& args); + // Clear the list of revoked permissions so they are not shown again. + // Permission settings themselves are not affected by this. + void HandleAcknowledgeRevokedUnusedSitePermissionsList( + const base::Value::List& args); + // Returns the list of revoked permissions that belongs to origins which // haven't been visited recently. base::Value::List PopulateUnusedSitePermissionsData();
diff --git a/chrome/browser/ui/webui/settings/site_settings_permissions_handler_unittest.cc b/chrome/browser/ui/webui/settings/site_settings_permissions_handler_unittest.cc index 8ad9e44e..741bd3d4 100644 --- a/chrome/browser/ui/webui/settings/site_settings_permissions_handler_unittest.cc +++ b/chrome/browser/ui/webui/settings/site_settings_permissions_handler_unittest.cc
@@ -25,10 +25,15 @@ #include "url/gurl.h" constexpr char kRevokedKey[] = "revoked"; +constexpr char kUnusedTestSite[] = "https://example1.com"; +constexpr char kUsedTestSite[] = "https://example2.com"; class SiteSettingsPermissionsHandlerTest : public testing::Test { public: - SiteSettingsPermissionsHandlerTest() = default; + SiteSettingsPermissionsHandlerTest() { + feature_list_.InitAndEnableFeature( + content_settings::features::kSafetyCheckUnusedSitePermissions); + } void SetUp() override { // Fully initialize |profile_| in the constructor since some children @@ -49,6 +54,26 @@ handler_ = std::make_unique<SiteSettingsPermissionsHandler>(profile()); handler()->set_web_ui(web_ui()); handler()->AllowJavascript(); + + // Create a revoked permission. + base::Value::Dict dict = base::Value::Dict(); + base::Value::List permission_type_list = base::Value::List(); + permission_type_list.Append( + static_cast<int32_t>(ContentSettingsType::GEOLOCATION)); + dict.Set(kRevokedKey, base::Value::List(std::move(permission_type_list))); + + hcsm()->SetWebsiteSettingDefaultScope( + GURL(kUnusedTestSite), GURL(kUnusedTestSite), + ContentSettingsType::REVOKED_UNUSED_SITE_PERMISSIONS, + base::Value(dict.Clone())); + + // There should be only an unused URL in the revoked permissions list. + const auto& revoked_permissions = + handler()->PopulateUnusedSitePermissionsData(); + EXPECT_EQ(revoked_permissions.size(), 1UL); + EXPECT_EQ( + GURL(kUnusedTestSite), + GURL(*revoked_permissions[0].FindStringKey(site_settings::kOrigin))); } void TearDown() override { @@ -67,6 +92,7 @@ base::SimpleTestClock* clock() { return &clock_; } private: + base::test::ScopedFeatureList feature_list_; content::BrowserTaskEnvironment task_environment_; std::unique_ptr<SiteSettingsPermissionsHandler> handler_; std::unique_ptr<TestingProfile> profile_; @@ -76,80 +102,52 @@ }; TEST_F(SiteSettingsPermissionsHandlerTest, PopulateUnusedSitePermissionsData) { - base::test::ScopedFeatureList scoped_feature; - scoped_feature.InitAndEnableFeature( - content_settings::features::kSafetyCheckUnusedSitePermissions); - - const std::string url1 = "https://example1.com"; - const std::string url2 = "https://example2.com"; - - base::Value::Dict dict = base::Value::Dict(); - base::Value::List permission_type_list = base::Value::List(); - permission_type_list.Append( - static_cast<int32_t>(ContentSettingsType::GEOLOCATION)); - dict.Set(kRevokedKey, base::Value::List(std::move(permission_type_list))); - - // Add url1 to rovoked permissions list. - hcsm()->SetWebsiteSettingDefaultScope( - GURL(url1), GURL(url1), - ContentSettingsType::REVOKED_UNUSED_SITE_PERMISSIONS, - base::Value(std::move(dict))); - - // Add GEOLOCATION setting for url2 but do not add to revoked list. + // Add GEOLOCATION setting for url but do not add to revoked list. const content_settings::ContentSettingConstraints constraint{ .track_last_visit_for_autoexpiration = true}; hcsm()->SetContentSettingDefaultScope( - GURL(url2), GURL(url2), ContentSettingsType::GEOLOCATION, - ContentSetting::CONTENT_SETTING_ALLOW, constraint); + GURL(kUsedTestSite), GURL(kUsedTestSite), + ContentSettingsType::GEOLOCATION, ContentSetting::CONTENT_SETTING_ALLOW, + constraint); - // Only url1 should be in the revoked permissions list, as permissions of - // url2 is not revoked. + // Revoked permissions list should still only contain the initial unused site. const auto& revoked_permissions = handler()->PopulateUnusedSitePermissionsData(); EXPECT_EQ(revoked_permissions.size(), 1UL); EXPECT_EQ( - GURL(url1), + GURL(kUnusedTestSite), GURL(*revoked_permissions[0].FindStringKey(site_settings::kOrigin))); } TEST_F(SiteSettingsPermissionsHandlerTest, HandleAllowPermissionsAgainForUnusedSite) { - base::test::ScopedFeatureList scoped_feature; - scoped_feature.InitAndEnableFeature( - content_settings::features::kSafetyCheckUnusedSitePermissions); - - const std::string url = "https://example1.com:443"; - const ContentSettingsType type = ContentSettingsType::GEOLOCATION; - - base::Value::Dict dict = base::Value::Dict(); - base::Value::List permission_type_list = base::Value::List(); - permission_type_list.Append(static_cast<int32_t>(type)); - dict.Set(kRevokedKey, base::Value::List(std::move(permission_type_list))); - - // Add url revoked permissions list. - hcsm()->SetWebsiteSettingDefaultScope( - GURL(url), GURL(url), - ContentSettingsType::REVOKED_UNUSED_SITE_PERMISSIONS, - base::Value(dict.Clone())); - - // Check there is 1 origin in revoked permissions list. - ContentSettingsForOneType revoked_permissions_list; - hcsm()->GetSettingsForOneType( - ContentSettingsType::REVOKED_UNUSED_SITE_PERMISSIONS, - &revoked_permissions_list); - EXPECT_EQ(1U, revoked_permissions_list.size()); - - // Allow the permission for url again + // Allow the revoked permission for the unused site again. base::Value::List args; - args.Append(base::Value(url)); + args.Append(base::Value(kUnusedTestSite)); handler()->HandleAllowPermissionsAgainForUnusedSite(args); // Check there is no origin in revoked permissions list. + ContentSettingsForOneType revoked_permissions_list; hcsm()->GetSettingsForOneType( ContentSettingsType::REVOKED_UNUSED_SITE_PERMISSIONS, &revoked_permissions_list); EXPECT_EQ(0U, revoked_permissions_list.size()); // Check if the permissions of url is regranted. - EXPECT_EQ(ContentSetting::CONTENT_SETTING_ALLOW, - hcsm()->GetContentSetting(GURL(url), GURL(url), type)); + EXPECT_EQ( + ContentSetting::CONTENT_SETTING_ALLOW, + hcsm()->GetContentSetting(GURL(kUnusedTestSite), GURL(kUnusedTestSite), + ContentSettingsType::GEOLOCATION)); +} + +TEST_F(SiteSettingsPermissionsHandlerTest, + HandleAcknowledgeRevokedUnusedSitePermissionsList) { + const auto& revoked_permissions_before = + handler()->PopulateUnusedSitePermissionsData(); + EXPECT_GT(revoked_permissions_before.size(), 0U); + // Acknowledging revoked permissions from unused sites clears the list. + base::Value::List args; + handler()->HandleAcknowledgeRevokedUnusedSitePermissionsList(args); + const auto& revoked_permissions_after = + handler()->PopulateUnusedSitePermissionsData(); + EXPECT_EQ(revoked_permissions_after.size(), 0U); }
diff --git a/chrome/browser/web_applications/manifest_update_utils.cc b/chrome/browser/web_applications/manifest_update_utils.cc index 7781f6c5..5e8753c 100644 --- a/chrome/browser/web_applications/manifest_update_utils.cc +++ b/chrome/browser/web_applications/manifest_update_utils.cc
@@ -79,8 +79,6 @@ return os << "kPendingIconReadFromDisk"; case ManifestUpdateStage::kPendingAppIdentityCheck: return os << "kPendingAppIdentityCheck"; - case ManifestUpdateStage::kPendingMaybeReadExistingIcons: - return os << "kPendingMaybeReadExistingIcons"; case ManifestUpdateStage::kPendingAssociationsUpdate: return os << "kPendingAssociationsUpdate"; case ManifestUpdateStage::kAppWindowsClosed:
diff --git a/chrome/browser/web_applications/manifest_update_utils.h b/chrome/browser/web_applications/manifest_update_utils.h index c79f98e1..01ad6974 100644 --- a/chrome/browser/web_applications/manifest_update_utils.h +++ b/chrome/browser/web_applications/manifest_update_utils.h
@@ -37,15 +37,14 @@ std::ostream& operator<<(std::ostream& os, ManifestUpdateResult result); -enum ManifestUpdateStage { - kPendingInstallableData = 0, - kPendingIconDownload = 1, - kPendingIconReadFromDisk = 2, - kPendingAppIdentityCheck = 3, - kPendingMaybeReadExistingIcons = 4, - kPendingAssociationsUpdate = 5, - kAppWindowsClosed = 6, - kPendingFinalizerUpdate = 7, +enum class ManifestUpdateStage { + kPendingInstallableData, + kPendingIconDownload, + kPendingIconReadFromDisk, + kPendingAppIdentityCheck, + kPendingAssociationsUpdate, + kAppWindowsClosed, + kPendingFinalizerUpdate, }; std::ostream& operator<<(std::ostream& os, ManifestUpdateStage stage);
diff --git a/chrome/build/linux.pgo.txt b/chrome/build/linux.pgo.txt index f35bdb1..368e8b7 100644 --- a/chrome/build/linux.pgo.txt +++ b/chrome/build/linux.pgo.txt
@@ -1 +1 @@ -chrome-linux-main-1673481537-f6a1afb25f12c29251bfb27914bf39298b9084a1.profdata +chrome-linux-main-1673502360-3a05231938e49f81de0a3ea937298c002075fe16.profdata
diff --git a/chrome/build/mac-arm.pgo.txt b/chrome/build/mac-arm.pgo.txt index 930a9c3..fe6f2e9 100644 --- a/chrome/build/mac-arm.pgo.txt +++ b/chrome/build/mac-arm.pgo.txt
@@ -1 +1 @@ -chrome-mac-arm-main-1673481537-dc4e0233050d37f8e3ce515e0ece1bce3770a6b6.profdata +chrome-mac-arm-main-1673524345-ecfcdea7035d83e86fd484055673483981176353.profdata
diff --git a/chrome/build/mac.pgo.txt b/chrome/build/mac.pgo.txt index c737ed167..81fffd4 100644 --- a/chrome/build/mac.pgo.txt +++ b/chrome/build/mac.pgo.txt
@@ -1 +1 @@ -chrome-mac-main-1673481537-b96346ec5e24495d94ba5859ac144a8ddd8c6e2e.profdata +chrome-mac-main-1673502360-92e068d65af7fdc0a9c10c14108ad5970825a5b4.profdata
diff --git a/chrome/build/win32.pgo.txt b/chrome/build/win32.pgo.txt index 0a16add..2b3927f2 100644 --- a/chrome/build/win32.pgo.txt +++ b/chrome/build/win32.pgo.txt
@@ -1 +1 @@ -chrome-win32-main-1673481537-eb5f4c623f73f2a1aa50dbdef39e846e4c44ff34.profdata +chrome-win32-main-1673513971-746603719035c96c8844b9cbd733cabf0631a825.profdata
diff --git a/chrome/build/win64.pgo.txt b/chrome/build/win64.pgo.txt index 5ce1dfb4..d6e8507 100644 --- a/chrome/build/win64.pgo.txt +++ b/chrome/build/win64.pgo.txt
@@ -1 +1 @@ -chrome-win64-main-1673481537-4bd434a80d2dde2977611c5ca2cdce97609e3886.profdata +chrome-win64-main-1673513971-0c17e73961069bf1209467bf8b0a51765db3ff5e.profdata
diff --git a/chrome/common/extensions/api/_api_features.json b/chrome/common/extensions/api/_api_features.json index 92275b6..7f98a15 100644 --- a/chrome/common/extensions/api/_api_features.json +++ b/chrome/common/extensions/api/_api_features.json
@@ -794,6 +794,10 @@ "dependencies": ["permission:sidePanel"], "contexts": ["blessed_extension"] }, + "smartCardProviderPrivate": { + "dependencies": ["permission:smartCardProviderPrivate"], + "contexts": ["blessed_extension"] + }, "speechRecognitionPrivate": { "dependencies": ["permission:speechRecognitionPrivate"], "contexts": ["blessed_extension"]
diff --git a/chrome/common/extensions/api/_permission_features.json b/chrome/common/extensions/api/_permission_features.json index 8537b11..0f19c8b 100644 --- a/chrome/common/extensions/api/_permission_features.json +++ b/chrome/common/extensions/api/_permission_features.json
@@ -838,6 +838,14 @@ "extension_types": ["extension"], "min_manifest_version": 3 }, + "smartCardProviderPrivate": { + "channel": "dev", + "platforms": ["chromeos", "lacros"], + "extension_types": ["extension", "platform_app"], + "allowlist": [ + "EC3DE21E048B67319893889529354DFBFA96FD23" // Smart Card Connector + ] + }, "speechRecognitionPrivate": { "channel": "stable", "extension_types": ["extension"],
diff --git a/chrome/common/extensions/api/api_sources.gni b/chrome/common/extensions/api/api_sources.gni index c3b8d808..1e0f1779d 100644 --- a/chrome/common/extensions/api/api_sources.gni +++ b/chrome/common/extensions/api/api_sources.gni
@@ -93,6 +93,7 @@ "platform_keys.idl", "quick_unlock_private.idl", "shared_storage_private.idl", + "smart_card_provider_private.idl", "system_log.idl", "vpn_provider.idl", "wallpaper.json",
diff --git a/chrome/common/extensions/api/file_manager_private.idl b/chrome/common/extensions/api/file_manager_private.idl index 84419c5..eeea8e6 100644 --- a/chrome/common/extensions/api/file_manager_private.idl +++ b/chrome/common/extensions/api/file_manager_private.idl
@@ -399,6 +399,9 @@ // types: ["*/*"]). Partial wild card (e.g. types: ["image/*"]) is not // generic file handler. boolean isGenericFileHandler; + + // True if this is task is blocked by Data Leak Prevention (DLP). + boolean isDlpBlocked; }; // Represents a set of tasks capable of handling file entries. @@ -1304,9 +1307,11 @@ // Gets the list of tasks that can be performed over selected files. // |entries| Array of selected entries + // |dlpSourceUrls| Array of source URLs corresponding to the entries, used to check Data Leak Prevention (DLP) restrictions // |callback| [nocompile] static void getFileTasks([instanceof=Entry] object[] entries, + DOMString[] dlpSourceUrls, GetFileTasksCallback callback); // Gets the MIME type of an entry.
diff --git a/chrome/common/extensions/api/file_manager_private_internal.idl b/chrome/common/extensions/api/file_manager_private_internal.idl index d3eaea0..40cc397 100644 --- a/chrome/common/extensions/api/file_manager_private_internal.idl +++ b/chrome/common/extensions/api/file_manager_private_internal.idl
@@ -108,6 +108,7 @@ DOMString[] mimeTypes, SimpleCallback callback); static void getFileTasks(DOMString[] urls, + DOMString[] dlpSourceUrls, GetFileTasksCallback callback); static void getDownloadUrl(DOMString url, GetUrlCallback callback); static void getDisallowedTransfers(DOMString[] entries,
diff --git a/chrome/common/extensions/api/smart_card_provider_private.idl b/chrome/common/extensions/api/smart_card_provider_private.idl new file mode 100644 index 0000000..847b440c --- /dev/null +++ b/chrome/common/extensions/api/smart_card_provider_private.idl
@@ -0,0 +1,126 @@ +// Copyright 2023 The Chromium Authors +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +// Use this API to give the browser access to a winscard.h[1] compatible +// PC/SC[2] implementation, which will be the backend of the browser's +// Web Smart Card API[3]. +// +// [1] https://pcsclite.apdu.fr/api/winscard_8h.html +// [2] https://en.wikipedia.org/wiki/PC/SC +// [3] https://github.com/WICG/web-smart-card/blob/main/README.md#web-idl +// +// TODO(crbug.com/1386175): Add API for the remaining SCard* functions. +[platforms=("chromeos", "lacros"), + implemented_in="chrome/browser/chromeos/extensions/smart_card_provider_private/smart_card_provider_private_api.h"] +namespace smartCardProviderPrivate { + + // PC/SC error codes we can expect to hit (thus a non-exhaustive list). + // UNKNOWN means an SCARD error code that is not mapped in this enum (and + // thus should probably be added here). + enum ResultCode { + SUCCESS, + REMOVED_CARD, + RESET_CARD, + UNPOWERED_CARD, + UNRESPONSIVE_CARD, + UNSUPPORTED_CARD, + READER_UNAVAILABLE, + SHARING_VIOLATION, + NOT_TRANSACTED, + NO_SMARTCARD, + PROTO_MISMATCH, + SYSTEM_CANCELLED, + NOT_READY, + CANCELLED, + INSUFFICIENT_BUFFER, + INVALID_HANDLE, + INVALID_PARAMETER, + INVALID_VALUE, + NO_MEMORY, + TIMEOUT, + UNKNOWN_READER, + UNSUPPORTED_FEATURE, + NO_READERS_AVAILABLE, + SERVICE_STOPPED, + NO_SERVICE, + COMM_ERROR, + INTERNAL_ERROR, + UNKNOWN_ERROR, + SERVER_TOO_BUSY, + UNEXPECTED, + SHUTDOWN, + UNKNOWN + }; + + // Maps to the SCARD_STATE_* flags defined in the winscard.h API. + dictionary ReaderStateFlags { + boolean? unaware; + boolean? ignore; + boolean? changed; + boolean? unknown; + boolean? unavailable; + boolean? empty; + boolean? present; + boolean? exclusive; + boolean? inuse; + boolean? mute; + boolean? unpowered; + }; + + dictionary ReaderStateIn { + DOMString reader; + ReaderStateFlags currentState; + }; + + dictionary ReaderStateOut { + DOMString reader; + ReaderStateFlags eventState; + ArrayBuffer atr; + }; + + interface Events { + // Browser requested a SCardEstablishContext call. + // Extension must report the result to the browser by calling + // reportEstablishContextResult. + [maxListeners=1] static void onEstablishContextRequested(long requestId); + + // Browser requested a SCardReleaseContext call. + // Extension must report the result to the browser by calling + // reportReleaseContextResult. + [maxListeners=1] static void onReleaseContextRequested(long requestId, + long scardContext); + + // Browser requested a SCardListReaders call. + // Extension must report the result to the browser by calling + // reportListReadersResult. + [maxListeners=1] static void onListReadersRequested(long requestId, + long scardContext); + + // Browser requested a SCardGetStatusChange call. + // Extension must report the result to the browser by calling + // reportGetStatusChangeResult. + [maxListeners=1] static void onGetStatusChangeRequested(long requestId, + long scardContext, + long timeout, + ReaderStateIn[] readerStates); + }; + + interface Functions { + // Reports the result of a SCardEstablishContext call. + static void reportEstablishContextResult(long requestId, + long scardContext, ResultCode resultCode); + + // Reports the result of a SCardReleaseContext call. + static void reportReleaseContextResult(long requestId, + ResultCode resultCode); + + // Reports the result of a SCardListReaders call. + static void reportListReadersResult(long requestId, + DOMString[] readers, ResultCode resultCode); + + // Reports the result of a SCardGetStatusChange call. + static void reportGetStatusChangeResult(long requestId, + ReaderStateOut[] readerStates, ResultCode resultCode); + }; +};
diff --git a/chrome/common/extensions/permissions/chrome_api_permissions.cc b/chrome/common/extensions/permissions/chrome_api_permissions.cc index b3e87a2..108d1e2a3 100644 --- a/chrome/common/extensions/permissions/chrome_api_permissions.cc +++ b/chrome/common/extensions/permissions/chrome_api_permissions.cc
@@ -181,6 +181,7 @@ {APIPermissionID::kSafeBrowsingPrivate, "safeBrowsingPrivate"}, {APIPermissionID::kSettingsPrivate, "settingsPrivate", APIPermissionInfo::kFlagCannotBeOptional}, + {APIPermissionID::kSmartCardProviderPrivate, "smartCardProviderPrivate"}, {APIPermissionID::kSystemPrivate, "systemPrivate", APIPermissionInfo::kFlagCannotBeOptional}, {APIPermissionID::kTerminalPrivate, "terminalPrivate",
diff --git a/chrome/common/extensions/permissions/permission_set_unittest.cc b/chrome/common/extensions/permissions/permission_set_unittest.cc index 1cda2f8f..6aae38a 100644 --- a/chrome/common/extensions/permissions/permission_set_unittest.cc +++ b/chrome/common/extensions/permissions/permission_set_unittest.cc
@@ -855,6 +855,7 @@ skip.insert(APIPermissionID::kResourcesPrivate); skip.insert(APIPermissionID::kRtcPrivate); skip.insert(APIPermissionID::kSafeBrowsingPrivate); + skip.insert(APIPermissionID::kSmartCardProviderPrivate); skip.insert(APIPermissionID::kSystemPrivate); skip.insert(APIPermissionID::kTabCaptureForTab); skip.insert(APIPermissionID::kTerminalPrivate);
diff --git a/chrome/renderer/resources/extensions/file_manager_private_custom_bindings.js b/chrome/renderer/resources/extensions/file_manager_private_custom_bindings.js index 99cb6c54..f764374 100644 --- a/chrome/renderer/resources/extensions/file_manager_private_custom_bindings.js +++ b/chrome/renderer/resources/extensions/file_manager_private_custom_bindings.js
@@ -219,12 +219,13 @@ descriptor, urls, mimeTypes, callback); }); - apiFunctions.setHandleRequest('getFileTasks', function(entries, callback) { - var urls = entries.map(function(entry) { - return getEntryURL(entry); - }); - fileManagerPrivateInternal.getFileTasks(urls, callback); - }); + apiFunctions.setHandleRequest( + 'getFileTasks', function(entries, dlpSourceUrls, callback) { + var urls = entries.map(function(entry) { + return getEntryURL(entry); + }); + fileManagerPrivateInternal.getFileTasks(urls, dlpSourceUrls, callback); + }); apiFunctions.setHandleRequest('getDownloadUrl', function(entry, callback) { var url = getEntryURL(entry);
diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn index 4298aa9e..96b1cbe 100644 --- a/chrome/test/BUILD.gn +++ b/chrome/test/BUILD.gn
@@ -5458,7 +5458,6 @@ "../browser/page_load_metrics/observers/live_tab_count_page_load_metrics_observer_unittest.cc", "../browser/page_load_metrics/observers/loading_predictor_page_load_metrics_observer_unittest.cc", "../browser/page_load_metrics/observers/local_network_requests_page_load_metrics_observer_unittest.cc", - "../browser/page_load_metrics/observers/media_page_load_metrics_observer_unittest.cc", "../browser/page_load_metrics/observers/multi_tab_loading_page_load_metrics_observer_unittest.cc", "../browser/page_load_metrics/observers/page_load_metrics_observer_test_harness.cc", "../browser/page_load_metrics/observers/page_load_metrics_observer_test_harness.h", @@ -5467,7 +5466,6 @@ "../browser/page_load_metrics/observers/scheme_page_load_metrics_observer_unittest.cc", "../browser/page_load_metrics/observers/service_worker_page_load_metrics_observer_unittest.cc", "../browser/page_load_metrics/observers/signed_exchange_page_load_metrics_observer_unittest.cc", - "../browser/page_load_metrics/observers/tab_restore_page_load_metrics_observer_unittest.cc", "../browser/page_load_metrics/observers/third_party_metrics_observer_unittest.cc", "../browser/page_load_metrics/observers/translate_page_load_metrics_observer_unittest.cc", "../browser/password_manager/chrome_password_manager_client_unittest.cc", @@ -7421,6 +7419,7 @@ "../browser/ash/app_list/search/ranking/best_match_ranker_unittest.cc", "../browser/ash/app_list/search/ranking/filtering_ranker_unittest.cc", "../browser/ash/app_list/search/ranking/ftrl_ranker_unittest.cc", + "../browser/ash/app_list/search/ranking/keyword_ranker_unittest.cc", "../browser/ash/app_list/search/ranking/mrfu_ranker_unittest.cc", "../browser/ash/app_list/search/ranking/query_highlighter_unittest.cc", "../browser/ash/app_list/search/ranking/removed_results_proto_unittest.cc",
diff --git a/chrome/test/data/extensions/api_test/file_browser/app_file_handler_multi/test.js b/chrome/test/data/extensions/api_test/file_browser/app_file_handler_multi/test.js index 3bf6e3d8..142e9901 100644 --- a/chrome/test/data/extensions/api_test/file_browser/app_file_handler_multi/test.js +++ b/chrome/test/data/extensions/api_test/file_browser/app_file_handler_multi/test.js
@@ -160,9 +160,10 @@ }) .then( function(entries) { + const dlpSourceUrls = entries.map(_ => ''); var tasksPromise = new Promise(function(fulfill) { chrome.fileManagerPrivate.getFileTasks( - entries, fulfill); + entries, dlpSourceUrls, fulfill); }).then(function(resultingTasks) { const tasks = resultingTasks.tasks; chrome.test.assertEq(1, tasks.length);
diff --git a/chrome/test/data/extensions/api_test/file_browser/default_file_handler/test.js b/chrome/test/data/extensions/api_test/file_browser/default_file_handler/test.js index dc09ebd..d8868128 100644 --- a/chrome/test/data/extensions/api_test/file_browser/default_file_handler/test.js +++ b/chrome/test/data/extensions/api_test/file_browser/default_file_handler/test.js
@@ -110,8 +110,7 @@ if (resolvedEntries.length == kTestPaths.length) { resolvedEntries.forEach(function(entry) { chrome.fileManagerPrivate.getFileTasks( - [entry], - onGotTasks.bind(null, entry)); + [entry], [''], onGotTasks.bind(null, entry)); }); } });
diff --git a/chrome/test/data/extensions/api_test/file_browser/handler_test_runner/test.js b/chrome/test/data/extensions/api_test/file_browser/handler_test_runner/test.js index a0d66b4..f96f190 100644 --- a/chrome/test/data/extensions/api_test/file_browser/handler_test_runner/test.js +++ b/chrome/test/data/extensions/api_test/file_browser/handler_test_runner/test.js
@@ -111,8 +111,8 @@ actionId}`); return; } - chrome.fileManagerPrivate.getFileTasks([entry], - onGotTasks.bind(null, entry)); + chrome.fileManagerPrivate.getFileTasks( + [entry], [''], onGotTasks.bind(null, entry)); }); } @@ -169,8 +169,7 @@ if (resolvedEntries.length == kTestPaths.length) { resolvedEntries.forEach(function(entry) { chrome.fileManagerPrivate.getFileTasks( - [entry], - onGotNonDefaultTasks.bind(null, entry)); + [entry], [''], onGotNonDefaultTasks.bind(null, entry)); }); } });
diff --git a/chrome/test/data/extensions/api_test/file_system_provider/mime_type/test.js b/chrome/test/data/extensions/api_test/file_system_provider/mime_type/test.js index 90023069..a39ee35 100644 --- a/chrome/test/data/extensions/api_test/file_system_provider/mime_type/test.js +++ b/chrome/test/data/extensions/api_test/file_system_provider/mime_type/test.js
@@ -66,7 +66,7 @@ test_util.toExternalEntry(entry).then(function(externalEntry) { chrome.test.assertTrue(!!externalEntry); chrome.fileManagerPrivate.getFileTasks( - [externalEntry], + [externalEntry], [''], chrome.test.callbackPass(function(resultingTasks) { const tasks = resultingTasks.tasks; chrome.test.assertEq(1, tasks.length); @@ -97,7 +97,7 @@ chrome.test.callbackPass(function(externalEntry) { chrome.test.assertTrue(!!externalEntry); chrome.fileManagerPrivate.getFileTasks( - [externalEntry], + [externalEntry], [''], chrome.test.callbackPass(function(resultingTasks) { const tasks = resultingTasks.tasks; chrome.test.assertEq(1, tasks.length); @@ -147,7 +147,7 @@ chrome.test.callbackPass(function(externalEntry) { chrome.test.assertTrue(!!externalEntry); chrome.fileManagerPrivate.getFileTasks( - [externalEntry], + [externalEntry], [''], chrome.test.callbackPass(function(resultingTasks) { const tasks = resultingTasks.tasks; chrome.test.assertEq(0, tasks.length);
diff --git a/chrome/test/data/extensions/api_test/file_system_provider/service_worker/mime_type/test.js b/chrome/test/data/extensions/api_test/file_system_provider/service_worker/mime_type/test.js index eade87d..75d8b1a 100644 --- a/chrome/test/data/extensions/api_test/file_system_provider/service_worker/mime_type/test.js +++ b/chrome/test/data/extensions/api_test/file_system_provider/service_worker/mime_type/test.js
@@ -10,7 +10,8 @@ */ async function getFileTasks(fileEntry) { return promisifyWithLastError( - resolve => chrome.fileManagerPrivate.getFileTasks([fileEntry], resolve)); + resolve => + chrome.fileManagerPrivate.getFileTasks([fileEntry], [''], resolve)); } /**
diff --git a/chrome/test/data/webui/password_manager/checkup_details_section_test.ts b/chrome/test/data/webui/password_manager/checkup_details_section_test.ts index c8cd85f..25e01565 100644 --- a/chrome/test/data/webui/password_manager/checkup_details_section_test.ts +++ b/chrome/test/data/webui/password_manager/checkup_details_section_test.ts
@@ -5,10 +5,12 @@ import 'chrome://password-manager/password_manager.js'; import {CheckupSubpage, Page, PasswordManagerImpl, Router} from 'chrome://password-manager/password_manager.js'; +import {loadTimeData} from 'chrome://resources/js/load_time_data.js'; import {PluralStringProxyImpl} from 'chrome://resources/js/plural_string_proxy.js'; -import {assertEquals} from 'chrome://webui-test/chai_assert.js'; +import {assertEquals, assertFalse, assertTrue} from 'chrome://webui-test/chai_assert.js'; import {flushTasks} from 'chrome://webui-test/polymer_test_util.js'; import {TestPluralStringProxy} from 'chrome://webui-test/test_plural_string_proxy.js'; +import {isVisible} from 'chrome://webui-test/test_util.js'; import {TestPasswordManagerProxy} from './test_password_manager_proxy.js'; import {makeInsecureCredential} from './test_util.js'; @@ -58,5 +60,126 @@ assertEquals(type + 'Passwords', params.messageName); assertEquals(2, params.itemCount); + + assertEquals( + loadTimeData.getString(`${type}PasswordsTitle`), + section.$.subtitle.textContent!.trim()); + assertEquals( + loadTimeData.getString(`${type}PasswordsDescription`), + section.$.description.textContent!.trim()); })); + + test('Compromised issues shown correctly', async function() { + Router.getInstance().navigateTo( + Page.CHECKUP_DETAILS, CheckupSubpage.COMPROMISED); + passwordManager.data.insecureCredentials = [ + makeInsecureCredential({ + url: 'test.com', + username: 'viking', + types: [ + CompromiseType.LEAKED, + ], + elapsedMinSinceCompromise: 1, + }), + makeInsecureCredential({ + url: 'example.com', + username: 'justUser', + types: [ + CompromiseType.PHISHED, + ], + elapsedMinSinceCompromise: 10, + }), + makeInsecureCredential({ + url: 'www.bestSite.com', + username: 'random', + types: [ + CompromiseType.LEAKED, + CompromiseType.PHISHED, + ], + elapsedMinSinceCompromise: 100, + }), + ]; + + const section = document.createElement('checkup-details-section'); + document.body.appendChild(section); + await passwordManager.whenCalled('getInsecureCredentials'); + const params = await pluralString.whenCalled('getPluralString'); + await flushTasks(); + + assertEquals('compromisedPasswords', params.messageName); + assertEquals(3, params.itemCount); + + const listItemElements = + section.shadowRoot!.querySelectorAll('checkup-list-item'); + assertEquals( + listItemElements.length, + passwordManager.data.insecureCredentials.length); + + const expectedType = [ + loadTimeData.getString('leakedPassword'), + loadTimeData.getString('phishedPassword'), + loadTimeData.getString('phishedAndLeakedPassword'), + ]; + + for (let index = 0; index < listItemElements.length; ++index) { + const expectedCredential = + passwordManager.data.insecureCredentials[index]!; + const listItemElement = listItemElements[index]; + + assertTrue(!!listItemElement); + assertEquals( + expectedCredential.urls.shown, + listItemElement.$.shownUrl.textContent!.trim()); + assertEquals( + expectedCredential.username, + listItemElement.$.username.textContent!.trim()); + const compromiseType = + listItemElement.shadowRoot!.querySelector('#compromiseType'); + + assertTrue(!!compromiseType); + assertTrue(isVisible(compromiseType)); + assertEquals(expectedType[index]!, compromiseType.textContent!.trim()); + + const elapsedTime = + listItemElement.shadowRoot!.querySelector('#elapsedTime'); + assertTrue(!!elapsedTime); + assertTrue(isVisible(elapsedTime)); + assertEquals( + expectedCredential.compromisedInfo?.elapsedTimeSinceCompromise, + elapsedTime.textContent!.trim()); + } + }); + + test('Weak issues shown correctly', async function() { + Router.getInstance().navigateTo(Page.CHECKUP_DETAILS, CheckupSubpage.WEAK); + passwordManager.data.insecureCredentials = [makeInsecureCredential({ + url: 'test.com', + username: 'viking', + types: [ + CompromiseType.WEAK, + ], + elapsedMinSinceCompromise: 1, + })]; + + const section = document.createElement('checkup-details-section'); + document.body.appendChild(section); + await passwordManager.whenCalled('getInsecureCredentials'); + const params = await pluralString.whenCalled('getPluralString'); + await flushTasks(); + + assertEquals('weakPasswords', params.messageName); + assertEquals(1, params.itemCount); + + const listItemElements = + section.shadowRoot!.querySelectorAll('checkup-list-item'); + assertEquals(1, listItemElements.length); + const weakItem = listItemElements[0]; + + assertTrue(!!weakItem); + assertEquals('test.com', weakItem.$.shownUrl.textContent!.trim()); + assertEquals('viking', weakItem.$.username.textContent!.trim()); + + assertFalse(!!weakItem.shadowRoot!.querySelector('#compromiseType')); + assertFalse(!!weakItem.shadowRoot!.querySelector('#elapsedTime')); + }); });
diff --git a/chrome/test/data/webui/settings/test_site_settings_permissions_browser_proxy.ts b/chrome/test/data/webui/settings/test_site_settings_permissions_browser_proxy.ts index df95dfc..2f03969a 100644 --- a/chrome/test/data/webui/settings/test_site_settings_permissions_browser_proxy.ts +++ b/chrome/test/data/webui/settings/test_site_settings_permissions_browser_proxy.ts
@@ -27,11 +27,8 @@ ]); } - acknowledgeRevokedUnusedSitePermissionsList(unusedSitePermissionList: - UnusedSitePermissions[]) { - this.methodCalled( - 'acknowledgeRevokedUnusedSitePermissionsList', - [unusedSitePermissionList]); + acknowledgeRevokedUnusedSitePermissionsList() { + this.methodCalled('acknowledgeRevokedUnusedSitePermissionsList'); } allowPermissionsAgainForUnusedSite(origin: string) {
diff --git a/chrome/test/data/webui/settings/unused_site_permissions_test.ts b/chrome/test/data/webui/settings/unused_site_permissions_test.ts index 5492eb48..cdca163 100644 --- a/chrome/test/data/webui/settings/unused_site_permissions_test.ts +++ b/chrome/test/data/webui/settings/unused_site_permissions_test.ts
@@ -223,9 +223,8 @@ await flushTasks(); // Ensure the browser proxy call is done. - const [unusedSitePermissionsList] = await browserProxy.whenCalled( + await browserProxy.whenCalled( 'acknowledgeRevokedUnusedSitePermissionsList'); - assertEqualsMockData(unusedSitePermissionsList); }); test('Undo Got It', async function() {
diff --git a/chromeos/ash/components/drivefs/drivefs_host.cc b/chromeos/ash/components/drivefs/drivefs_host.cc index 7e597ee9..d034325 100644 --- a/chromeos/ash/components/drivefs/drivefs_host.cc +++ b/chromeos/ash/components/drivefs/drivefs_host.cc
@@ -105,8 +105,8 @@ return search_->PerformSearch(std::move(query), std::move(callback)); } - SyncStatusAndProgress GetSyncStatusForPath(const base::FilePath& drive_path) { - return sync_status_tracker_->GetSyncStatusForPath(drive_path); + SyncState GetSyncStateForPath(const base::FilePath& drive_path) { + return sync_status_tracker_->GetSyncState(drive_path); } private: @@ -134,31 +134,23 @@ } switch (event->state) { case mojom::ItemEvent::State::kQueued: - sync_status_tracker_->AddSyncStatusForPath(event->stable_id, path, - SyncStatus::kQueued, 0); + sync_status_tracker_->SetQueued(event->stable_id, std::move(path), + event->bytes_to_transfer); break; - case mojom::ItemEvent::State::kInProgress: { - float transferred = event->bytes_transferred; - float total = event->bytes_to_transfer; - float progress = -1; - if (total > 0 && transferred <= total) { - progress = transferred / total; - } else { - has_invalid_progress = true; - } - sync_status_tracker_->AddSyncStatusForPath( - event->stable_id, path, SyncStatus::kInProgress, progress); + case mojom::ItemEvent::State::kInProgress: + sync_status_tracker_->SetInProgress( + event->stable_id, std::move(path), event->bytes_transferred, + event->bytes_to_transfer); break; - } case mojom::ItemEvent::State::kFailed: // This state only comes through for failed downloads of pinned // files. Other transfer failures are reported through the OnError() // event. - sync_status_tracker_->AddSyncStatusForPath(event->stable_id, path, - SyncStatus::kError, -1); + sync_status_tracker_->SetError(event->stable_id, std::move(path)); break; case mojom::ItemEvent::State::kCompleted: - sync_status_tracker_->RemovePath(event->stable_id, path); + sync_status_tracker_->SetCompleted(event->stable_id, + std::move(path)); break; default: break; @@ -201,8 +193,7 @@ if (error->stable_id > 0) { if (base::FilePath("/").AppendRelativePath(base::FilePath(error->path), &path)) { - sync_status_tracker_->AddSyncStatusForPath(error->stable_id, path, - SyncStatus::kError, -1); + sync_status_tracker_->SetError(error->stable_id, std::move(path)); } else { LOG(ERROR) << "Failed to make path relative to drive root"; } @@ -396,12 +387,11 @@ return mount_state_->drivefs_interface(); } -SyncStatusAndProgress DriveFsHost::GetSyncStatusForPath( - const base::FilePath& drive_path) const { +SyncState DriveFsHost::GetSyncStateForPath(const base::FilePath& path) const { if (!mount_state_) { - return SyncStatusAndProgress::kNotFound; + return SyncState::CreateNotFound(path); } - return mount_state_->GetSyncStatusForPath(drive_path); + return mount_state_->GetSyncStateForPath(path); } mojom::QueryParameters::QuerySource DriveFsHost::PerformSearch(
diff --git a/chromeos/ash/components/drivefs/drivefs_host.h b/chromeos/ash/components/drivefs/drivefs_host.h index 1a1aa97..d0201ba 100644 --- a/chromeos/ash/components/drivefs/drivefs_host.h +++ b/chromeos/ash/components/drivefs/drivefs_host.h
@@ -109,8 +109,7 @@ mojom::DriveFs* GetDriveFsInterface() const; - SyncStatusAndProgress GetSyncStatusForPath( - const base::FilePath& drive_path) const; + SyncState GetSyncStateForPath(const base::FilePath& drive_path) const; // Starts DriveFs search query and returns whether it will be // performed localy or remotely. Assumes DriveFS to be mounted.
diff --git a/chromeos/ash/components/drivefs/drivefs_host_unittest.cc b/chromeos/ash/components/drivefs/drivefs_host_unittest.cc index ae1bbfc..79ec963a 100644 --- a/chromeos/ash/components/drivefs/drivefs_host_unittest.cc +++ b/chromeos/ash/components/drivefs/drivefs_host_unittest.cc
@@ -66,13 +66,6 @@ constexpr base::TimeDelta kTokenLifetime = base::Hours(1); -MATCHER_P(MatchesStatusAndProgress, value, "") { - *result_listener << "where the progress difference is " - << std::abs(arg.progress - value.progress); - return arg.status == value.status && - std::abs(arg.progress - value.progress) < 1e-4; -} - class MockDriveFs : public mojom::DriveFsInterceptorForTesting, public mojom::SearchQuery { public: @@ -359,8 +352,22 @@ mojo::FusePipes(std::move(pending_delegate_receiver_), std::move(delegate)); } - SyncStatusAndProgress GetSyncStatusForPath(std::string path) { - return host_->GetSyncStatusForPath(mount_path_.Append(path)); + SyncState GetSyncStateForPath(std::string path) { + return host_->GetSyncStateForPath(mount_path_.Append(path)); + } + + SyncState InProgress(const std::string path_str = "", + const float progress = 0) { + return {SyncStatus::kInProgress, progress, mount_path_.Append(path_str)}; + } + SyncState Error(const std::string path_str = "", const float progress = 0) { + return {SyncStatus::kError, progress, mount_path_.Append(path_str)}; + } + SyncState NotFound(const std::string path_str = "") { + return {SyncStatus::kNotFound, 0, mount_path_.Append(path_str)}; + } + SyncState Moved(const std::string path_str = "") { + return {SyncStatus::kMoved, 0, mount_path_.Append(path_str)}; } base::FilePath profile_path_; @@ -936,15 +943,15 @@ ash::features::kFilesInlineSyncStatus); ASSERT_NO_FATAL_FAILURE(DoMount()); + auto first_status = mojom::SyncingStatus::New(); first_status->item_events.emplace_back(absl::in_place, 12, 34, "/foo/bar/filename.txt", kInProgress, 100, 400, kTransfer); delegate_->OnSyncingStatusUpdate(std::move(first_status)); delegate_.FlushForTesting(); - EXPECT_THAT(GetSyncStatusForPath("foo/bar/filename.txt"), - MatchesStatusAndProgress( - SyncStatusAndProgress({SyncStatus::kInProgress, 0.25}))); + EXPECT_EQ(GetSyncStateForPath("foo/bar/filename.txt"), + InProgress("foo/bar/filename.txt", 0.25)); auto second_status = mojom::SyncingStatus::New(); second_status->item_events.emplace_back(absl::in_place, 13, 35, @@ -952,13 +959,11 @@ kFailed, 123, 456, kTransfer); delegate_->OnSyncingStatusUpdate(std::move(second_status)); delegate_.FlushForTesting(); - EXPECT_THAT(GetSyncStatusForPath("foo/bar/filename_error.txt"), - MatchesStatusAndProgress(SyncStatusAndProgress::kError)); - EXPECT_THAT(GetSyncStatusForPath("foo/bar/filename.txt"), - MatchesStatusAndProgress( - SyncStatusAndProgress({SyncStatus::kInProgress, 0.25}))); - EXPECT_THAT(GetSyncStatusForPath("foo/bar"), - MatchesStatusAndProgress(SyncStatusAndProgress::kError)); + EXPECT_EQ(GetSyncStateForPath("foo/bar/filename_error.txt"), + Error("foo/bar/filename_error.txt")); + EXPECT_EQ(GetSyncStateForPath("foo/bar/filename.txt"), + InProgress("foo/bar/filename.txt", 0.25)); + EXPECT_EQ(GetSyncStateForPath("foo/bar"), Error("foo/bar", 0.25)); auto third_status = mojom::SyncingStatus::New(); third_status->item_events.emplace_back(absl::in_place, 13, 35, @@ -966,18 +971,16 @@ kCompleted, 123, 456, kTransfer); delegate_->OnSyncingStatusUpdate(std::move(third_status)); delegate_.FlushForTesting(); - EXPECT_THAT(GetSyncStatusForPath("foo/bar/filename_error.txt"), - MatchesStatusAndProgress(SyncStatusAndProgress::kNotFound)); - EXPECT_THAT(GetSyncStatusForPath("foo/bar"), - MatchesStatusAndProgress( - SyncStatusAndProgress({SyncStatus::kInProgress, -1}))); + EXPECT_EQ(GetSyncStateForPath("foo/bar/filename_error.txt"), + Moved("foo/bar/filename_error.txt")); + EXPECT_EQ(GetSyncStateForPath("foo/bar"), InProgress("foo/bar", 0.25)); delegate_->OnError( mojom::DriveError::New(mojom::DriveError::Type::kCantUploadStorageFull, base::FilePath("/foo/bar/filename.txt"), 1)); delegate_.FlushForTesting(); - EXPECT_THAT(GetSyncStatusForPath("foo/bar/filename.txt"), - MatchesStatusAndProgress(SyncStatusAndProgress::kError)); + EXPECT_EQ(GetSyncStateForPath("foo/bar/filename.txt"), + Error("foo/bar/filename.txt")); auto fourth_status = mojom::SyncingStatus::New(); fourth_status->item_events.emplace_back(absl::in_place, 14, 36, @@ -986,8 +989,8 @@ delegate_->OnSyncingStatusUpdate(std::move(fourth_status)); delegate_.FlushForTesting(); - EXPECT_THAT(GetSyncStatusForPath("relative/path.txt"), - MatchesStatusAndProgress(SyncStatusAndProgress::kNotFound)); + EXPECT_EQ(GetSyncStateForPath("relative/path.txt"), + NotFound("relative/path.txt")); } } // namespace
diff --git a/chromeos/ash/components/drivefs/drivefs_pin_manager.cc b/chromeos/ash/components/drivefs/drivefs_pin_manager.cc index 5a1ca91..42098f6 100644 --- a/chromeos/ash/components/drivefs/drivefs_pin_manager.cc +++ b/chromeos/ash/components/drivefs/drivefs_pin_manager.cc
@@ -489,12 +489,15 @@ return Complete(SetupStage::kCannotCalculateFreeSpace); } - VLOG(2) << "Free space: " << HumanReadableSize(free_space); - progress_.stage = SetupStage::kCalculatingRequiredSpace; progress_.free_space = free_space; - NotifyProgress(); + VLOG(1) << "Calculated free space " << HumanReadableSize(free_space) << " in " + << timer_.Elapsed().InMilliseconds() << " ms"; VLOG(1) << "Calculating required space..."; + timer_ = base::ElapsedTimer(); + progress_.stage = SetupStage::kCalculatingRequiredSpace; + NotifyProgress(); + drivefs_interface_->StartSearchQuery( search_query_.BindNewPipeAndPassReceiver(), CreateMyDriveQuery()); search_query_->GetNextPage( @@ -514,27 +517,6 @@ if (items->empty()) { search_query_.reset(); - VLOG(1) << "Calculated required space in " - << timer_.Elapsed().InMilliseconds() << " ms"; - VLOG(1) << "Free space: " << HumanReadableSize(progress_.free_space); - VLOG(1) << "Required space: " - << HumanReadableSize(progress_.required_space); - VLOG(1) << "To download: " << HumanReadableSize(progress_.total_bytes); - VLOG(1) << "To pin: " << files_to_pin_.size() << " files"; - - // The free space should not go below this limit. - const int64_t margin = cryptohome::kMinFreeSpaceInBytes; - const int64_t required_with_margin = progress_.required_space + margin; - - if (progress_.free_space < required_with_margin) { - LOG(ERROR) << "Not enough space: Required: " - << HumanReadableSize(progress_.required_space) - << ", Required plus margin: " - << HumanReadableSize(required_with_margin) - << ", Free: " << HumanReadableSize(progress_.free_space); - return Complete(SetupStage::kNotEnoughSpace); - } - return StartPinning(); } @@ -552,6 +534,10 @@ continue; } + VLOG_IF(1, md.available_offline) + << "Not pinned yet but already available offline: " << id << " " + << Quote(path) << ": " << Quote(md); + DCHECK_GE(md.size, 0) << " for " << id << " " << Quote(path); const int64_t size = GetSize(md); progress_.total_bytes += size; @@ -564,6 +550,7 @@ const auto [it, ok] = files_to_pin_.try_emplace( id, Progress{.path = path.value(), .total = size}); LOG_IF(ERROR, !ok) << "Cannot add " << id << " " << Quote(path) + << " with size " << HumanReadableSize(size) << " to the files to pin: Conflicting entry " << it->second; } @@ -611,10 +598,34 @@ void DriveFsPinManager::StartPinning() { DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); - if (!should_pin_) { + VLOG(1) << "Calculated required space " + << HumanReadableSize(progress_.required_space) << " in " + << timer_.Elapsed().InMilliseconds() << " ms"; + + VLOG(1) << "Free space: " << HumanReadableSize(progress_.free_space); + VLOG(1) << "Required space: " << HumanReadableSize(progress_.required_space); + VLOG(1) << "To download: " << HumanReadableSize(progress_.total_bytes); + VLOG(1) << "To pin: " << files_to_pin_.size() << " files"; + + // The free space should not go below this limit. + const int64_t margin = cryptohome::kMinFreeSpaceInBytes; + const int64_t required_with_margin = progress_.required_space + margin; + + if (progress_.free_space < required_with_margin) { + LOG(ERROR) << "Not enough space: Free space " + << HumanReadableSize(progress_.free_space) + << " is less than required space " + << HumanReadableSize(progress_.required_space) << " + margin " + << HumanReadableSize(margin); + return Complete(SetupStage::kNotEnoughSpace); + } + + if (!should_pin_ || files_to_pin_.empty()) { return Complete(SetupStage::kSuccess); } + VLOG(1) << "Pinning " << files_to_pin_.size() << " files..."; + timer_ = base::ElapsedTimer(); progress_.stage = SetupStage::kSyncing; NotifyProgress(); @@ -765,7 +776,7 @@ DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); for (const mojom::FileChange& change : changes) { - VLOG(2) << "Got FileChange " << Quote(change); + VLOG(1) << "Got FileChange " << Quote(change); const StableId id = StableId(change.stable_id); const Files::const_iterator it = files_to_track_.find(id); @@ -873,11 +884,10 @@ LOG(ERROR) << "Not tracked: " << id << " " << Quote(path); } - VLOG_IF(1, !metadata->pinned) - << "Stopped tracking " << id << " " << Quote(path) << ": Not pinned"; + LOG_IF(ERROR, !metadata->pinned) << "Stopped tracking " << id << " " + << Quote(path) << ": Not pinned anymore"; VLOG_IF(1, metadata->available_offline) - << "Stopped tracking " << id << " " << Quote(path) - << ": Available offline"; + << "Synced " << id << " " << Quote(path); progress_.pinned_files++; NotifyProgress();
diff --git a/chromeos/ash/components/drivefs/fake_drivefs.cc b/chromeos/ash/components/drivefs/fake_drivefs.cc index c3c1428..555214bb 100644 --- a/chromeos/ash/components/drivefs/fake_drivefs.cc +++ b/chromeos/ash/components/drivefs/fake_drivefs.cc
@@ -389,6 +389,17 @@ std::move(callback).Run(drive::FILE_ERROR_OK, std::move(metadata)); } +void FakeDriveFs::GetMetadataByStableId(int64_t stable_id, + GetMetadataCallback callback) { + for (const auto& [path, metadata] : metadata_) { + if (metadata.stable_id == stable_id) { + GetMetadata(path, std::move(callback)); + return; + } + } + std::move(callback).Run(drive::FILE_ERROR_NOT_FOUND, nullptr); +} + void FakeDriveFs::SetPinned(const base::FilePath& path, bool pinned, SetPinnedCallback callback) {
diff --git a/chromeos/ash/components/drivefs/fake_drivefs.h b/chromeos/ash/components/drivefs/fake_drivefs.h index 0a88a84..7aac9779 100644 --- a/chromeos/ash/components/drivefs/fake_drivefs.h +++ b/chromeos/ash/components/drivefs/fake_drivefs.h
@@ -96,6 +96,9 @@ void GetMetadata(const base::FilePath& path, GetMetadataCallback callback) override; + void GetMetadataByStableId(int64_t stable_id, + GetMetadataCallback callback) override; + void SetPinned(const base::FilePath& path, bool pinned, SetPinnedCallback callback) override;
diff --git a/chromeos/ash/components/drivefs/mojom/drivefs.mojom b/chromeos/ash/components/drivefs/mojom/drivefs.mojom index 478d616..eac76d0 100644 --- a/chromeos/ash/components/drivefs/mojom/drivefs.mojom +++ b/chromeos/ash/components/drivefs/mojom/drivefs.mojom
@@ -128,6 +128,10 @@ // Pin or unpin an item by the supplied `stable_id`. SetPinnedByStableId(int64 stable_id, bool pinned) => (FileError error); + + // Get the metadata for the supplied `stable_id`. + GetMetadataByStableId(int64 stable_id) => ( + FileError error, FileMetadata? metadata); }; // Implemented by Chrome, used from DriveFS.
diff --git a/chromeos/ash/components/drivefs/sync_status_tracker.cc b/chromeos/ash/components/drivefs/sync_status_tracker.cc index 9a3dbb5..6ccb588 100644 --- a/chromeos/ash/components/drivefs/sync_status_tracker.cc +++ b/chromeos/ash/components/drivefs/sync_status_tracker.cc
@@ -3,134 +3,165 @@ // found in the LICENSE file. #include "chromeos/ash/components/drivefs/sync_status_tracker.h" -#include <algorithm> + #include <cstdint> -#include <deque> #include <memory> +#include <ranges> #include <utility> #include <vector> +#include "base/containers/span.h" +#include "base/files/file_path.h" +#include "base/strings/string_util.h" + namespace drivefs { -SyncStatusTracker::SyncStatusTracker() - : root_(std::make_unique<TrieNode>(SyncStatus::kNotFound, - /*path_path=*/"", - /*parent=*/nullptr)) {} +constexpr auto kNotFound = SyncStatus::kNotFound; +constexpr auto kMoved = SyncStatus::kMoved; +constexpr auto kCompleted = SyncStatus::kCompleted; +constexpr auto kQueued = SyncStatus::kQueued; +constexpr auto kInProgress = SyncStatus::kInProgress; +constexpr auto kError = SyncStatus::kError; + +std::ostream& operator<<(std::ostream& os, const SyncStatus& status) { + switch (status) { + case kNotFound: + return os << "not_found"; + case kMoved: + return os << "moved"; + case kCompleted: + return os << "completed"; + case kQueued: + return os << "queued"; + case kInProgress: + return os << "in_progress"; + case kError: + return os << "error"; + default: + return os << "unknown"; + } +} + +SyncStatusTracker::SyncStatusTracker() = default; SyncStatusTracker::~SyncStatusTracker() = default; -// TODO(msalomao): add count of kError and kInProgress descendant nodes to each -// node and update them whenever the trie changes to avoid a recursive lookup -// on query. -void SyncStatusTracker::AddSyncStatusForPath(const int64_t id, - const base::FilePath& path, - SyncStatus status, - float progress) { +SyncState SyncStatusTracker::GetSyncState(const base::FilePath path) const { + if (path.empty() || !path.IsAbsolute()) { + return SyncState::CreateNotFound(path); + } + + const Node* node = FindNode(path); + + return node ? GetNodeState(node, std::move(path)) + : SyncState::CreateNotFound(std::move(path)); +} + +const std::vector<const SyncState> SyncStatusTracker::GetChangesAndClean() { + std::vector<const SyncState> updated_sync_states; + + // Traverse trie. + std::vector<Node*> stack = {root_.get()}; + while (!stack.empty()) { + Node* node = stack.back(); + stack.pop_back(); + + for (auto& child : node->children) { + stack.emplace_back(child.second.get()); + } + + // Collect dirty nodes and flip them back to pristine. + if (node->state.IsDirty()) { + updated_sync_states.emplace_back(GetNodeState(node)); + node->state.MarkAsPristine(); + } + + if (ShouldRemoveNode(node)) { + RemoveNode(node); + } + } + + // Reset root node if it's childless. + if (root_->children.empty()) { + root_->state.Set(kNotFound, 0, 0); + } + + return updated_sync_states; +} + +SyncStatusTracker::Node* SyncStatusTracker::FindNode( + const base::FilePath& path) const { + const auto components = path.GetComponents(); + DCHECK(!components.empty() && components.front() == "/"); + const base::span<const base::FilePath::StringType> path_parts( + components.begin() + 1, components.end()); + + Node* node = root_.get(); + for (const auto& path_part : path_parts) { + auto it = node->children.find(path_part); + if (it == node->children.end()) { + return nullptr; + } + node = it->second.get(); + } + return node; +} + +void SyncStatusTracker::SetSyncState(const int64_t id, + const base::FilePath& path, + const SyncStatus status, + const int64_t transferred, + const int64_t total) { if (path.empty() || !path.IsAbsolute()) { return; } - std::vector<base::FilePath::StringType> path_parts = path.GetComponents(); - TrieNode* current_node = root_.get(); + + const auto components = path.GetComponents(); + DCHECK(!components.empty() && components.front() == "/"); + const base::span<const base::FilePath::StringType> path_parts( + components.begin() + 1, components.end()); + + Node* node = root_.get(); for (const auto& path_part : path_parts) { - std::unique_ptr<TrieNode>& matching_node = - current_node->children[path_part]; + std::unique_ptr<Node>& matching_node = node->children[path_part]; if (!matching_node) { - matching_node = std::make_unique<TrieNode>(SyncStatus::kNotFound, - path_part, current_node); + matching_node = std::make_unique<Node>(); + matching_node->path_part = path_part; + matching_node->parent = node; + matching_node->id = id; } - current_node = matching_node.get(); + node = matching_node.get(); } - current_node->status = status; - current_node->progress = progress; + SetNodeState(node, status, transferred, total); // If the entry with the given id has changed its path, this means it has been - // moved/renamed. Let's delete its old path before proceeding. + // moved/renamed. Mark it as "moved" and remove its status/progress changes + // from its current ancestors so they are not duplicated with its new + // ancestors in the trie. if (auto it = id_to_node_.find(id); - it != id_to_node_.end() && it->second != current_node) { - RemoveNode(it->second); + it != id_to_node_.end() && it->second != node) { + SetNodeState(it->second, kMoved, 0, 0); } - id_to_node_[id] = current_node; + id_to_node_[id] = node; } -SyncStatusAndProgress SyncStatusTracker::GetSyncStatusForPath( - const base::FilePath& path) { - if (path.empty() || !path.IsAbsolute()) { - return SyncStatusAndProgress::kNotFound; - } - std::vector<base::FilePath::StringType> path_parts = path.GetComponents(); - TrieNode* current_node = root_.get(); - for (const auto& path_part : path_parts) { - auto it = current_node->children.find(path_part); - if (it == current_node->children.end()) { - return SyncStatusAndProgress::kNotFound; - } - current_node = it->second.get(); - } - if (current_node->status != SyncStatus::kNotFound) { - return {current_node->status, current_node->progress}; - } - auto [status, progress] = SyncStatusAndProgress::kNotFound; - std::deque<TrieNode*> queue = {current_node}; - while (!queue.empty()) { - TrieNode* node = queue.front(); - queue.pop_front(); - if (node->status == SyncStatus::kError) { - return SyncStatusAndProgress::kError; - } - if (node->status > status) { - status = node->status; - } - // TODO(b/256931969): Optimize SyncStatusTracker to make reads O(1). - for (const auto& child : node->children) { - queue.emplace_back(child.second.get()); - } - } - return {status, progress}; +bool SyncStatusTracker::ShouldRemoveNode(const Node* node) const { + DCHECK(node); + const auto status = node->state.GetStatus(); + return node->children.empty() && + (status == SyncStatus::kCompleted || status == SyncStatus::kMoved); } -void SyncStatusTracker::RemovePath(const int64_t id, - const base::FilePath& path) { - if (path.empty() || !path.IsAbsolute()) { - return; - } - std::vector<base::FilePath::StringType> path_parts = path.GetComponents(); - TrieNode* current_node = root_.get(); - std::vector<std::pair<TrieNode*, TrieNode::PathToChildMap::iterator>> - ancestors; - for (const auto& path_part : path_parts) { - auto it = current_node->children.find(path_part); - if (it == current_node->children.end()) { - return; - } - ancestors.emplace_back(current_node, it); - current_node = it->second.get(); - } - if (current_node->children.size() > 0) { - return; - } - id_to_node_.erase(id); - while (!ancestors.empty()) { - auto& ancestor = ancestors.back(); - auto* node = ancestor.first; - auto& it = ancestor.second; - auto& child = it->second; - if (!child->children.empty()) { - break; - } - node->children.erase(it); - ancestors.pop_back(); - } -} - -void SyncStatusTracker::RemoveNode(const TrieNode* node) { - if (!node) { - return; - } - auto* parent = node->parent; +void SyncStatusTracker::RemoveNode(const Node* node) { + DCHECK(node); + Node* parent = node->parent; if (!parent) { return; } + if (node->id) { + id_to_node_.erase(node->id); + } parent->children.erase(node->path_part); - auto* grandparent = parent->parent; + Node* grandparent = parent->parent; while (grandparent && parent->children.empty()) { grandparent->children.erase(parent->path_part); parent = grandparent; @@ -138,10 +169,156 @@ } } -SyncStatusTracker::TrieNode::TrieNode(SyncStatus status, - base::FilePath::StringType path_part, - TrieNode* parent) - : status(status), path_part(path_part), parent(parent) {} -SyncStatusTracker::TrieNode::~TrieNode() = default; +const SyncState SyncStatusTracker::GetNodeState( + const Node* node, + const base::FilePath path) const { + const NodeState& state = node->state; + // Save some computation if the caller already knows the node's path. + return {state.GetStatus(), state.GetProgress(), + path.empty() ? GetNodePath(node) : std::move(path)}; +} + +void SyncStatusTracker::SetNodeState(Node* node, + const SyncStatus status, + const int64_t transferred = 0, + const int64_t total = 0) { + const NodeState& delta = node->state.Set(status, transferred, total); + + // Nothing to do if there were no changes. + if (delta.IsPristine()) { + return; + } + + // Update ancestors. + Node* p = node->parent; + while (p) { + p->state.ApplyDelta(delta); + p = p->parent; + } +} + +const base::FilePath SyncStatusTracker::GetNodePath(const Node* node) const { + if (!node->parent) { + return base::FilePath("/"); + } + + std::vector<base::FilePath::StringPieceType> path_parts = {node->path_part}; + Node* p = node->parent; + while (p) { + path_parts.emplace_back(p->path_part); + p = p->parent; + } + // Reverse the vector of parts before using it to build the path. + std::reverse(path_parts.begin(), path_parts.end()); + return base::FilePath(base::JoinString(std::move(path_parts), "/")); +} + +SyncStatusTracker::NodeState SyncStatusTracker::NodeState::Set( + const SyncStatus status, + int32_t transferred, + int32_t total) { + NodeState delta; + + // If the node's status has changed, mark as dirty (both the node and the + // delta object representing the changes applied to it). + if (status != GetStatus()) { + MarkAsDirty(); + delta.MarkAsDirty(); + int32_t old_queued_count = queued_count_; + int32_t old_in_progress_count = in_progress_count_; + int32_t old_error_count = error_count_; + SetStatus(status); + delta.queued_count_ = queued_count_ - old_queued_count; + delta.in_progress_count_ = in_progress_count_ - old_in_progress_count; + delta.error_count_ = error_count_ - old_error_count; + } + + // This step is required because completed and error status don't carry their + // actual progress data. Keeping their "total" values fixed ensures their + // ancestors' aggregate progresses don't suddenly fluctuate up or down. + if (status == kCompleted) { + // Increase transferred to 100% of the current total. + transferred = total_; + total = total_; + } else if (status == kError) { + // Lower transferred to 0% of the current total. + transferred = 0; + total = total_; + } + + delta.transferred_ = transferred - transferred_; + delta.total_ = total - total_; + + // If the total or transferred number of bytes has changed, mark as dirty + // (both the node and the delta object representing the changes applied to + // it). + if (delta.transferred_ != 0 || delta.total_ != 0) { + MarkAsDirty(); + delta.MarkAsDirty(); + } + + transferred_ = transferred; + total_ = total; + + return delta; +} + +void SyncStatusTracker::NodeState::ApplyDelta(const NodeState& delta) { + MarkAsDirty(); + queued_count_ += delta.queued_count_; + in_progress_count_ += delta.in_progress_count_; + error_count_ += delta.error_count_; + transferred_ += delta.transferred_; + total_ += delta.total_; +} + +SyncStatus SyncStatusTracker::NodeState::GetStatus() const { + if (error_count_ > 0) { + return kError; + } + if (in_progress_count_ > 0) { + return kInProgress; + } + if (queued_count_ > 0) { + return kQueued; + } + + // If the node's status isn't "error", "in_progress", or "queued", it will be + // "completed" if it has transferred some bytes. If it hasn't transferred + // any bytes but is pristine, it will also be reported as "completed" - this + // is a special case for the root node: the root node resets to zero progress + // once all it's children are "completed" but it will be "pristine" at that + // moment, therefore correctly report as "completed". Finally, if the node's + // state: + // * isn't "error", "in_progress", nor "queued", + // * has transferred no bytes, and + // * is not dirty, + // Then it must have been set as dirty because it was detected to be have been + // "moved" (once nodes are moved, their progress and total resets to 0 and + // they are marked as dirty); + return transferred_ || IsPristine() ? kCompleted : kMoved; +} + +void SyncStatusTracker::NodeState::SetStatus(const SyncStatus status) { + switch (status) { + case kQueued: + queued_count_ = 1; + break; + case kInProgress: + in_progress_count_ = 1; + break; + case kError: + error_count_ = 1; + break; + default: + queued_count_ = 0; + in_progress_count_ = 0; + error_count_ = 0; + break; + } +} + +SyncStatusTracker::Node::Node() = default; +SyncStatusTracker::Node::~Node() = default; } // namespace drivefs
diff --git a/chromeos/ash/components/drivefs/sync_status_tracker.h b/chromeos/ash/components/drivefs/sync_status_tracker.h index e9825b11..04a4256 100644 --- a/chromeos/ash/components/drivefs/sync_status_tracker.h +++ b/chromeos/ash/components/drivefs/sync_status_tracker.h
@@ -5,8 +5,12 @@ #ifndef CHROMEOS_ASH_COMPONENTS_DRIVEFS_SYNC_STATUS_TRACKER_H_ #define CHROMEOS_ASH_COMPONENTS_DRIVEFS_SYNC_STATUS_TRACKER_H_ +#include <cmath> #include <cstddef> +#include <cstdint> #include <memory> +#include <string> +#include <string_view> #include "base/component_export.h" #include "base/containers/flat_map.h" @@ -18,74 +22,165 @@ // The precedence increases from top to bottom. E.g., a directory containing // one file with SyncStatus=kInProgress and one file with SyncStatus=kError will // be reported with SyncStatus=kError. -enum SyncStatus { +enum class SyncStatus { kNotFound, + kMoved, + kCompleted, kQueued, kInProgress, kError, }; +COMPONENT_EXPORT(CHROMEOS_ASH_COMPONENTS_DRIVEFS) +std::ostream& operator<<(std::ostream& os, const SyncStatus& status); -struct SyncStatusAndProgress { +struct SyncState { SyncStatus status; + float progress; // Range: 0 to 1. + base::FilePath path; - // Range: 0 to 1. - float progress; + friend std::ostream& operator<<(std::ostream& os, const SyncState& state) { + return os << "('" << state.path << "', " << state.status << ", " + << (int)(state.progress * 100.f) << "%" + << ") "; + } + bool operator==(const SyncState& state) const { + return state.path == path && state.status == status && + std::fabs(state.progress - progress) < 1e-4; + } - static const SyncStatusAndProgress kNotFound; - static const SyncStatusAndProgress kQueued; - static const SyncStatusAndProgress kError; + inline static SyncState CreateNotFound(const base::FilePath path) { + return {SyncStatus::kNotFound, 0, std::move(path)}; + } }; -inline const SyncStatusAndProgress SyncStatusAndProgress::kNotFound{ - SyncStatus::kNotFound, -1}; -inline const SyncStatusAndProgress SyncStatusAndProgress::kQueued{ - SyncStatus::kQueued, 0}; -inline const SyncStatusAndProgress SyncStatusAndProgress::kError{ - SyncStatus::kError, -1}; - -// Cache for sync status coming from DriveFs. +// Cache for sync statuses coming from arbitrary cloud providers. // Allows quick insertion, removal, and look up by file path. +// How to use it: +// 1. Update the tracker by making calls to SetCompleted, SetQueued, +// SetInProgress, and SetError; +// 2. The state of any path can be tracked at any time using GetSyncState; +// 3. In time intervals (recommended: between 0 and 1 second), call +// GetChangesAndClean to get all accumulated changes so far and efficiently +// report them without any duplicates. This will also clear up the memory used +// by nodes that no longer need to be tracked (completed or removed). class COMPONENT_EXPORT(CHROMEOS_ASH_COMPONENTS_DRIVEFS) SyncStatusTracker { public: SyncStatusTracker(); ~SyncStatusTracker(); - SyncStatusTracker(const SyncStatusTracker&) = delete; SyncStatusTracker& operator=(const SyncStatusTracker&) = delete; - void AddSyncStatusForPath(const int64_t id, - const base::FilePath& path, - SyncStatus status, - float progress); - SyncStatusAndProgress GetSyncStatusForPath(const base::FilePath& path); - void RemovePath(const int64_t id, const base::FilePath& path); + void SetCompleted(const int64_t id, const base::FilePath& path) { + SetSyncState(id, path, SyncStatus::kCompleted); + } + void SetQueued(const int64_t id, + const base::FilePath& path, + const int64_t total) { + SetSyncState(id, path, SyncStatus::kQueued, 0, total); + } + void SetInProgress(const int64_t id, + const base::FilePath& path, + const int64_t transferred, + const int64_t total) { + SetSyncState(id, path, SyncStatus::kInProgress, transferred, total); + } + void SetError(const int64_t id, const base::FilePath& path) { + SetSyncState(id, path, SyncStatus::kError); + } - size_t LeafCount() const { return id_to_node_.size(); } + SyncState GetSyncState(const base::FilePath path) const; + + // Returns a vector of all paths that changed status or progress since the + // creation of the SyncStatusTracker instance or since the last call to this + // function. Upon calling it, the trie is reset to a pristine state, meaning + // it will report 0 accumulated changes until more changes are registered + // through SetCompleted, SetQueued, SetInProgress, and SetError. + const std::vector<const SyncState> GetChangesAndClean(); + + size_t GetFileCount() const { return id_to_node_.size(); } private: - struct TrieNode { - typedef base::flat_map<base::FilePath::StringType, - std::unique_ptr<TrieNode>> - PathToChildMap; + struct NodeState; + struct Node; - explicit TrieNode(SyncStatus status, - base::FilePath::StringType path_part, - TrieNode* parent); - ~TrieNode(); + Node* FindNode(const base::FilePath& path) const; - SyncStatus status; - float progress = 0; - PathToChildMap children; - base::FilePath::StringType path_part; - TrieNode* parent = nullptr; - }; + void SetSyncState(const int64_t id, + const base::FilePath& path, + const SyncStatus status, + const int64_t transferred = 0, + const int64_t total = 0); + + bool ShouldRemoveNode(const Node* node) const; // Remove the node and traverse its parents removing them if they become // childless. - void RemoveNode(const TrieNode* node); + void RemoveNode(const Node* node); - std::unique_ptr<TrieNode> root_ = nullptr; - base::flat_map<int64_t, TrieNode*> id_to_node_; + // Sets the new state on the node and propagate the state delta to the node's + // ancestors until the root. + void SetNodeState(Node* node, + const SyncStatus status, + const int64_t transferred, + const int64_t total); + + const SyncState GetNodeState( + const Node* node, + const base::FilePath path = base::FilePath()) const; + + const base::FilePath GetNodePath(const Node* node) const; + + std::unique_ptr<Node> root_ = std::make_unique<Node>(); + base::flat_map<int64_t, Node*> id_to_node_; +}; + +struct SyncStatusTracker::NodeState { + public: + // Sets the state with the provided new values and returns a "delta" NodeState + // representing what changes were applied. If delta is pristine, no changes + // were applied. + NodeState Set(const SyncStatus new_status, + const int32_t transferred, + const int32_t total); + + void ApplyDelta(const NodeState& status); + + inline void MarkAsDirty() { is_dirty_ = true; } + inline void MarkAsPristine() { is_dirty_ = false; } + inline bool IsDirty() const { return is_dirty_; } + inline bool IsPristine() const { return !is_dirty_; } + + float GetProgress() const { + return total_ ? (float)transferred_ / (float)total_ : 0; + } + + SyncStatus GetStatus() const; + void SetStatus(const SyncStatus status); + + private: + int32_t queued_count_ = 0; + int32_t in_progress_count_ = 0; + int32_t error_count_ = 0; + int64_t transferred_ = 0; + int64_t total_ = 0; + // Tracks whether the status that GetStatus() would return has changed since + // the NodeState instance was created or since the instance was last + // marked as pristine, whichever happened last. + bool is_dirty_ = false; +}; + +struct SyncStatusTracker::Node { + Node(); + ~Node(); + + typedef base::flat_map<base::FilePath::StringType, std::unique_ptr<Node>> + PathToChildMap; + + int64_t id = 0; + PathToChildMap children; + base::FilePath::StringType path_part; + Node* parent = nullptr; + NodeState state; }; } // namespace drivefs
diff --git a/chromeos/ash/components/drivefs/sync_status_tracker_unittest.cc b/chromeos/ash/components/drivefs/sync_status_tracker_unittest.cc index f1ba9e64f..9a61d3e 100644 --- a/chromeos/ash/components/drivefs/sync_status_tracker_unittest.cc +++ b/chromeos/ash/components/drivefs/sync_status_tracker_unittest.cc
@@ -4,198 +4,249 @@ #include "chromeos/ash/components/drivefs/sync_status_tracker.h" +#include <cstdint> +#include <memory> + +#include "base/files/file_path.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" namespace drivefs { namespace { -MATCHER_P(MatchesStatusAndProgress, value, "") { - *result_listener << "where the progress difference is " - << std::abs(arg.progress - value.progress); - return arg.status == value.status && - std::abs(arg.progress - value.progress) < 1e-4; +const base::FilePath // + root("/"), // + a("/a"), // + b("/b"), // + ab("/a/b"), // + ad("/a/d"), // + abc("/a/b/c"), // + abcd("/a/b/c/d"), // + abce("/a/b/c/e"), // + abcf("/a/b/c/f"), // + abd("/a/b/d"), // + abe("/a/b/e"), // + af("/a/f"), // + afg("/a/f/g"); // + +inline SyncState NotFound(const base::FilePath path = base::FilePath()) { + return {SyncStatus::kNotFound, 0, path}; +} +inline SyncState Moved(const base::FilePath path = base::FilePath()) { + return {SyncStatus::kMoved, 0, path}; +} +inline SyncState Completed(const base::FilePath path = base::FilePath()) { + return {SyncStatus::kCompleted, 1, path}; +} +inline SyncState Queued(const base::FilePath path = base::FilePath()) { + return {SyncStatus::kQueued, 0, path}; +} +inline SyncState InProgress(const base::FilePath path = base::FilePath(), + const float progress = 0) { + return {SyncStatus::kInProgress, progress, path}; +} +inline SyncState Error(const base::FilePath path = base::FilePath(), + const float progress = 0) { + return {SyncStatus::kError, progress, path}; } class SyncStatusTrackerTest : public testing::Test { public: SyncStatusTrackerTest() = default; - SyncStatusTrackerTest(const SyncStatusTrackerTest&) = delete; SyncStatusTrackerTest& operator=(const SyncStatusTrackerTest&) = delete; - SyncStatus GetSyncStatus(SyncStatusTracker& tracker, - const std::string& path) { - return tracker.GetSyncStatusForPath(base::FilePath(path)).status; - } - - SyncStatusAndProgress GetSyncStatusAndProgress(SyncStatusTracker& tracker, - const std::string& path) { - return tracker.GetSyncStatusForPath(base::FilePath(path)); - } - - void AddSyncStatus(SyncStatusTracker& tracker, - const int64_t id, - const std::string& path, - SyncStatus status) { - return tracker.AddSyncStatusForPath(id, base::FilePath(path), status, 0); - } - - void AddSyncStatusAndProgress(SyncStatusTracker& tracker, - const int64_t id, - const std::string& path, - SyncStatus status, - float progress) { - return tracker.AddSyncStatusForPath(id, base::FilePath(path), status, - progress); - } + SyncStatusTracker t; }; -TEST_F(SyncStatusTrackerTest, PathReturnsValueForLeafAndAncestors) { - SyncStatusTracker tracker; - - AddSyncStatus(tracker, 0, "/a/b/c", SyncStatus::kInProgress); - EXPECT_EQ(GetSyncStatus(tracker, "/a/b/c"), SyncStatus::kInProgress); - EXPECT_EQ(GetSyncStatus(tracker, "/a/b"), SyncStatus::kInProgress); - EXPECT_EQ(GetSyncStatus(tracker, "/a"), SyncStatus::kInProgress); - EXPECT_EQ(GetSyncStatus(tracker, "/"), SyncStatus::kInProgress); +TEST_F(SyncStatusTrackerTest, StatePropagatesToAncestors) { + t.SetInProgress(0, abc, 0, 0); + ASSERT_EQ(t.GetSyncState(abc), InProgress(abc)); + ASSERT_EQ(t.GetSyncState(ab), InProgress(ab)); + ASSERT_EQ(t.GetSyncState(a), InProgress(a)); + ASSERT_EQ(t.GetSyncState(root), InProgress(root)); } TEST_F(SyncStatusTrackerTest, ErrorTakesPrecedenceInAncestors) { - SyncStatusTracker tracker; - - AddSyncStatus(tracker, 0, "/a/b/c", SyncStatus::kInProgress); - AddSyncStatus(tracker, 1, "/a/b/d", SyncStatus::kError); - EXPECT_EQ(GetSyncStatus(tracker, "/a/b/c"), SyncStatus::kInProgress); - EXPECT_EQ(GetSyncStatus(tracker, "/a/b"), SyncStatus::kError); - EXPECT_EQ(GetSyncStatus(tracker, "/a"), SyncStatus::kError); - EXPECT_EQ(GetSyncStatus(tracker, "/"), SyncStatus::kError); + t.SetInProgress(0, abc, 0, 0); + t.SetError(1, abd); + ASSERT_EQ(t.GetSyncState(abc), InProgress(abc)); + ASSERT_EQ(t.GetSyncState(ab), Error(ab)); + ASSERT_EQ(t.GetSyncState(a), Error(a)); + ASSERT_EQ(t.GetSyncState(root), Error(root)); } TEST_F(SyncStatusTrackerTest, PathsNotInTrackerReturnNotFound) { - SyncStatusTracker tracker; - - AddSyncStatus(tracker, 0, "/a/b/c", SyncStatus::kInProgress); - EXPECT_EQ(GetSyncStatus(tracker, "/a/b/c"), SyncStatus::kInProgress); - EXPECT_EQ(GetSyncStatus(tracker, "/a/b/d"), SyncStatus::kNotFound); + t.SetInProgress(0, abc, 0, 0); + ASSERT_EQ(t.GetSyncState(abc), InProgress(abc)); + ASSERT_EQ(t.GetSyncState(abd), NotFound(abd)); } TEST_F(SyncStatusTrackerTest, RemovingAPathRemovesSingleUseAncestors) { - SyncStatusTracker tracker; + t.SetInProgress(0, abcf, 10, 100); + t.SetInProgress(1, abd, 10, 100); + t.SetInProgress(2, abe, 10, 100); - AddSyncStatus(tracker, 0, "/a/b/c/f", SyncStatus::kInProgress); - AddSyncStatus(tracker, 1, "/a/b/d", SyncStatus::kInProgress); - AddSyncStatus(tracker, 2, "/a/b/e", SyncStatus::kInProgress); + t.SetCompleted(0, base::FilePath(abcf)); - tracker.RemovePath(0, base::FilePath("/a/b/c/f")); - EXPECT_EQ(GetSyncStatus(tracker, "/a/b/c/f"), SyncStatus::kNotFound); - EXPECT_EQ(GetSyncStatus(tracker, "/a/b/c"), SyncStatus::kNotFound); - EXPECT_EQ(GetSyncStatus(tracker, "/a/b"), SyncStatus::kInProgress); + ASSERT_EQ(t.GetSyncState(ab), InProgress(ab, 120. / 300.)); + ASSERT_EQ(t.GetSyncState(abc), Completed(abc)); + ASSERT_EQ(t.GetSyncState(abcf), Completed(abcf)); + + t.GetChangesAndClean(); + + ASSERT_EQ(t.GetSyncState(abcf), NotFound(abcf)); + ASSERT_EQ(t.GetSyncState(abc), NotFound(abc)); } -TEST_F(SyncStatusTrackerTest, OnlyLeafPathsCanBeRemoved) { - SyncStatusTracker tracker; +TEST_F(SyncStatusTrackerTest, FoldersCantBeMarkedCompleted) { + t.SetInProgress(0, abcd, 0, 0); - AddSyncStatus(tracker, 0, "/a/b/c/d", SyncStatus::kInProgress); + t.SetCompleted(1, base::FilePath(abc)); + t.SetCompleted(2, base::FilePath(ab)); + t.SetCompleted(3, base::FilePath(a)); - tracker.RemovePath(1, base::FilePath("/a/b/c")); - tracker.RemovePath(2, base::FilePath("/a/b")); - tracker.RemovePath(3, base::FilePath("/a")); - - EXPECT_EQ(GetSyncStatus(tracker, "/a/b/c/d"), SyncStatus::kInProgress); + ASSERT_EQ(t.GetSyncState(abcd), InProgress(abcd)); } TEST_F(SyncStatusTrackerTest, Utf8PathsAreSupported) { - SyncStatusTracker tracker; - - AddSyncStatus(tracker, 0, "/a/b/日本", SyncStatus::kInProgress); - EXPECT_EQ(GetSyncStatus(tracker, "/a/b/日本"), SyncStatus::kInProgress); + const base::FilePath utf8_path("/a/b/日本"); + t.SetInProgress(0, utf8_path, 0, 0); + ASSERT_EQ(t.GetSyncState(utf8_path), InProgress(utf8_path)); } TEST_F(SyncStatusTrackerTest, DeletingNonexistingPathIsNoOp) { - SyncStatusTracker tracker; + t.SetInProgress(0, abcd, 0, 0); - AddSyncStatus(tracker, 0, "/a/b/c/d", SyncStatus::kInProgress); + t.SetCompleted(1, base::FilePath("/a/b/c/d/e")); + t.GetFileCount(); - tracker.RemovePath(1, base::FilePath("/a/b/c/d/e")); - - EXPECT_EQ(GetSyncStatus(tracker, "/a/b/c/d"), SyncStatus::kInProgress); + ASSERT_EQ(t.GetSyncState(abcd), InProgress(abcd)); } TEST_F(SyncStatusTrackerTest, AddingExistingPathReplacesStatus) { - SyncStatusTracker tracker; + t.SetInProgress(0, abcd, 0, 0); + t.SetError(1, abcd); - AddSyncStatus(tracker, 0, "/a/b/c/d", SyncStatus::kInProgress); - AddSyncStatus(tracker, 1, "/a/b/c/d", SyncStatus::kError); - - EXPECT_EQ(GetSyncStatus(tracker, "/a/b/c/d"), SyncStatus::kError); + ASSERT_EQ(t.GetSyncState(abcd), Error(abcd)); } TEST_F(SyncStatusTrackerTest, MalformedPathsAreSupported) { - SyncStatusTracker tracker; + base::FilePath malformed_path("////"); + t.SetInProgress(0, malformed_path, 0, 0); - AddSyncStatus(tracker, 0, "////", SyncStatus::kInProgress); - - EXPECT_EQ(GetSyncStatus(tracker, "////"), SyncStatus::kInProgress); + ASSERT_EQ(t.GetSyncState(malformed_path), InProgress(malformed_path)); } TEST_F(SyncStatusTrackerTest, RelativePathsAreNotSupported) { - SyncStatusTracker tracker; + base::FilePath relative_path1("./.."); + base::FilePath relative_path2("../"); - AddSyncStatus(tracker, 0, "./..", SyncStatus::kInProgress); - AddSyncStatus(tracker, 1, "../", SyncStatus::kInProgress); + t.SetInProgress(0, relative_path1, 0, 0); + t.SetInProgress(1, relative_path2, 0, 0); - EXPECT_EQ(GetSyncStatus(tracker, "./.."), SyncStatus::kNotFound); - EXPECT_EQ(GetSyncStatus(tracker, "../"), SyncStatus::kNotFound); + ASSERT_EQ(t.GetSyncState(relative_path1), NotFound(relative_path1)); + ASSERT_EQ(t.GetSyncState(relative_path2), NotFound(relative_path2)); } -TEST_F(SyncStatusTrackerTest, MovingFileRemovesOldPath) { - SyncStatusTracker tracker; - - AddSyncStatusAndProgress(tracker, 0, "/a/b/c/d", SyncStatus::kInProgress, - 0.1); - AddSyncStatusAndProgress(tracker, 1, "/a/b/c/e", SyncStatus::kQueued, 0); +TEST_F(SyncStatusTrackerTest, MovingFileDoesNotImmediatelyRemoveOldPath) { + t.SetInProgress(0, abcd, 10, 100); + t.SetQueued(1, abce, 0); // Rename /a/b/c/d to /a/b/c/f. - AddSyncStatusAndProgress(tracker, 0, "/a/b/c/f", SyncStatus::kInProgress, - 0.5); + t.SetInProgress(0, abcf, 50, 100); - // Old path is removed. - EXPECT_THAT(GetSyncStatusAndProgress(tracker, "/a/b/c/d"), - MatchesStatusAndProgress(SyncStatusAndProgress::kNotFound)); - EXPECT_THAT(GetSyncStatusAndProgress(tracker, "/a/b/c/e"), - MatchesStatusAndProgress(SyncStatusAndProgress::kQueued)); + // Old path is moved. + ASSERT_EQ(t.GetSyncState(abcd), Moved(abcd)); + ASSERT_EQ(t.GetSyncState(abce), Queued(abce)); // New path is tracked. - EXPECT_THAT(GetSyncStatusAndProgress(tracker, "/a/b/c/f"), - MatchesStatusAndProgress( - SyncStatusAndProgress{SyncStatus::kInProgress, 0.5})); + ASSERT_EQ(t.GetSyncState(abcf), InProgress(abcf, 0.5)); - EXPECT_EQ(tracker.LeafCount(), 2u); + ASSERT_EQ(t.GetFileCount(), 2u); } -TEST_F(SyncStatusTrackerTest, MovingFileRemovesOldPathAndParents) { - SyncStatusTracker tracker; - - AddSyncStatusAndProgress(tracker, 0, "/a/b/c/d", SyncStatus::kInProgress, - 0.1); +TEST_F(SyncStatusTrackerTest, + MovingFileDoesNotImmediatelyRemoveOldPathAndParents) { + t.SetInProgress(0, abcd, 10, 100); // Rename /a/b/c/d to /a/d. - AddSyncStatusAndProgress(tracker, 0, "/a/d", SyncStatus::kInProgress, 0.2); + t.SetInProgress(0, ad, 20, 100); - // Old path is removed along with any childless parents. - EXPECT_THAT(GetSyncStatusAndProgress(tracker, "/a/b/c/d"), - MatchesStatusAndProgress(SyncStatusAndProgress::kNotFound)); - EXPECT_THAT(GetSyncStatusAndProgress(tracker, "/a/b/c"), - MatchesStatusAndProgress(SyncStatusAndProgress::kNotFound)); - EXPECT_THAT(GetSyncStatusAndProgress(tracker, "/a/b"), - MatchesStatusAndProgress(SyncStatusAndProgress::kNotFound)); + // Old path is marked as "moved" along with any childless parents. + ASSERT_EQ(t.GetSyncState(abcd), Moved(abcd)); + ASSERT_EQ(t.GetSyncState(abc), Moved(abc)); + ASSERT_EQ(t.GetSyncState(ab), Moved(ab)); // New path is tracked. - EXPECT_THAT(GetSyncStatusAndProgress(tracker, "/a/d"), - MatchesStatusAndProgress( - SyncStatusAndProgress{SyncStatus::kInProgress, 0.2})); - EXPECT_THAT(GetSyncStatusAndProgress(tracker, "/a"), - MatchesStatusAndProgress( - SyncStatusAndProgress{SyncStatus::kInProgress, -1})); + ASSERT_EQ(t.GetSyncState(ad), InProgress(ad, 0.2)); + ASSERT_EQ(t.GetSyncState(a), InProgress(a, 0.2)); - EXPECT_EQ(tracker.LeafCount(), 1u); + ASSERT_EQ(t.GetFileCount(), 1u); +} + +TEST_F(SyncStatusTrackerTest, FolderAggregateProgress) { + t.SetInProgress(0, abcd, 10, 100); + t.SetInProgress(1, abce, 20, 100); + t.SetInProgress(2, ad, 20, 100); + + ASSERT_EQ(t.GetSyncState(abc), InProgress(abc, 30. / 200.)); + ASSERT_EQ(t.GetSyncState(ab), InProgress(ab, 30. / 200.)); + ASSERT_EQ(t.GetSyncState(a), InProgress(a, 50. / 300.)); + + t.SetInProgress(0, abcd, 50, 100); + t.SetInProgress(2, ad, 10, 200); + + ASSERT_EQ(t.GetSyncState(ab), InProgress(ab, 70. / 200.)); + ASSERT_EQ(t.GetSyncState(a), InProgress(a, 80. / 400.)); + + t.SetError(0, abcd); + + ASSERT_EQ(t.GetSyncState(ab), Error(ab, 20. / 200.)); + ASSERT_EQ(t.GetSyncState(a), Error(a, 30. / 400.)); +} + +TEST_F(SyncStatusTrackerTest, OnlyDirtyNodesAreReturned) { + t.SetInProgress(0, abcd, 10, 100); + t.SetInProgress(1, abce, 20, 100); + t.SetInProgress(2, ad, 20, 100); + + ASSERT_THAT(t.GetChangesAndClean(), + testing::UnorderedElementsAre(InProgress(root, 50. / 300.), // + InProgress(a, 50. / 300.), // + InProgress(ab, 30. / 200.), // + InProgress(abc, 30. / 200.), // + InProgress(abcd, 10. / 100.), // + InProgress(abce, 20. / 100.), // + InProgress(ad, 20. / 100.))); // + + t.SetError(0, abcd); + t.SetQueued(3, afg, 100); + + ASSERT_THAT(t.GetChangesAndClean(), + testing::UnorderedElementsAre(Error(root, 40. / 400.), // + Error(a, 40. / 400.), // + Error(ab, 20. / 200.), // + Error(abc, 20. / 200.), // + Error(abcd, 0. / 100.), // + Queued(af), // + Queued(afg))); // + + t.SetCompleted(1, abce); + + ASSERT_THAT(t.GetChangesAndClean(), + testing::UnorderedElementsAre(Error(root, 120. / 400.), // + Error(a, 120. / 400.), // + Error(ab, 100. / 200.), // + Error(abc, 100. / 200.), // + Completed(abce))); // + + // Move /a/b/c/d to /b. + t.SetInProgress(0, b, 20, 100); + + ASSERT_THAT(t.GetChangesAndClean(), + testing::UnorderedElementsAre(InProgress(root, 140. / 400.), // + InProgress(a, 120. / 300.), // + Completed(ab), // + Completed(abc), // + Moved(abcd), // + InProgress(b, 20. / 100.))); // } } // namespace
diff --git a/components/autofill/content/renderer/form_autofill_util.cc b/components/autofill/content/renderer/form_autofill_util.cc index 55ffb37..35cb709 100644 --- a/components/autofill/content/renderer/form_autofill_util.cc +++ b/components/autofill/content/renderer/form_autofill_util.cc
@@ -1444,6 +1444,28 @@ } } +// Emits a devtools issue if two or more inputs tags have the same id +// attribute. +void MaybeEmitDuplicateIdForInputIssue( + const WebVector<WebFormControlElement>& control_elements) { + base::flat_map<WebString, int> id_count; + + for (const WebFormControlElement& element : control_elements) { + if (IsAutofillableElement(element) && !element.GetIdAttribute().IsEmpty()) { + id_count[element.GetIdAttribute()]++; + } + } + + for (const WebFormControlElement& element : control_elements) { + if (IsAutofillableElement(element) && + id_count[element.GetIdAttribute()] > 1) { + element.GetDocument().GetFrame()->AddGenericIssue( + blink::mojom::GenericIssueErrorType::kFormLabelForNameError, + element.GetDevToolsNodeId()); + } + } +} + // Populates the |form|'s // * FormData::fields // * FormData::child_frames @@ -1474,6 +1496,8 @@ DCHECK(!optional_field || form_control_element); DCHECK(!form_element || fieldsets.empty()); + MaybeEmitDuplicateIdForInputIssue(control_elements); + // Extracts fields from |control_elements| into `form->fields` and sets // `form->child_frames[i].predecessor` to the field index of the last field // that precedes the |i|th child frame.
diff --git a/components/autofill/core/browser/form_data_importer_unittest.cc b/components/autofill/core/browser/form_data_importer_unittest.cc index 59f6fca..a350322 100644 --- a/components/autofill/core/browser/form_data_importer_unittest.cc +++ b/components/autofill/core/browser/form_data_importer_unittest.cc
@@ -810,6 +810,9 @@ ExtractAddressProfilesAndVerifyExpectation(*form_structure, expected_profiles); }; + + AutofillProfile kDefaultUSProfile = + ConstructDefaultProfileWithOverriddenCountry("US"); // The German profile doesn't expect a state. AutofillProfile kDefaultGermanProfile = ConstructDefaultProfileWithOverriddenCountry("DE"); @@ -818,13 +821,21 @@ // Country part of the form: // If a valid country was entered, use that. ImportWithCountry("Germany", {kDefaultGermanProfile}); - // Reject the profile if an invalid country was entered. - ImportWithCountry("Somewhere", {}); + // Depending on AutofillIgnoreInvalidCountryOnImport, profiles with an + // invalid observed country are (not) rejected. + if (base::FeatureList::IsEnabled( + features::kAutofillIgnoreInvalidCountryOnImport)) { + // In this case, `FormDataImporter::GetPredictedCountryCode()` defaults to + // the locale. + ImportWithCountry("Somewhere", {kDefaultUSProfile}); + } else { + ImportWithCountry("Somewhere", {}); + } // Country not part of the form: Complement using - // FormDataImporter::GetPredictedCountryCode - // If no variation config country code is available, default to locale (US) - ImportWithCountry("", {ConstructDefaultProfileWithOverriddenCountry("US")}); - // Prefer variation config country code over locale + // `FormDataImporter::GetPredictedCountryCode()`. Since no variation config + // country code is available, it defaults to the locale (US). + ImportWithCountry("", {kDefaultUSProfile}); + // Prefer the variation config country code over locale. autofill_client_->SetVariationConfigCountryCode("DE"); ImportWithCountry("", {kDefaultGermanProfile}); } @@ -1918,105 +1929,33 @@ EXPECT_THAT(*results[0], ComparesEqual(profile)); } -// Tests that no profile is inferred if the country is not recognized. -TEST_P(FormDataImporterTest, ImportAddressProfiles_UnrecognizedCountry) { - FormData form; - form.url = GURL("https://www.foo.com"); - - FormFieldData field; - test::CreateTestFormField("First name:", "first_name", "George", "text", - &field); - form.fields.push_back(field); - test::CreateTestFormField("Last name:", "last_name", "Washington", "text", - &field); - form.fields.push_back(field); - test::CreateTestFormField("Email:", "email", "theprez@gmail.com", "text", - &field); - form.fields.push_back(field); - test::CreateTestFormField("Address:", "address1", "21 Laussat St", "text", - &field); - form.fields.push_back(field); - test::CreateTestFormField("City:", "city", "San Francisco", "text", &field); - form.fields.push_back(field); - test::CreateTestFormField("State:", "state", "California", "text", &field); - form.fields.push_back(field); - test::CreateTestFormField("Zip:", "zip", "94102", "text", &field); - form.fields.push_back(field); - test::CreateTestFormField("Country:", "country", "Notacountry", "text", - &field); - form.fields.push_back(field); - - FormStructure form_structure(form); - form_structure.DetermineHeuristicTypes(nullptr, nullptr); - ExtractAddressProfiles(/*extraction_successful=*/false, form_structure); - - // Since no refresh is expected, reload the data from the database to make - // sure no changes were written out. - ResetPersonalDataManager(USER_MODE_NORMAL); - - ASSERT_EQ(0U, personal_data_manager_->GetProfiles().size()); - ASSERT_EQ(0U, personal_data_manager_->GetCreditCards().size()); -} - // Tests that a profile is imported if the country can be translated using the // page language. TEST_P(FormDataImporterTest, ImportAddressProfiles_LocalizedCountryName) { - FormData form; - form.url = GURL("https://www.foo.com"); - - // Create a form with all important fields. - FormFieldData field; - test::CreateTestFormField("First name:", "first_name", "George", "text", - &field); - form.fields.push_back(field); - test::CreateTestFormField("Last name:", "last_name", "Washington", "text", - &field); - form.fields.push_back(field); - test::CreateTestFormField("Email:", "email", "theprez@gmail.com", "text", - &field); - form.fields.push_back(field); - test::CreateTestFormField("Address:", "address1", "21 Laussat St", "text", - &field); - form.fields.push_back(field); - test::CreateTestFormField("City:", "city", "San Francisco", "text", &field); - form.fields.push_back(field); - test::CreateTestFormField("State:", "state", "California", "text", &field); - form.fields.push_back(field); - test::CreateTestFormField("Zip:", "zip", "94102", "text", &field); - form.fields.push_back(field); - // The country field has a localized value. - test::CreateTestFormField("Country:", "country", "Armenien", "text", &field); - form.fields.push_back(field); + std::unique_ptr<FormStructure> form_structure = + ConstructFormStructureFromTypeValuePairs( + GetDefaultProfileTypeValuePairsWithOverriddenCountry("Armenien")); // Set up language state mock. autofill_client_->GetLanguageState()->SetSourceLanguage(""); - // Verify that the country code is not determined from the country value if - // the page language is not set. - FormStructure form_structure(form); - form_structure.DetermineHeuristicTypes(nullptr, nullptr); - ExtractAddressProfiles(/*extraction_successful=*/false, form_structure); - - ASSERT_EQ(0U, personal_data_manager_->GetProfiles().size()); - ASSERT_EQ(0U, personal_data_manager_->GetCreditCards().size()); + // the page language is not set. Depending on + // AutofillIgnoreInvalidCountryOnImport, a profile with an incorrect country + // might still be imported. + if (base::FeatureList::IsEnabled( + features::kAutofillIgnoreInvalidCountryOnImport)) { + ExtractAddressProfileAndVerifyExtractionOfDefaultProfile(*form_structure); + // Remove the imported profile again, so it doesn't affect the expectation + // below. + personal_data_manager_->ClearAllLocalData(); + } else { + ImportAddressProfileAndVerifyImportOfNoProfile(*form_structure); + } // Set the page language to match the localized country value and try again. autofill_client_->GetLanguageState()->SetSourceLanguage("de"); - - ExtractAddressProfiles(/*extraction_successful=*/true, form_structure); - - // There should be one imported address profile. - ASSERT_EQ(1U, personal_data_manager_->GetProfiles().size()); - ASSERT_EQ(0U, personal_data_manager_->GetCreditCards().size()); - - // Check that the correct profile was stored. - AutofillProfile expected(base::GenerateGUID(), test::kEmptyOrigin); - test::SetProfileInfo(&expected, "George", nullptr, "Washington", - "theprez@gmail.com", nullptr, "21 Laussat St", nullptr, - "San Francisco", "California", "94102", "AM", nullptr); - const std::vector<AutofillProfile*>& results = - personal_data_manager_->GetProfiles(); - EXPECT_THAT(*results[0], ComparesEqual(expected)); + ExtractAddressProfilesAndVerifyExpectation( + *form_structure, {ConstructDefaultProfileWithOverriddenCountry("AM")}); } // Tests that a profile is created for countries with composed names. @@ -2060,48 +1999,22 @@ } // TODO(crbug.com/634131): Create profiles if part of a standalone part of a -// composed country name is present. -// Tests that a profile is created if a standalone part of a composed country -// name is present. +// composed country name is present. Currently this results in either no import +// or an import with an incorrect country, depending on +// AutofillIgnoreInvalidCountryOnImport. TEST_P(FormDataImporterTest, ImportAddressProfiles_IncompleteComposedCountryName) { - FormData form; - form.url = GURL("https://www.foo.com"); + std::unique_ptr<FormStructure> form_structure = + ConstructFormStructureFromTypeValuePairs( + GetDefaultProfileTypeValuePairsWithOverriddenCountry( + "Myanmar")); // Missing the [Burma] part - FormFieldData field; - test::CreateTestFormField("First name:", "first_name", "George", "text", - &field); - form.fields.push_back(field); - test::CreateTestFormField("Last name:", "last_name", "Washington", "text", - &field); - form.fields.push_back(field); - test::CreateTestFormField("Email:", "email", "theprez@gmail.com", "text", - &field); - form.fields.push_back(field); - test::CreateTestFormField("Address:", "address1", "21 Laussat St", "text", - &field); - form.fields.push_back(field); - test::CreateTestFormField("City:", "city", "San Francisco", "text", &field); - form.fields.push_back(field); - test::CreateTestFormField("State:", "state", "California", "text", &field); - form.fields.push_back(field); - test::CreateTestFormField("Zip:", "zip", "94102", "text", &field); - form.fields.push_back(field); - test::CreateTestFormField("Country:", "country", - "Myanmar", // Missing the [Burma] part - "text", &field); - form.fields.push_back(field); - - FormStructure form_structure(form); - form_structure.DetermineHeuristicTypes(nullptr, nullptr); - ExtractAddressProfiles(/*extraction_successful=*/false, form_structure); - - // Since no refresh is expected, reload the data from the database to make - // sure no changes were written out. - ResetPersonalDataManager(USER_MODE_NORMAL); - - ASSERT_EQ(0U, personal_data_manager_->GetProfiles().size()); - ASSERT_EQ(0U, personal_data_manager_->GetCreditCards().size()); + if (base::FeatureList::IsEnabled( + features::kAutofillIgnoreInvalidCountryOnImport)) { + ExtractAddressProfileAndVerifyExtractionOfDefaultProfile(*form_structure); + } else { + ImportAddressProfileAndVerifyImportOfNoProfile(*form_structure); + } } // ExtractCreditCard tests.
diff --git a/components/autofill/core/browser/metrics/autofill_metrics_unittest.cc b/components/autofill/core/browser/metrics/autofill_metrics_unittest.cc index 441d6e0..a652ef6 100644 --- a/components/autofill/core/browser/metrics/autofill_metrics_unittest.cc +++ b/components/autofill/core/browser/metrics/autofill_metrics_unittest.cc
@@ -1003,7 +1003,8 @@ // Test that the ProfileImportStatus logs a no import. TEST_F(AutofillMetricsTest, ProfileImportStatus_NoImport) { - // Set up our form data. + // Set up our form data. Since a ZIP code is required for US profiles, this + // import fails. FormData form = GetAndAddSeenForm( {.description_for_logging = "ProfileImportStatus_NoImport", .fields = { @@ -1012,8 +1013,7 @@ {.role = ADDRESS_HOME_CITY, .value = u"New York"}, {.role = PHONE_HOME_CITY_AND_NUMBER, .value = u"2345678901"}, {.role = ADDRESS_HOME_STATE, .value = u"Invalid State"}, - {.role = ADDRESS_HOME_ZIP, .value = u"00000000000000000"}, - {.role = ADDRESS_HOME_COUNTRY, .value = u"NoACountry"}}}); + {.role = ADDRESS_HOME_COUNTRY, .value = u"USA"}}}); FillTestProfile(form);
diff --git a/components/autofill/core/common/autofill_features.cc b/components/autofill/core/common/autofill_features.cc index 3c673ce..6fbf5fc1 100644 --- a/components/autofill/core/common/autofill_features.cc +++ b/components/autofill/core/common/autofill_features.cc
@@ -80,7 +80,7 @@ // TODO(crbug.com/1362472): Cleanup when launched. BASE_FEATURE(kAutofillIgnoreInvalidCountryOnImport, "AutofillIgnoreInvalidCountryOnImport", - base::FEATURE_DISABLED_BY_DEFAULT); + base::FEATURE_ENABLED_BY_DEFAULT); // If enabled, the country calling code for nationally formatted phone numbers // is inferred from the profile's country, if available.
diff --git a/components/browser_ui/strings/android/browser_ui_strings.grd b/components/browser_ui/strings/android/browser_ui_strings.grd index b8557b2..72706ec 100644 --- a/components/browser_ui/strings/android/browser_ui_strings.grd +++ b/components/browser_ui/strings/android/browser_ui_strings.grd
@@ -618,6 +618,21 @@ <message name="IDS_PAGE_INFO_AD_MANAGE_INTERESTS" desc="The button label of the 'Manage interests' button in Page Info. The button opens a settings page to manage interests for the site."> Manage interests </message> + <message name="IDS_PAGE_INFO_AD_PRIVACY_HEADER" desc="A label that represents the new ad-related settings. 1) Navigate to any site. 2) Click the icon (often a lock) to the left of the URL in the address bar. Information about the page you're viewing appears. The 'Ad privacy' label will appear above the 'Site settings' button."> + Ad privacy + </message> + <message name="IDS_PAGE_INFO_AD_PRIVACY_TOPICS_DESCRIPTION" desc="1 of 3 possible descriptions a user might see when they choose 'Ad privacy' from page info for a specific site. 1) Navigate to any site. 2) Click the icon (often a lock) to the left of the URL in the address bar. Information about the page you're viewing appears. The 'Ad privacy' label will appear above the 'Site settings' button. 3) Click on Ad privacy. This string describes the case that the site being viewed uses the Ad topics setting. What's the Ad topics setting? When on, Chrome will estimate the user's topics of interest based on their recent browsing history and then show up to 3 of those topics with a site so that the site can better personalize ads (a privacy-preserving way to replicate some of the functionality of third-party cookies). In this case, we're informing the user that this site uses the Ad topics API and we're showing the user the ad topics Chrome has shared with the site. A button 'Manage ad privacy' allows the user to turn 'Ad privacy' settings on/off or to block specific ad topics."> + This site gets your ad topics from Chrome to show you more relevant ads + </message> + <message name="IDS_PAGE_INFO_AD_PRIVACY_FLEDGE_DESCRIPTION" desc="2 of 3 possible descriptions a user might see when they choose 'Ad privacy' from page info for a specific site. 1) Navigate to any site. 2) Click the icon (often a lock) to the left of the URL in the address bar. Information about the page you're viewing appears. The 'Ad privacy' label will appear above the 'Site settings' button. 3) Click on Ad privacy. This string describes the case that the site being viewed uses the Site-suggested ads setting. What's the Site-suggested ads setting? When on, a site can determine a user's interests, save info with Chrome relative to those interests. Later, as a user continues browsing, a site can ask Chrome for a user's interests and the first site can (through Chrome) suggest ads the user might like. In this case, we're informing the user that this site uses the Site-suggested ads API. A button 'Manage ad privacy' allows the user to turn 'Ad privacy' settings on/off or to block specific ad topics."> + This site determines things you like and then suggests ads to other sites + </message> + <message name="IDS_PAGE_INFO_AD_PRIVACY_TOPICS_AND_FLEDGE_DESCRIPTION" desc="3 of 3 possible descriptions a user might see when they choose 'Ad privacy' from page info for a specific site. 1) Navigate to any site. 2) Click the icon (often a lock) to the left of the URL in the address bar. Information about the page you're viewing appears. The 'Ad privacy' label will appear above the 'Site settings' button. 3) Click on Ad privacy. This string describes the case that the site being viewed uses both the Ad topics and Site-suggested ads settings. AD TOPICS: When on, Chrome will estimate the user's topics of interest based on their recent browsing history and then show up to 3 of those topics with a site so that the site can better personalize ads (a privacy-preserving way to replicate some of the functionality of third-party cookies). SITE-SUGGESTED ADS: When on, a site can determine a user's interests, save info with Chrome relative to those interests. Later, as a user continues browsing, a site can ask Chrome for a user's interests and the first site can (through Chrome) suggest ads the user might like. In this case, we're informing the user that this site 1) has asked Chrome for the user's interests (the Ad topics setting), and 2) uses the Site-suggested ads API (this site determines the user's interests and then can suggest ads to other sites as the user continues browsing). A button 'Manage ad privacy' allows the user to turn 'Ad privacy' settings on/off or to block specific ad topics or sites."> + This site determines things you like and then suggests ads to other sites. This site also gets your ads topics from Chrome to show you more relevant ads. + </message> + <message name="IDS_PAGE_INFO_AD_PRIVACY_SUBPAGE_MANAGE_BUTTON" desc="A button label that opens the Ad privacy page, allowing a user to turn on / off the ad privacy settings and to manage the topics and sites that influence ad personalization."> + Manage ad privacy + </message> <message name="IDS_COOKIES_TITLE" desc="Title for the Cookies settings screen [CHAR_LIMIT=32]"> Cookies
diff --git a/components/browser_ui/strings/android/browser_ui_strings_grd/IDS_PAGE_INFO_AD_PRIVACY_FLEDGE_DESCRIPTION.png.sha1 b/components/browser_ui/strings/android/browser_ui_strings_grd/IDS_PAGE_INFO_AD_PRIVACY_FLEDGE_DESCRIPTION.png.sha1 new file mode 100644 index 0000000..4b5f6e0 --- /dev/null +++ b/components/browser_ui/strings/android/browser_ui_strings_grd/IDS_PAGE_INFO_AD_PRIVACY_FLEDGE_DESCRIPTION.png.sha1
@@ -0,0 +1 @@ +afc2fb8fbb65e8665955ae1d3050870381e09d57 \ No newline at end of file
diff --git a/components/browser_ui/strings/android/browser_ui_strings_grd/IDS_PAGE_INFO_AD_PRIVACY_HEADER.png.sha1 b/components/browser_ui/strings/android/browser_ui_strings_grd/IDS_PAGE_INFO_AD_PRIVACY_HEADER.png.sha1 new file mode 100644 index 0000000..8303c5c --- /dev/null +++ b/components/browser_ui/strings/android/browser_ui_strings_grd/IDS_PAGE_INFO_AD_PRIVACY_HEADER.png.sha1
@@ -0,0 +1 @@ +a46807ffbcae184bd2f7971932155792a5762295 \ No newline at end of file
diff --git a/components/browser_ui/strings/android/browser_ui_strings_grd/IDS_PAGE_INFO_AD_PRIVACY_SUBPAGE_MANAGE_BUTTON.png.sha1 b/components/browser_ui/strings/android/browser_ui_strings_grd/IDS_PAGE_INFO_AD_PRIVACY_SUBPAGE_MANAGE_BUTTON.png.sha1 new file mode 100644 index 0000000..4b5f6e0 --- /dev/null +++ b/components/browser_ui/strings/android/browser_ui_strings_grd/IDS_PAGE_INFO_AD_PRIVACY_SUBPAGE_MANAGE_BUTTON.png.sha1
@@ -0,0 +1 @@ +afc2fb8fbb65e8665955ae1d3050870381e09d57 \ No newline at end of file
diff --git a/components/browser_ui/strings/android/browser_ui_strings_grd/IDS_PAGE_INFO_AD_PRIVACY_TOPICS_AND_FLEDGE_DESCRIPTION.png.sha1 b/components/browser_ui/strings/android/browser_ui_strings_grd/IDS_PAGE_INFO_AD_PRIVACY_TOPICS_AND_FLEDGE_DESCRIPTION.png.sha1 new file mode 100644 index 0000000..f8140af --- /dev/null +++ b/components/browser_ui/strings/android/browser_ui_strings_grd/IDS_PAGE_INFO_AD_PRIVACY_TOPICS_AND_FLEDGE_DESCRIPTION.png.sha1
@@ -0,0 +1 @@ +221a27f4cc4d2e0e618d7b14e560ade68e0c4363 \ No newline at end of file
diff --git a/components/browser_ui/strings/android/browser_ui_strings_grd/IDS_PAGE_INFO_AD_PRIVACY_TOPICS_DESCRIPTION.png.sha1 b/components/browser_ui/strings/android/browser_ui_strings_grd/IDS_PAGE_INFO_AD_PRIVACY_TOPICS_DESCRIPTION.png.sha1 new file mode 100644 index 0000000..ea485a31 --- /dev/null +++ b/components/browser_ui/strings/android/browser_ui_strings_grd/IDS_PAGE_INFO_AD_PRIVACY_TOPICS_DESCRIPTION.png.sha1
@@ -0,0 +1 @@ +fab415d4c85fdcd307bfde4aa295325dc6c564e1 \ No newline at end of file
diff --git a/components/certificate_transparency/data/log_list.json b/components/certificate_transparency/data/log_list.json index 0bfb6907..1dde634 100644 --- a/components/certificate_transparency/data/log_list.json +++ b/components/certificate_transparency/data/log_list.json
@@ -1,6 +1,6 @@ { - "version": "17.41", - "log_list_timestamp": "2023-01-11T12:56:07Z", + "version": "17.42", + "log_list_timestamp": "2023-01-12T12:55:44Z", "operators": [ { "name": "Google",
diff --git a/components/commerce/core/subscriptions/subscriptions_manager.cc b/components/commerce/core/subscriptions/subscriptions_manager.cc index 36c6478..b6ae5f2 100644 --- a/components/commerce/core/subscriptions/subscriptions_manager.cc +++ b/components/commerce/core/subscriptions/subscriptions_manager.cc
@@ -54,8 +54,12 @@ account_checker_(account_checker), observers_(base::ObserverListPolicy::EXISTING_ONLY), weak_ptr_factory_(this) { +// Avoid duplicate server calls on android. Remove this after we integrate +// android implementation to shopping service. +#if !BUILDFLAG(IS_ANDROID) SyncSubscriptions(); scoped_identity_manager_observation_.Observe(identity_manager); +#endif // !BUILDFLAG(IS_ANDROID) } SubscriptionsManager::~SubscriptionsManager() = default;
diff --git a/components/management_strings.grdp b/components/management_strings.grdp index 1ee33ec4..718e7b9 100644 --- a/components/management_strings.grdp +++ b/components/management_strings.grdp
@@ -307,7 +307,7 @@ The content of pages you print is sent to Google Cloud or third parties for analysis. For example, it might be scanned for sensitive data. </message> <message name="IDS_MANAGEMENT_FILE_TRANSFER_VISIBLE_DATA" desc="Description of the visible data for the file transfer scanning feature."> - Files you copy or move are sent to Google Cloud or third parties for analysis. For example, they might be scanned for sensitive data or malware. + Files you copy or move are sent to Google Cloud or third parties for analysis. For example, they might be scanned for sensitive data or malware and might be stored based on company policies. </message> <message name="IDS_MANAGEMENT_SCREEN_CAPTURE_DATA" desc="Description of the visible data for the multi screen capture feature."> Applications authorized by your administrator can capture all screens attached to your device. This information can be processed locally or uploaded to your organization’s servers.
diff --git a/components/management_strings_grdp/IDS_MANAGEMENT_FILE_TRANSFER_VISIBLE_DATA.png.sha1 b/components/management_strings_grdp/IDS_MANAGEMENT_FILE_TRANSFER_VISIBLE_DATA.png.sha1 index fae696a06..099f502 100644 --- a/components/management_strings_grdp/IDS_MANAGEMENT_FILE_TRANSFER_VISIBLE_DATA.png.sha1 +++ b/components/management_strings_grdp/IDS_MANAGEMENT_FILE_TRANSFER_VISIBLE_DATA.png.sha1
@@ -1 +1 @@ -964e5ca17925963ef8eb667cf473d4422a9ca89f \ No newline at end of file +a8f7743a2b26c46b352a6ac0d6bed531962e4088 \ No newline at end of file
diff --git a/components/page_info/android/java/res/xml/page_info_ad_personalization_preference.xml b/components/page_info/android/java/res/xml/page_info_ad_personalization_preference.xml index 249dc16..86aa263a 100644 --- a/components/page_info/android/java/res/xml/page_info_ad_personalization_preference.xml +++ b/components/page_info/android/java/res/xml/page_info_ad_personalization_preference.xml
@@ -18,6 +18,5 @@ <org.chromium.components.browser_ui.settings.ButtonPreference android:key="manage_interest_button" - android:title="@string/page_info_ad_manage_interests" app:buttonLayout="@layout/button_preference_text_button"/> </PreferenceScreen>
diff --git a/components/page_info/android/java/src/org/chromium/components/page_info/PageInfoAdPersonalizationController.java b/components/page_info/android/java/src/org/chromium/components/page_info/PageInfoAdPersonalizationController.java index eea92a3..2850b350 100644 --- a/components/page_info/android/java/src/org/chromium/components/page_info/PageInfoAdPersonalizationController.java +++ b/components/page_info/android/java/src/org/chromium/components/page_info/PageInfoAdPersonalizationController.java
@@ -57,8 +57,11 @@ @NonNull @Override public String getSubpageTitle() { + var siteSettingsDelegate = getDelegate().getSiteSettingsDelegate(); return mRowView.getContext().getResources().getString( - R.string.page_info_ad_personalization_title); + siteSettingsDelegate.isPrivacySandboxSettings4Enabled() + ? R.string.page_info_ad_privacy_header + : R.string.page_info_ad_personalization_title); } @Override
diff --git a/components/page_info/android/java/src/org/chromium/components/page_info/PageInfoAdPersonalizationPreference.java b/components/page_info/android/java/src/org/chromium/components/page_info/PageInfoAdPersonalizationPreference.java index af61161..6e7ed9c 100644 --- a/components/page_info/android/java/src/org/chromium/components/page_info/PageInfoAdPersonalizationPreference.java +++ b/components/page_info/android/java/src/org/chromium/components/page_info/PageInfoAdPersonalizationPreference.java
@@ -42,11 +42,17 @@ int summaryId; if (mParams.hasJoinedUserToInterestGroup && !mParams.topicInfo.isEmpty()) { - summaryId = R.string.page_info_ad_personalization_topics_and_interest_group_description; + summaryId = getSiteSettingsDelegate().isPrivacySandboxSettings4Enabled() + ? R.string.page_info_ad_privacy_topics_and_fledge_description + : R.string.page_info_ad_personalization_topics_and_interest_group_description; } else if (mParams.hasJoinedUserToInterestGroup) { - summaryId = R.string.page_info_ad_personalization_interest_group_description; + summaryId = getSiteSettingsDelegate().isPrivacySandboxSettings4Enabled() + ? R.string.page_info_ad_privacy_fledge_description + : R.string.page_info_ad_personalization_interest_group_description; } else { - summaryId = R.string.page_info_ad_personalization_topics_description; + summaryId = getSiteSettingsDelegate().isPrivacySandboxSettings4Enabled() + ? R.string.page_info_ad_privacy_topics_description + : R.string.page_info_ad_personalization_topics_description; } findPreference(PERSONALIZATION_SUMMARY).setSummary(summaryId); @@ -65,7 +71,11 @@ SettingsUtils.addPreferencesFromResource( this, R.xml.page_info_ad_personalization_preference); - findPreference(MANAGE_INTEREST_PREFERENCE).setOnPreferenceClickListener(this); + var manageButtonPreference = findPreference(MANAGE_INTEREST_PREFERENCE); + manageButtonPreference.setOnPreferenceClickListener(this); + manageButtonPreference.setTitle(getSiteSettingsDelegate().isPrivacySandboxSettings4Enabled() + ? R.string.page_info_ad_privacy_subpage_manage_button + : R.string.page_info_ad_manage_interests); updateTopics(); }
diff --git a/components/page_info_strings.grdp b/components/page_info_strings.grdp index 95a8716..9f34896 100644 --- a/components/page_info_strings.grdp +++ b/components/page_info_strings.grdp
@@ -262,8 +262,8 @@ <message name="IDS_PAGE_INFO_NUM_COOKIES" desc="The label of the counts for allowed cookies that are in use on the page. This text will be shown next to IDS_PAGE_INFO_COOKIES_BUTTON_TEXT. It is the same as IDS_PAGE_INFO_NUM_COOKIES_PARENTHESIZED, but without parenthesis"> {NUM_COOKIES, plural, =1 {1 in use} other {# in use}} </message> - <message name="IDS_PAGE_INFO_COOKIES_TOOLTIP" desc="The text of the tooltip on IDS_PAGE_INFO_NUM_COOKIES_PARENTHESIZED."> - Show cookies + <message name="IDS_PAGE_INFO_COOKIES_TOOLTIP" desc="A tooltip that appears when the user hovers over the 'Cookies and site data' button. Options on the next screen include: Block third-party cookies, Manage cookies and site data, and See related sites."> + Options for cookies and site data </message> </if> @@ -716,8 +716,8 @@ <message name="IDS_PAGE_INFO_COOKIES_DIALOG_BUTTON_TITLE" desc="The title on the button opening cookies in use dialog in cookies subpage."> Manage cookies and site data </message> - <message name="IDS_PAGE_INFO_COOKIES_DIALOG_BUTTON_TOOLTIP" desc="The text of the tooltip on the button opening cookies in use dialog in cookies subpage."> - Show cookies + <message name="IDS_PAGE_INFO_COOKIES_DIALOG_BUTTON_TOOLTIP" desc="A tooltip that appears when the user hovers over the 'Manage cookies and site data' button. The following screen shows cookies and other forms of site data used by the site the user is viewing."> + Review a list of cookies and site data in a new window </message> <message name="IDS_PAGE_INFO_FPS_BUTTON_TOOLTIP" desc="The tooltip of first-party sets button in cookies subpage, which opens 'All Sites' settings page in a new tab with a filter for this set's pages."> See related sites in a new tab
diff --git a/components/page_info_strings_grdp/IDS_PAGE_INFO_COOKIES_DIALOG_BUTTON_TOOLTIP.png.sha1 b/components/page_info_strings_grdp/IDS_PAGE_INFO_COOKIES_DIALOG_BUTTON_TOOLTIP.png.sha1 index ea9eef58..fcb1e28 100644 --- a/components/page_info_strings_grdp/IDS_PAGE_INFO_COOKIES_DIALOG_BUTTON_TOOLTIP.png.sha1 +++ b/components/page_info_strings_grdp/IDS_PAGE_INFO_COOKIES_DIALOG_BUTTON_TOOLTIP.png.sha1
@@ -1 +1 @@ -a1a3d7b9ee1177c3a7f5ec4e8d0de47c90ffd5a4 \ No newline at end of file +64f63209dd947969621320991c05ed6f0c10c91b \ No newline at end of file
diff --git a/components/page_info_strings_grdp/IDS_PAGE_INFO_COOKIES_TOOLTIP.png.sha1 b/components/page_info_strings_grdp/IDS_PAGE_INFO_COOKIES_TOOLTIP.png.sha1 new file mode 100644 index 0000000..be609fb --- /dev/null +++ b/components/page_info_strings_grdp/IDS_PAGE_INFO_COOKIES_TOOLTIP.png.sha1
@@ -0,0 +1 @@ +93a3c5ea7c88137f0485456a4d1146c80ec8442e \ No newline at end of file
diff --git a/components/password_manager/core/browser/affiliation/affiliations_prefetcher.cc b/components/password_manager/core/browser/affiliation/affiliations_prefetcher.cc index 162ef03..cc4856f 100644 --- a/components/password_manager/core/browser/affiliation/affiliations_prefetcher.cc +++ b/components/password_manager/core/browser/affiliation/affiliations_prefetcher.cc
@@ -7,6 +7,9 @@ #include <algorithm> #include <utility> +#include "base/barrier_callback.h" +#include "base/bind.h" +#include "base/callback.h" #include "base/check_op.h" #include "base/functional/bind.h" #include "base/functional/callback.h" @@ -35,32 +38,39 @@ AffiliationsPrefetcher::AffiliationsPrefetcher( AffiliationService* affiliation_service) - : affiliation_service_(affiliation_service) {} - -AffiliationsPrefetcher::~AffiliationsPrefetcher() = default; - -void AffiliationsPrefetcher::RegisterPasswordStore( - PasswordStoreInterface* store) { - DCHECK(store); - DCHECK_EQ(nullptr, password_store_); - - password_store_ = store; - + : affiliation_service_(affiliation_service) { // I/O heavy initialization on start-up will be delayed by this long. // This should be high enough not to exacerbate start-up I/O contention too // much, but also low enough that the user be able log-in shortly after // browser start-up into web sites using Android credentials. base::SequencedTaskRunner::GetCurrentDefault()->PostDelayedTask( FROM_HERE, - base::BindOnce(&AffiliationsPrefetcher::DoDeferredInitialization, + base::BindOnce(&AffiliationsPrefetcher::InitializeWithPasswordStores, weak_ptr_factory_.GetWeakPtr()), kInitializationDelayOnStartup); } +AffiliationsPrefetcher::~AffiliationsPrefetcher() = default; + +void AffiliationsPrefetcher::RegisterPasswordStore( + PasswordStoreInterface* store) { + DCHECK(store); + + pending_initializations_.push_back(store); + // If initialization had already happened, request passwords from all stores + // again to ensure affiliations cache gets properly updated, otherwise + // do nothing. + if (is_ready_) { + InitializeWithPasswordStores(); + } +} + void AffiliationsPrefetcher::Shutdown() { - if (password_store_) - password_store_->RemoveObserver(this); - password_store_ = nullptr; + for (const auto& store : password_stores_) { + store->RemoveObserver(this); + } + password_stores_.clear(); + pending_initializations_.clear(); } void AffiliationsPrefetcher::OnLoginsChanged( @@ -110,28 +120,65 @@ if (IsFacetValidForAffiliation(facet_uri)) facets.push_back(std::move(facet_uri)); } + // TODO(crbug.com/1100818): Current logic cancels prefetch for all missing + // facets. This might be wrong if both account and profile store is used. affiliation_service_->KeepPrefetchForFacets(std::move(facets)); } void AffiliationsPrefetcher::OnGetPasswordStoreResults( std::vector<std::unique_ptr<PasswordForm>> results) { + DCHECK(on_password_forms_received_barrier_callback_); + on_password_forms_received_barrier_callback_.Run(std::move(results)); +} + +void AffiliationsPrefetcher::OnResultFromAllStoresReceived( + std::vector<std::vector<std::unique_ptr<PasswordForm>>> results) { + // If PasswordStore is registered while awaiting for results from already + // registered PasswordStores, reinitialize it again to account newly added + // store. + if (!pending_initializations_.empty()) { + InitializeWithPasswordStores(); + return; + } + std::vector<FacetURI> facets; - for (const auto& form : results) { - FacetURI facet_uri = - FacetURI::FromPotentiallyInvalidSpec(form->signon_realm); - if (IsFacetValidForAffiliation(facet_uri)) - facets.push_back(std::move(facet_uri)); + for (const auto& result_per_store : results) { + for (const auto& form : result_per_store) { + FacetURI facet_uri = + FacetURI::FromPotentiallyInvalidSpec(form->signon_realm); + if (IsFacetValidForAffiliation(facet_uri)) { + facets.push_back(std::move(facet_uri)); + } + } } affiliation_service_->KeepPrefetchForFacets(facets); affiliation_service_->TrimUnusedCache(std::move(facets)); + + is_ready_ = true; } -void AffiliationsPrefetcher::DoDeferredInitialization() { - // Must start observing for changes at the same time as when the snapshot is - // taken to avoid inconsistencies due to any changes taking place in-between. - if (password_store_) { - password_store_->AddObserver(this); - password_store_->GetAllLogins(weak_ptr_factory_.GetWeakPtr()); +void AffiliationsPrefetcher::InitializeWithPasswordStores() { + // If no calls to RegisterPasswordStore happened before + // |kInitializationDelayOnStartup| return early. + if (pending_initializations_.empty()) { + is_ready_ = true; + return; + } + + is_ready_ = false; + for (const auto& store : pending_initializations_) { + store->AddObserver(this); + password_stores_.push_back(store); + } + pending_initializations_.clear(); + + on_password_forms_received_barrier_callback_ = + base::BarrierCallback<std::vector<std::unique_ptr<PasswordForm>>>( + password_stores_.size(), + base::BindOnce(&AffiliationsPrefetcher::OnResultFromAllStoresReceived, + weak_ptr_factory_.GetWeakPtr())); + for (const auto& store : password_stores_) { + store->GetAllLogins(weak_ptr_factory_.GetWeakPtr()); } }
diff --git a/components/password_manager/core/browser/affiliation/affiliations_prefetcher.h b/components/password_manager/core/browser/affiliation/affiliations_prefetcher.h index 5560d133..916d640 100644 --- a/components/password_manager/core/browser/affiliation/affiliations_prefetcher.h +++ b/components/password_manager/core/browser/affiliation/affiliations_prefetcher.h
@@ -47,11 +47,27 @@ void OnGetPasswordStoreResults( std::vector<std::unique_ptr<PasswordForm>> results) override; - void DoDeferredInitialization(); + void OnResultFromAllStoresReceived( + std::vector<std::vector<std::unique_ptr<PasswordForm>>> results); + + void InitializeWithPasswordStores(); raw_ptr<AffiliationService> affiliation_service_ = nullptr; - raw_ptr<PasswordStoreInterface> password_store_ = nullptr; + // Password stores registered via RegisterPasswordStore but aren't observed + // yet. + std::vector<raw_ptr<PasswordStoreInterface>> pending_initializations_; + + // Password store which are currently being observed. + std::vector<raw_ptr<PasswordStoreInterface>> password_stores_; + + // Allows to aggregate GetAllLogins results from multiple stores. + base::RepeatingCallback<void(std::vector<std::unique_ptr<PasswordForm>>)> + on_password_forms_received_barrier_callback_; + + // Indicates whether passwords were fetched for all stores in + // |password_stores_|. + bool is_ready_ = false; base::WeakPtrFactory<AffiliationsPrefetcher> weak_ptr_factory_{this}; };
diff --git a/components/password_manager/core/browser/affiliation/affiliations_prefetcher_unittest.cc b/components/password_manager/core/browser/affiliation/affiliations_prefetcher_unittest.cc index 1602db30..48bb25dd 100644 --- a/components/password_manager/core/browser/affiliation/affiliations_prefetcher_unittest.cc +++ b/components/password_manager/core/browser/affiliation/affiliations_prefetcher_unittest.cc
@@ -22,6 +22,8 @@ #include "base/time/time.h" #include "components/password_manager/core/browser/affiliation/affiliation_utils.h" #include "components/password_manager/core/browser/affiliation/mock_affiliation_service.h" +#include "components/password_manager/core/browser/password_form.h" +#include "components/password_manager/core/browser/password_store_interface.h" #include "components/password_manager/core/browser/test_password_store.h" #include "components/password_manager/core/common/password_manager_features.h" #include "services/network/test/test_shared_url_loader_factory.h" @@ -32,6 +34,8 @@ namespace { +constexpr base::TimeDelta kInitializationDelayOnStartup = base::Seconds(30); + using StrategyOnCacheMiss = AffiliationService::StrategyOnCacheMiss; class OverloadedMockAffiliationService : public MockAffiliationService { @@ -145,6 +149,8 @@ } // namespace +// Boolean parameters indicates whether affiliation service should support +// affiliated websites. class AffiliationsPrefetcherTest : public testing::Test, public ::testing::WithParamInterface<bool> { public: @@ -154,18 +160,43 @@ } protected: + // testing::Test: + void SetUp() override { + mock_affiliation_service_ = std::make_unique< + testing::StrictMock<OverloadedMockAffiliationService>>(); + password_store()->Init(/*prefs=*/nullptr, + /*affiliated_match_helper=*/nullptr); + + prefetcher_ = + std::make_unique<AffiliationsPrefetcher>(mock_affiliation_service()); + } + + void TearDown() override { + (static_cast<KeyedService*>(prefetcher()))->Shutdown(); + if (password_store_) { + DestroyPasswordStore(); + } + mock_affiliation_service_.reset(); + // Clean up on the background thread. + RunUntilIdle(); + } + void RunDeferredInitialization() { task_environment_.RunUntilIdle(); mock_affiliation_service()->ExpectCallToTrimUnusedCache(); prefetcher_->RegisterPasswordStore(password_store()); - // task_environment_.RunUntilIdle(); - task_environment_.FastForwardBy(base::Seconds(30)); + task_environment_.FastForwardBy(kInitializationDelayOnStartup); } void RunUntilIdle() { task_environment_.RunUntilIdle(); } - void AddLoginAndWait(const PasswordForm& form) { - password_store_->AddLogin(form); + void FastForwardBy(base::TimeDelta delta) { + task_environment_.FastForwardBy(delta); + } + + void AddLoginAndWait(PasswordStoreInterface* store, + const PasswordForm& form) { + store->AddLogin(form); RunUntilIdle(); } @@ -181,14 +212,19 @@ } void AddAndroidAndNonAndroidTestLogins() { - AddLoginAndWait(GetTestAndroidCredentials(kTestAndroidRealmAlpha3)); - AddLoginAndWait(GetTestAndroidCredentials(kTestAndroidRealmBeta2)); - AddLoginAndWait( - GetTestBlocklistedAndroidCredentials(kTestAndroidRealmBeta3)); - AddLoginAndWait(GetTestAndroidCredentials(kTestAndroidRealmGamma)); + AddLoginAndWait(password_store(), + GetTestAndroidCredentials(kTestAndroidRealmAlpha3)); + AddLoginAndWait(password_store(), + GetTestAndroidCredentials(kTestAndroidRealmBeta2)); + AddLoginAndWait(password_store(), GetTestBlocklistedAndroidCredentials( + kTestAndroidRealmBeta3)); + AddLoginAndWait(password_store(), + GetTestAndroidCredentials(kTestAndroidRealmGamma)); - AddLoginAndWait(GetTestAndroidCredentials(kTestWebRealmAlpha1)); - AddLoginAndWait(GetTestAndroidCredentials(kTestWebRealmAlpha2)); + AddLoginAndWait(password_store(), + GetTestAndroidCredentials(kTestWebRealmAlpha1)); + AddLoginAndWait(password_store(), + GetTestAndroidCredentials(kTestWebRealmAlpha2)); } void RemoveAndroidAndNonAndroidTestLogins() { @@ -296,25 +332,6 @@ last_result_realms_ = affiliated_realms; } - // testing::Test: - void SetUp() override { - mock_affiliation_service_ = std::make_unique< - testing::StrictMock<OverloadedMockAffiliationService>>(); - password_store()->Init(/*prefs=*/nullptr, nullptr); - - prefetcher_ = std::make_unique<AffiliationsPrefetcher>( - mock_affiliation_service_.get()); - } - - void TearDown() override { - prefetcher()->Shutdown(); - if (password_store_) - DestroyPasswordStore(); - mock_affiliation_service_.reset(); - // Clean up on the background thread. - RunUntilIdle(); - } - base::test::ScopedFeatureList feature_list_; base::test::SingleThreadTaskEnvironment task_environment_{ base::test::TaskEnvironment::TimeSource::MOCK_TIME}; @@ -446,7 +463,7 @@ // Store one credential after deferred initialization. PasswordForm android_form4(android_form); android_form4.username_value = u"JohnDoe4"; - AddLoginAndWait(android_form4); + AddLoginAndWait(password_store(), android_form4); for (size_t i = 0; i < 4; ++i) { mock_affiliation_service()->ExpectCallToCancelPrefetch( @@ -488,4 +505,147 @@ AffiliationsPrefetcherTest, ::testing::Bool()); +class AffiliationsPrefetcherWithTwoStoresTest + : public AffiliationsPrefetcherTest { + protected: + void SetUp() override { + AffiliationsPrefetcherTest::SetUp(); + account_password_store_->Init(/*prefs=*/nullptr, nullptr); + } + + void TearDown() override { + AffiliationsPrefetcherTest::TearDown(); + account_password_store_->ShutdownOnUIThread(); + account_password_store_ = nullptr; + } + + TestPasswordStore* account_password_store() { + return account_password_store_.get(); + } + + void RunDeferredInitialization() { + RunUntilIdle(); + mock_affiliation_service()->ExpectCallToTrimUnusedCache(); + prefetcher()->RegisterPasswordStore(password_store()); + prefetcher()->RegisterPasswordStore(account_password_store()); + FastForwardBy(kInitializationDelayOnStartup); + } + + private: + scoped_refptr<TestPasswordStore> account_password_store_ = + base::MakeRefCounted<TestPasswordStore>(); +}; + +INSTANTIATE_TEST_SUITE_P(FillingAcrossAffiliatedWebsites, + AffiliationsPrefetcherWithTwoStoresTest, + ::testing::Bool()); + +TEST_P(AffiliationsPrefetcherWithTwoStoresTest, TestInitialPrefetch) { + AddLoginAndWait(password_store(), + GetTestAndroidCredentials(kTestAndroidRealmAlpha3)); + AddLoginAndWait(account_password_store(), + GetTestAndroidCredentials(kTestAndroidRealmBeta2)); + + std::vector<FacetURI> expected_facets; + expected_facets.push_back( + FacetURI::FromCanonicalSpec(kTestAndroidFacetURIAlpha3)); + expected_facets.push_back( + FacetURI::FromCanonicalSpec(kTestAndroidFacetURIBeta2)); + + // Expect prefetch for passwords from both stores. + mock_affiliation_service()->ExpectKeepPrefetchForFacets(expected_facets); + + ASSERT_NO_FATAL_FAILURE(RunDeferredInitialization()); +} + +TEST_P(AffiliationsPrefetcherWithTwoStoresTest, TestDuplicatesPrefetch) { + AddLoginAndWait(password_store(), + GetTestAndroidCredentials(kTestAndroidRealmAlpha3)); + AddLoginAndWait(account_password_store(), + GetTestAndroidCredentials(kTestAndroidRealmAlpha3)); + + std::vector<FacetURI> expected_facets; + expected_facets.push_back( + FacetURI::FromCanonicalSpec(kTestAndroidFacetURIAlpha3)); + expected_facets.push_back( + FacetURI::FromCanonicalSpec(kTestAndroidFacetURIAlpha3)); + + // Expect prefetch for passwords from both stores. + mock_affiliation_service()->ExpectKeepPrefetchForFacets(expected_facets); + + ASSERT_NO_FATAL_FAILURE(RunDeferredInitialization()); +} + +TEST_P(AffiliationsPrefetcherWithTwoStoresTest, TestLoginsChanged) { + AddLoginAndWait(password_store(), + GetTestAndroidCredentials(kTestAndroidRealmAlpha3)); + + mock_affiliation_service()->ExpectKeepPrefetchForFacets( + {FacetURI::FromCanonicalSpec(kTestAndroidFacetURIAlpha3)}); + + ASSERT_NO_FATAL_FAILURE(RunDeferredInitialization()); + + EXPECT_CALL(*mock_affiliation_service(), + Prefetch(FacetURI::FromCanonicalSpec(kTestAndroidFacetURIBeta2), + base::Time::Max())); + account_password_store()->AddLogin( + GetTestAndroidCredentials(kTestAndroidRealmBeta2)); + RunUntilIdle(); + + mock_affiliation_service()->ExpectCallToTrimCacheForFacetURI( + kTestAndroidFacetURIAlpha3); + mock_affiliation_service()->ExpectCallToCancelPrefetch( + kTestAndroidFacetURIAlpha3); + password_store()->RemoveLogin( + GetTestAndroidCredentials(kTestAndroidRealmAlpha3)); + RunUntilIdle(); +} + +TEST_P(AffiliationsPrefetcherWithTwoStoresTest, TestStoreRegisteredLater) { + AddLoginAndWait(password_store(), + GetTestAndroidCredentials(kTestAndroidRealmAlpha3)); + AddLoginAndWait(account_password_store(), + GetTestAndroidCredentials(kTestAndroidRealmBeta2)); + + std::vector<FacetURI> expected_facets; + expected_facets.push_back( + FacetURI::FromCanonicalSpec(kTestAndroidFacetURIAlpha3)); + + mock_affiliation_service()->ExpectKeepPrefetchForFacets(expected_facets); + mock_affiliation_service()->ExpectCallToTrimUnusedCache(); + + prefetcher()->RegisterPasswordStore(password_store()); + FastForwardBy(kInitializationDelayOnStartup); + + expected_facets.push_back( + FacetURI::FromCanonicalSpec(kTestAndroidFacetURIBeta2)); + mock_affiliation_service()->ExpectKeepPrefetchForFacets(expected_facets); + mock_affiliation_service()->ExpectCallToTrimUnusedCache(); + + prefetcher()->RegisterPasswordStore(account_password_store()); + RunUntilIdle(); +} + +TEST_P(AffiliationsPrefetcherWithTwoStoresTest, + TestStoresRegisteredAfterDelay) { + AddLoginAndWait(password_store(), + GetTestAndroidCredentials(kTestAndroidRealmAlpha3)); + AddLoginAndWait(account_password_store(), + GetTestAndroidCredentials(kTestAndroidRealmBeta2)); + + FastForwardBy(kInitializationDelayOnStartup); + + std::vector<FacetURI> expected_facets; + expected_facets.push_back( + FacetURI::FromCanonicalSpec(kTestAndroidFacetURIAlpha3)); + expected_facets.push_back( + FacetURI::FromCanonicalSpec(kTestAndroidFacetURIBeta2)); + mock_affiliation_service()->ExpectKeepPrefetchForFacets(expected_facets); + mock_affiliation_service()->ExpectCallToTrimUnusedCache(); + + prefetcher()->RegisterPasswordStore(password_store()); + prefetcher()->RegisterPasswordStore(account_password_store()); + RunUntilIdle(); +} + } // namespace password_manager
diff --git a/components/permissions/unused_site_permissions_service.cc b/components/permissions/unused_site_permissions_service.cc index d518dfd..ad01694 100644 --- a/components/permissions/unused_site_permissions_service.cc +++ b/components/permissions/unused_site_permissions_service.cc
@@ -174,6 +174,19 @@ ContentSettingsType::REVOKED_UNUSED_SITE_PERMISSIONS, {}); } +void UnusedSitePermissionsService::ClearRevokedPermissionsList() { + ContentSettingsForOneType settings; + hcsm_->GetSettingsForOneType( + ContentSettingsType::REVOKED_UNUSED_SITE_PERMISSIONS, &settings); + + for (const auto& revoked_permissions : settings) { + hcsm_->SetWebsiteSettingCustomScope( + revoked_permissions.primary_pattern, + revoked_permissions.secondary_pattern, + ContentSettingsType::REVOKED_UNUSED_SITE_PERMISSIONS, {}); + } +} + void UnusedSitePermissionsService::UpdateUnusedPermissionsAsync( base::RepeatingClosure callback) { DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
diff --git a/components/permissions/unused_site_permissions_service.h b/components/permissions/unused_site_permissions_service.h index cb994bf..a5cc514 100644 --- a/components/permissions/unused_site_permissions_service.h +++ b/components/permissions/unused_site_permissions_service.h
@@ -86,6 +86,10 @@ // from revoked permissions list. void RegrantPermissionsForOrigin(const url::Origin& origin); + // Clear the list of revoked permissions so they will no longer be shown to + // the user. Does not change permissions themselves. + void ClearRevokedPermissionsList(); + // Test support: void SetClockForTesting(base::Clock* clock); std::vector<ContentSettingEntry> GetTrackedUnusedPermissionsForTesting();
diff --git a/components/permissions/unused_site_permissions_service_unittest.cc b/components/permissions/unused_site_permissions_service_unittest.cc index 502b714b..b89cbd6b 100644 --- a/components/permissions/unused_site_permissions_service_unittest.cc +++ b/components/permissions/unused_site_permissions_service_unittest.cc
@@ -273,7 +273,7 @@ permission_type_list.Append(static_cast<int32_t>(type)); dict.Set(kRevokedKey, base::Value::List(std::move(permission_type_list))); - // Add url1 and url2 to rovoked permissions list. + // Add url1 and url2 to revoked permissions list. hcsm()->SetWebsiteSettingDefaultScope( GURL(url1), GURL(url1), ContentSettingsType::REVOKED_UNUSED_SITE_PERMISSIONS, @@ -326,13 +326,60 @@ // Travel through time for 70 days. clock()->Advance(base::Days(70)); - // GEOLOCATION permission should be on the revoked permissions list, but. + // GEOLOCATION permission should be on the revoked permissions list, but // NOTIFICATION permissions should not be as notification permissions are out // of scope. service()->UpdateUnusedPermissionsForTesting(); EXPECT_EQ(GetRevokedPermissionsForOneOrigin(hcsm(), url).size(), 1u); EXPECT_EQ(GetRevokedPermissionsForOneOrigin(hcsm(), url)[0].GetInt(), static_cast<int32_t>(ContentSettingsType::GEOLOCATION)); + + // Clearing revoked permissions list should delete unused GEOLOCATION from it + // but leave used NOTIFICATION permissions intact. + service()->ClearRevokedPermissionsList(); + EXPECT_EQ(GetRevokedPermissionsForOneOrigin(hcsm(), url).size(), 0u); + EXPECT_EQ(hcsm()->GetContentSetting(GURL(url), GURL(url), + ContentSettingsType::GEOLOCATION), + ContentSetting::CONTENT_SETTING_ASK); + EXPECT_EQ(hcsm()->GetContentSetting(GURL(url), GURL(url), + ContentSettingsType::NOTIFICATIONS), + ContentSetting::CONTENT_SETTING_ALLOW); +} + +TEST_F(UnusedSitePermissionsServiceTest, ClearRevokedPermissionsList) { + const std::string url1 = "https://example1.com:443"; + const std::string url2 = "https://example2.com:443"; + const ContentSettingsType type = ContentSettingsType::GEOLOCATION; + + base::Value::Dict dict = base::Value::Dict(); + base::Value::List permission_type_list = base::Value::List(); + permission_type_list.Append(static_cast<int32_t>(type)); + dict.Set(kRevokedKey, base::Value::List(std::move(permission_type_list))); + + // Add url1 and url2 to revoked permissions list. + hcsm()->SetWebsiteSettingDefaultScope( + GURL(url1), GURL(url1), + ContentSettingsType::REVOKED_UNUSED_SITE_PERMISSIONS, + base::Value(dict.Clone())); + hcsm()->SetWebsiteSettingDefaultScope( + GURL(url2), GURL(url2), + ContentSettingsType::REVOKED_UNUSED_SITE_PERMISSIONS, + base::Value(dict.Clone())); + + // Check there are 2 origins in the revoked permissions list. + ContentSettingsForOneType revoked_permissions_list; + hcsm()->GetSettingsForOneType( + ContentSettingsType::REVOKED_UNUSED_SITE_PERMISSIONS, + &revoked_permissions_list); + EXPECT_EQ(2U, revoked_permissions_list.size()); + + service()->ClearRevokedPermissionsList(); + + // Revoked permissions list should be empty. + hcsm()->GetSettingsForOneType( + ContentSettingsType::REVOKED_UNUSED_SITE_PERMISSIONS, + &revoked_permissions_list); + EXPECT_EQ(revoked_permissions_list.size(), 0U); } } // namespace permissions
diff --git a/components/policy/resources/templates/policy_definitions/BrowserIdle/IdleTimeout.yaml b/components/policy/resources/templates/policy_definitions/BrowserIdle/IdleTimeout.yaml index 83faab7..98f0bdf 100644 --- a/components/policy/resources/templates/policy_definitions/BrowserIdle/IdleTimeout.yaml +++ b/components/policy/resources/templates/policy_definitions/BrowserIdle/IdleTimeout.yaml
@@ -7,7 +7,7 @@ If this policy is not set, no action will be ran. - The minimum threshold is 5 minutes. + The minimum threshold is 1 minute. "User input" is defined by Operating System APIs, and includes things like moving the mouse or typing on the keyboard. example_value: 30 @@ -20,7 +20,7 @@ - nicolaso@chromium.org - cbe-magic@google.com schema: - minimum: 5 + minimum: 1 type: integer tags: [] type: int
diff --git a/components/privacy_sandbox_strings.grdp b/components/privacy_sandbox_strings.grdp index dcf38e3..84f5315 100644 --- a/components/privacy_sandbox_strings.grdp +++ b/components/privacy_sandbox_strings.grdp
@@ -183,53 +183,53 @@ <!-- Privacy Sandbox v4 - Topics settings page. --> <!-- Privacy Sandbox Settings 4 - Topics Page --> - <message name="IDS_SETTINGS_TOPICS_PAGE_TITLE" translateable="false" desc="Title for the Topics preferences page." formatter_data="android_java"> - Mauris interdum lectus vitae lacinia + <message name="IDS_SETTINGS_TOPICS_PAGE_TITLE" desc="A page title and the name of a new setting. **** CONTEXT PRIVACY SANDBOX **** Chrome’s Privacy Sandbox initiative 1) deprecates third-party cookies in Chrome, 2) supports free and open content on the web (by finding better ways to support ads online), 3) while providing stronger privacy protections for users. You can see a high-level description of this public project at www.privacysanbox.com. **** NEW SETTINGS SECTION IN CHROME **** 3 new ad-specific settings appear on an “Ad privacy” page in Chrome settings. For an equivalent structure, see “Security” on chrome://settings/privacy that opens chrome://settings/security. Likewise, “Ad privacy” on chrome://settings/privacy will open chrome://settings/AdPrivacy." formatter_data="android_java"> + Ad topics </message> - <message name="IDS_SETTINGS_TOPICS_PAGE_TOGGLE_LABEL" translateable="false" desc="Label for the toggle in the Topics preferences page." formatter_data="android_java"> - Nunc gravida condimentum consectetur + <message name="IDS_SETTINGS_TOPICS_PAGE_TOGGLE_LABEL" desc="The label for a new setting." formatter_data="android_java"> + Ad topics </message> - <message name="IDS_SETTINGS_TOPICS_PAGE_TOGGLE_SUB_LABEL" translateable="false" desc="Subabel for the toggle in the Topics preferences page." formatter_data="android_java"> - Vivamus nibh turpis, varius quis nisi vel, porta laoreet tellus. Mauris porta imperdiet venenatis + <message name="IDS_SETTINGS_TOPICS_PAGE_TOGGLE_SUB_LABEL" desc="A description of the new Ad topics setting. This text appears beneath the name of the new setting, 'Ad topics', and is associated with the control that a user can turn on or off. * 'browsing history': This help-center article explains 'browsing history' to users: https://support.google.com/chrome/answer/95589. * Ad topics are published at https://github.com/patcg-individual-drafts/topics/blob/main/taxonomy_v1.md * 'used by sites': Chrome estimates a user's topics of interest. As the user continues browsing, a site can ask Chrome for up to 3 of the user's topics to personalize ads for that user. **** CONTEXT PRIVACY SANDBOX **** Chrome’s Privacy Sandbox initiative 1) deprecates third-party cookies in Chrome, 2) supports free and open content on the web (by finding better ways to support ads online), 3) while providing stronger privacy protections for users. You can see a high-level description of this public project at www.privacysanbox.com. **** NEW SETTINGS SECTION IN CHROME **** 3 new ad-specific settings appear on an “Ad privacy” page in Chrome settings. For an equivalent structure, see “Security” on chrome://settings/privacy that opens chrome://settings/security. Likewise, “Ad privacy” on chrome://settings/privacy will open chrome://settings/AdPrivacy." formatter_data="android_java"> + Topics of interest are based on your recent browsing history and are used by sites to show you personalized ads </message> - <message name="IDS_SETTINGS_TOPICS_PAGE_CURRENT_TOPICS_HEADING" translateable="false" desc="Section title for the current Topics list underneath toggle in the Topics preferences page." formatter_data="android_java"> - Mauris at lectus + <message name="IDS_SETTINGS_TOPICS_PAGE_CURRENT_TOPICS_HEADING" desc="A label above a list of the user's topics of interest. Ad topics are published at https://github.com/patcg-individual-drafts/topics/blob/main/taxonomy_v1.md" formatter_data="android_java"> + Your topics </message> - <message name="IDS_SETTINGS_TOPICS_PAGE_CURRENT_TOPICS_DESCRIPTION_CANONICAL" translateable="false" desc="Section description for the current Topics list."> - Nulla tincidunt iaculis nulla, sit amet viverra massa luctus nec. Integer eget pellentesque magna, et venenatis lorem. Integer a porta elit, eget bibendum neque. Learn More. + <message name="IDS_SETTINGS_TOPICS_PAGE_CURRENT_TOPICS_DESCRIPTION_CANONICAL" desc="A description that appear beneath the 'Your topics' label. * 'You can block': There is a 'Block' button (or an X on mobile) that appears next to each topic in the list. * 'auto-deletes': this could also read 'Chrome deletes...' We included the 'auto' to reinforce that this is part of a system and the deletion is done regularly. The link opens a dialog box that provides more information about Ad topics."> + You can block topics you don’t want shared with sites. Chrome also auto-deletes your topics older than 4 weeks. Learn more </message> - <message name="IDS_SETTINGS_TOPICS_PAGE_CURRENT_TOPICS_DESCRIPTION_DISABLED_CANONICAL" translateable="false" desc="Section description for the current Topics list when Topics is disabled in the Topics preferences page."> - Sed porta viverra lacus ut euismod. Integer a cursus metus, ac ultricies libero. Learn More. + <message name="IDS_SETTINGS_TOPICS_PAGE_CURRENT_TOPICS_DESCRIPTION_DISABLED" desc="A description that appear beneath the 'Your topics' title. If this setting is off, no interests appear."> + When on, a list of topics appears here based on your recent browsing history </message> - <message name="IDS_SETTINGS_TOPICS_PAGE_CURRENT_TOPICS_DESCRIPTION_EMPTY_CANONICAL" translateable="false" desc="Section description for the current Topics list when the Topics list is empty in the Topics preferences page."> - Curabitur sagittis sapien ut turpis interdum, vitae porttitor sem pretium. Vestibulum sem mauris, ultrices ac massa sit amet, sodales aliquet est. Learn more. + <message name="IDS_SETTINGS_TOPICS_PAGE_CURRENT_TOPICS_DESCRIPTION_EMPTY" desc="A description that appear beneath the 'Your topics' title. This setting could be on but no topics appear in the list. This text explains why."> + It can take up to a week for a list of topics to appear here based on your recent browsing history </message> - <message name="IDS_SETTINGS_TOPICS_PAGE_BLOCK_TOPIC" translateable="false" desc="String on the button to block a topic in the Topics preferences page."> - Pellent + <message name="IDS_SETTINGS_TOPICS_PAGE_BLOCK_TOPIC" desc="A button associated with each of the user's topics. If the user clicks 'Block', that topic will get moved to the 'Topics you blocked' page."> + Block </message> - <message name="IDS_SETTINGS_TOPICS_PAGE_BLOCKED_TOPICS_HEADING" translateable="false" desc="Section title for the blocked topics list in the Topics preferences page." formatter_data="android_java"> - Integer faucibus metus + <message name="IDS_SETTINGS_TOPICS_PAGE_BLOCKED_TOPICS_HEADING" desc="A label that serves as a button to open the 'Topics you blocked' page." formatter_data="android_java"> + Topics you blocked </message> - <message name="IDS_SETTINGS_TOPICS_PAGE_BLOCKED_TOPICS_DESCRIPTION" translateable="false" desc="Section description for the blocked topics list in the Topics preferences page." formatter_data="android_java"> - Donec fringilla justo vel ligula finibus, ut rutrum lectus vestibulum. Suspendisse vestibulum lorem lacinia nulla consequat auctor. + <message name="IDS_SETTINGS_TOPICS_PAGE_BLOCKED_TOPICS_DESCRIPTION" desc="A description that appear beneath the 'Topics you blocked' title. * 'Add' is also the name used on the button that allows users to remove a topic from the blocked list. * 'an item' could be replaced by 'a topic'. We didn't so as not to repeat 'topic' in the same sentence. * 'pool of topics': We want to express that by clicking 'Add', the user is making a topic eligible again for consideration. The full 'pool of topics' is published at https://github.com/patcg-individual-drafts/topics/blob/main/taxonomy_v1.md" formatter_data="android_java"> + Add an item back if you want it in the pool of topics that Chrome can choose from when estimating your interests </message> - <message name="IDS_SETTINGS_TOPICS_PAGE_BLOCKED_TOPICS_DESCRIPTION_EMPTY" translateable="false" desc="Section description for the blocked topics list when there are no blocked topics in the Topics preferences page." formatter_data="android_java"> - Donec commodo sem non augue blandit, ullamcorper aliquam enim fermentum + <message name="IDS_SETTINGS_TOPICS_PAGE_BLOCKED_TOPICS_DESCRIPTION_EMPTY" desc="A description that appear beneath the 'Topics you blocked' title. This string is used if the user doesn't have any topics on the 'Topics you blocked' list." formatter_data="android_java"> + Blocked topics appear here </message> - <message name="IDS_SETTINGS_TOPICS_PAGE_ALLOW_TOPIC" translateable="false" desc="String on the button to re-allow a topic in the Topics preferences page."> - Aenean + <message name="IDS_SETTINGS_TOPICS_PAGE_ALLOW_TOPIC" desc="A button associated with each of the user's topics. When the user clicks 'Add', it makes that topic eligible in the 'pool of topics' that Chrome can use to estimate the user's topics of interest. Clicking 'Add' doesn't automatically put the added topic back onto the list of 'Your topics'. For that to happen, a user would have to browse sites associated with the 'Add'ed topic and Chrome would have to estimate the topic as relevant to that user."> + Add </message> - <message name="IDS_SETTINGS_TOPICS_PAGE_LEARN_MORE_HEADING" translateable="false" desc="Heading on 'Learn more' dialog in the Topics preferences page." formatter_data="android_java"> - Suspendisse sit amet consectetur sapien + <message name="IDS_SETTINGS_TOPICS_PAGE_LEARN_MORE_HEADING" desc="The title of a dialog box that offers more information about the Topics setting." formatter_data="android_java"> + More about ad topics </message> - <message name="IDS_SETTINGS_TOPICS_PAGE_LEARN_MORE_BULLET_1" translateable="false" desc="First bullet on 'Learn more' dialog in the Topics preferences page." formatter_data="android_java"> - Vestibulum arcu elit, pulvinar eu orci at, semper finibus metus. Donec sollicitudin, risus eu congue ullamcorper, nisl lorem consectetur risus, nec vulputate risus eros quis diam. + <message name="IDS_SETTINGS_TOPICS_PAGE_LEARN_MORE_BULLET_1" desc="Paragraph 1 of 3 on the Learn more about ad topics page. * 'Chrome notes...': This user uses Chrome to browse the web, so Chrome already has a notion of their browsing history. With this setting on, Chrome considers the recent browsing history to make a list of topics of interest. * 'browsing history': This help-center article explains 'browsing history' to users: https://support.google.com/chrome/answer/95589." formatter_data="android_java"> + Chrome notes topics of interest based on your browsing history from the last few weeks. </message> - <message name="IDS_SETTINGS_TOPICS_PAGE_LEARN_MORE_BULLET_2" translateable="false" desc="Second bullet on 'Learn more' dialog in the Topics preferences page." formatter_data="android_java"> - Aenean vel turpis id arcu viverra aliquet. Donec convallis, felis eget dictum venenatis, odio orci bibendum neque, quis egestas sem turpis et dui. + <message name="IDS_SETTINGS_TOPICS_PAGE_LEARN_MORE_BULLET_2" desc="Paragraph 2 of 3 on the Learn more about ad topics page. * 'Later' helps the user understand that there are 2 stages relative to this setting. In the first stage, Chrome can estimate the user's interests based on their browsing history. Later, as the user continues browsing, a site can ask Chrome for topics of interest used to personalize ads. It's not instantaneous. Link 'full list of possible topics' points to https://github.com/patcg-individual-drafts/topics/blob/main/taxonomy_v1.md" formatter_data="android_java"> + Later, a site you visit can ask Chrome for your topics to personalize the ads you see. Chrome shares up to 3 topics while protecting your browsing history and identity. </message> - <message name="IDS_SETTINGS_TOPICS_PAGE_LEARN_MORE_BULLET_3" translateable="false" desc="Third bullet on 'Learn more' dialog in the Topics preferences page." formatter_data="android_java"> - Integer convallis congue ex non vehicula. Nam vel vestibulum ante, ut consectetur ex. Duis semper lectus velit, id porttitor massa mattis sit amet. Integer pulvinar non nisi et tincidunt. Proin aliquam turpis massa, eget tincidunt orci vulputate vitae. + <message name="IDS_SETTINGS_TOPICS_PAGE_LEARN_MORE_BULLET_3" desc="Paragraph 3 of 3 on the Learn more about ad topics page. * 'auto-deletes': this could also read 'Chrome deletes...' We included the 'auto' to reinforce that this is part of a system and the deletion is done regularly." formatter_data="android_java"> + Chrome auto-deletes topics that are older than 4 weeks. As you keep browsing, a topic might reappear on the list. Or you can block topics you don’t want Chrome to share with sites. </message>
diff --git a/components/privacy_sandbox_strings_grdp/IDS_SETTINGS_TOPICS_PAGE_ALLOW_TOPIC.png.sha1 b/components/privacy_sandbox_strings_grdp/IDS_SETTINGS_TOPICS_PAGE_ALLOW_TOPIC.png.sha1 new file mode 100644 index 0000000..7f6e2ff --- /dev/null +++ b/components/privacy_sandbox_strings_grdp/IDS_SETTINGS_TOPICS_PAGE_ALLOW_TOPIC.png.sha1
@@ -0,0 +1 @@ +a998cde87ae90aee405406a8515f92bfd88f5646 \ No newline at end of file
diff --git a/components/privacy_sandbox_strings_grdp/IDS_SETTINGS_TOPICS_PAGE_BLOCKED_TOPICS_DESCRIPTION.png.sha1 b/components/privacy_sandbox_strings_grdp/IDS_SETTINGS_TOPICS_PAGE_BLOCKED_TOPICS_DESCRIPTION.png.sha1 new file mode 100644 index 0000000..7f6e2ff --- /dev/null +++ b/components/privacy_sandbox_strings_grdp/IDS_SETTINGS_TOPICS_PAGE_BLOCKED_TOPICS_DESCRIPTION.png.sha1
@@ -0,0 +1 @@ +a998cde87ae90aee405406a8515f92bfd88f5646 \ No newline at end of file
diff --git a/components/privacy_sandbox_strings_grdp/IDS_SETTINGS_TOPICS_PAGE_BLOCKED_TOPICS_DESCRIPTION_EMPTY.png.sha1 b/components/privacy_sandbox_strings_grdp/IDS_SETTINGS_TOPICS_PAGE_BLOCKED_TOPICS_DESCRIPTION_EMPTY.png.sha1 new file mode 100644 index 0000000..cc63426f --- /dev/null +++ b/components/privacy_sandbox_strings_grdp/IDS_SETTINGS_TOPICS_PAGE_BLOCKED_TOPICS_DESCRIPTION_EMPTY.png.sha1
@@ -0,0 +1 @@ +a9f8c14a9fab82c2a1891289bd87a4a20ba141ee \ No newline at end of file
diff --git a/components/privacy_sandbox_strings_grdp/IDS_SETTINGS_TOPICS_PAGE_BLOCKED_TOPICS_HEADING.png.sha1 b/components/privacy_sandbox_strings_grdp/IDS_SETTINGS_TOPICS_PAGE_BLOCKED_TOPICS_HEADING.png.sha1 new file mode 100644 index 0000000..7f6e2ff --- /dev/null +++ b/components/privacy_sandbox_strings_grdp/IDS_SETTINGS_TOPICS_PAGE_BLOCKED_TOPICS_HEADING.png.sha1
@@ -0,0 +1 @@ +a998cde87ae90aee405406a8515f92bfd88f5646 \ No newline at end of file
diff --git a/components/privacy_sandbox_strings_grdp/IDS_SETTINGS_TOPICS_PAGE_BLOCK_TOPIC.png.sha1 b/components/privacy_sandbox_strings_grdp/IDS_SETTINGS_TOPICS_PAGE_BLOCK_TOPIC.png.sha1 new file mode 100644 index 0000000..7f6e2ff --- /dev/null +++ b/components/privacy_sandbox_strings_grdp/IDS_SETTINGS_TOPICS_PAGE_BLOCK_TOPIC.png.sha1
@@ -0,0 +1 @@ +a998cde87ae90aee405406a8515f92bfd88f5646 \ No newline at end of file
diff --git a/components/privacy_sandbox_strings_grdp/IDS_SETTINGS_TOPICS_PAGE_CURRENT_TOPICS_DESCRIPTION_CANONICAL.png.sha1 b/components/privacy_sandbox_strings_grdp/IDS_SETTINGS_TOPICS_PAGE_CURRENT_TOPICS_DESCRIPTION_CANONICAL.png.sha1 new file mode 100644 index 0000000..7f6e2ff --- /dev/null +++ b/components/privacy_sandbox_strings_grdp/IDS_SETTINGS_TOPICS_PAGE_CURRENT_TOPICS_DESCRIPTION_CANONICAL.png.sha1
@@ -0,0 +1 @@ +a998cde87ae90aee405406a8515f92bfd88f5646 \ No newline at end of file
diff --git a/components/privacy_sandbox_strings_grdp/IDS_SETTINGS_TOPICS_PAGE_CURRENT_TOPICS_DESCRIPTION_DISABLED.png.sha1 b/components/privacy_sandbox_strings_grdp/IDS_SETTINGS_TOPICS_PAGE_CURRENT_TOPICS_DESCRIPTION_DISABLED.png.sha1 new file mode 100644 index 0000000..0a93e64 --- /dev/null +++ b/components/privacy_sandbox_strings_grdp/IDS_SETTINGS_TOPICS_PAGE_CURRENT_TOPICS_DESCRIPTION_DISABLED.png.sha1
@@ -0,0 +1 @@ +79d4ea2d0d57f613b75e473f249971ec21025e53 \ No newline at end of file
diff --git a/components/privacy_sandbox_strings_grdp/IDS_SETTINGS_TOPICS_PAGE_CURRENT_TOPICS_DESCRIPTION_EMPTY.png.sha1 b/components/privacy_sandbox_strings_grdp/IDS_SETTINGS_TOPICS_PAGE_CURRENT_TOPICS_DESCRIPTION_EMPTY.png.sha1 new file mode 100644 index 0000000..87d7ed2b --- /dev/null +++ b/components/privacy_sandbox_strings_grdp/IDS_SETTINGS_TOPICS_PAGE_CURRENT_TOPICS_DESCRIPTION_EMPTY.png.sha1
@@ -0,0 +1 @@ +24374a5a183420869e0c9931cbbd242ed468a28c \ No newline at end of file
diff --git a/components/privacy_sandbox_strings_grdp/IDS_SETTINGS_TOPICS_PAGE_CURRENT_TOPICS_HEADING.png.sha1 b/components/privacy_sandbox_strings_grdp/IDS_SETTINGS_TOPICS_PAGE_CURRENT_TOPICS_HEADING.png.sha1 new file mode 100644 index 0000000..7f6e2ff --- /dev/null +++ b/components/privacy_sandbox_strings_grdp/IDS_SETTINGS_TOPICS_PAGE_CURRENT_TOPICS_HEADING.png.sha1
@@ -0,0 +1 @@ +a998cde87ae90aee405406a8515f92bfd88f5646 \ No newline at end of file
diff --git a/components/privacy_sandbox_strings_grdp/IDS_SETTINGS_TOPICS_PAGE_LEARN_MORE_BULLET_1.png.sha1 b/components/privacy_sandbox_strings_grdp/IDS_SETTINGS_TOPICS_PAGE_LEARN_MORE_BULLET_1.png.sha1 new file mode 100644 index 0000000..e7670437 --- /dev/null +++ b/components/privacy_sandbox_strings_grdp/IDS_SETTINGS_TOPICS_PAGE_LEARN_MORE_BULLET_1.png.sha1
@@ -0,0 +1 @@ +f30174d760f45b43bd65ccf7ab81561e95b20066 \ No newline at end of file
diff --git a/components/privacy_sandbox_strings_grdp/IDS_SETTINGS_TOPICS_PAGE_LEARN_MORE_BULLET_2.png.sha1 b/components/privacy_sandbox_strings_grdp/IDS_SETTINGS_TOPICS_PAGE_LEARN_MORE_BULLET_2.png.sha1 new file mode 100644 index 0000000..e7670437 --- /dev/null +++ b/components/privacy_sandbox_strings_grdp/IDS_SETTINGS_TOPICS_PAGE_LEARN_MORE_BULLET_2.png.sha1
@@ -0,0 +1 @@ +f30174d760f45b43bd65ccf7ab81561e95b20066 \ No newline at end of file
diff --git a/components/privacy_sandbox_strings_grdp/IDS_SETTINGS_TOPICS_PAGE_LEARN_MORE_BULLET_3.png.sha1 b/components/privacy_sandbox_strings_grdp/IDS_SETTINGS_TOPICS_PAGE_LEARN_MORE_BULLET_3.png.sha1 new file mode 100644 index 0000000..e7670437 --- /dev/null +++ b/components/privacy_sandbox_strings_grdp/IDS_SETTINGS_TOPICS_PAGE_LEARN_MORE_BULLET_3.png.sha1
@@ -0,0 +1 @@ +f30174d760f45b43bd65ccf7ab81561e95b20066 \ No newline at end of file
diff --git a/components/privacy_sandbox_strings_grdp/IDS_SETTINGS_TOPICS_PAGE_LEARN_MORE_HEADING.png.sha1 b/components/privacy_sandbox_strings_grdp/IDS_SETTINGS_TOPICS_PAGE_LEARN_MORE_HEADING.png.sha1 new file mode 100644 index 0000000..e7670437 --- /dev/null +++ b/components/privacy_sandbox_strings_grdp/IDS_SETTINGS_TOPICS_PAGE_LEARN_MORE_HEADING.png.sha1
@@ -0,0 +1 @@ +f30174d760f45b43bd65ccf7ab81561e95b20066 \ No newline at end of file
diff --git a/components/privacy_sandbox_strings_grdp/IDS_SETTINGS_TOPICS_PAGE_TITLE.png.sha1 b/components/privacy_sandbox_strings_grdp/IDS_SETTINGS_TOPICS_PAGE_TITLE.png.sha1 new file mode 100644 index 0000000..7f6e2ff --- /dev/null +++ b/components/privacy_sandbox_strings_grdp/IDS_SETTINGS_TOPICS_PAGE_TITLE.png.sha1
@@ -0,0 +1 @@ +a998cde87ae90aee405406a8515f92bfd88f5646 \ No newline at end of file
diff --git a/components/privacy_sandbox_strings_grdp/IDS_SETTINGS_TOPICS_PAGE_TOGGLE_LABEL.png.sha1 b/components/privacy_sandbox_strings_grdp/IDS_SETTINGS_TOPICS_PAGE_TOGGLE_LABEL.png.sha1 new file mode 100644 index 0000000..7f6e2ff --- /dev/null +++ b/components/privacy_sandbox_strings_grdp/IDS_SETTINGS_TOPICS_PAGE_TOGGLE_LABEL.png.sha1
@@ -0,0 +1 @@ +a998cde87ae90aee405406a8515f92bfd88f5646 \ No newline at end of file
diff --git a/components/privacy_sandbox_strings_grdp/IDS_SETTINGS_TOPICS_PAGE_TOGGLE_SUB_LABEL.png.sha1 b/components/privacy_sandbox_strings_grdp/IDS_SETTINGS_TOPICS_PAGE_TOGGLE_SUB_LABEL.png.sha1 new file mode 100644 index 0000000..7f6e2ff --- /dev/null +++ b/components/privacy_sandbox_strings_grdp/IDS_SETTINGS_TOPICS_PAGE_TOGGLE_SUB_LABEL.png.sha1
@@ -0,0 +1 @@ +a998cde87ae90aee405406a8515f92bfd88f5646 \ No newline at end of file
diff --git a/components/safe_browsing/content/resources/real_time_url_checks_allowlist/PRESUBMIT.py b/components/safe_browsing/content/resources/real_time_url_checks_allowlist/PRESUBMIT.py index fa1ccaa..9ac288a 100644 --- a/components/safe_browsing/content/resources/real_time_url_checks_allowlist/PRESUBMIT.py +++ b/components/safe_browsing/content/resources/real_time_url_checks_allowlist/PRESUBMIT.py
@@ -106,15 +106,12 @@ if len(ascii_file.OldContents()) == 0: return [] - # TODO(skrakowi): uncomment the commented out version and scheme id - # checks - return [] # Check the new version of the component with the old to ensure validity - # return ( - # CheckVersionUpdatedInRealTimeUrlChecksAllowlist( - # output_api, ascii_file - # ) + - # CheckSchemeUpdatedInRealTimeUrlChecksAllowlist( - # output_api, ascii_file - # ) - # ) + return ( + CheckVersionUpdatedInRealTimeUrlChecksAllowlist( + output_api, ascii_file + ) + + CheckSchemeUpdatedInRealTimeUrlChecksAllowlist( + output_api, ascii_file + ) + )
diff --git a/components/services/app_service/public/cpp/intent.cc b/components/services/app_service/public/cpp/intent.cc index a7a84ac..81718dd 100644 --- a/components/services/app_service/public/cpp/intent.cc +++ b/components/services/app_service/public/cpp/intent.cc
@@ -18,7 +18,8 @@ bool IntentFile::operator==(const IntentFile& other) const { return url == other.url && mime_type == other.mime_type && file_name == other.file_name && file_size == other.file_size && - is_directory == other.is_directory; + is_directory == other.is_directory && + dlp_source_url == other.dlp_source_url; } bool IntentFile::operator!=(const IntentFile& other) const { @@ -35,6 +36,7 @@ } intent_file->file_size = file_size; intent_file->is_directory = is_directory; + intent_file->dlp_source_url = dlp_source_url; return intent_file; }
diff --git a/components/services/app_service/public/cpp/intent.h b/components/services/app_service/public/cpp/intent.h index 4e4609a..4f0fa4a9 100644 --- a/components/services/app_service/public/cpp/intent.h +++ b/components/services/app_service/public/cpp/intent.h
@@ -54,6 +54,9 @@ uint64_t file_size = 0; // Whether this is a directory or not. absl::optional<bool> is_directory; + // Source URL the file was downloaded from. Used to check Data Leak Prevention + // (DLP) restrictions when resolving the intent. + absl::optional<std::string> dlp_source_url; }; using IntentFilePtr = std::unique_ptr<IntentFile>;
diff --git a/components/test/data/autofill/merge/input/validation.in b/components/test/data/autofill/merge/input/validation.in index 82a1c005..d3522764 100644 --- a/components/test/data/autofill/merge/input/validation.in +++ b/components/test/data/autofill/merge/input/validation.in
@@ -41,17 +41,6 @@ ADDRESS_HOME_ZIP: 94043 ADDRESS_HOME_COUNTRY: United States --- -NAME_FIRST: Jane -NAME_LAST: Smith -NAME_FULL: -EMAIL_ADDRESS: jane.smith@example.com -ADDRESS_HOME_STREET_ADDRESS: 1600 Amphitheatre Parkway\n(Bldg. 1950) -ADDRESS_HOME_CITY: Mountain View -ADDRESS_HOME_STATE: CA -ADDRESS_HOME_ZIP: 94043 -ADDRESS_HOME_COUNTRY: Bad Country -PHONE_HOME_WHOLE_NUMBER: 6505558888 ---- NAME_FIRST: Joe NAME_LAST: Jones NAME_FULL:
diff --git a/components/translate/content/android/java/src/org/chromium/components/translate/TranslateFeatureList.java b/components/translate/content/android/java/src/org/chromium/components/translate/TranslateFeatureList.java index 62f69bd..b98d53e 100644 --- a/components/translate/content/android/java/src/org/chromium/components/translate/TranslateFeatureList.java +++ b/components/translate/content/android/java/src/org/chromium/components/translate/TranslateFeatureList.java
@@ -16,9 +16,9 @@ @JNINamespace("translate::android") public class TranslateFeatureList { /** Alphabetical: */ + public static final String CONTENT_LANGUAGES_DISABLE_OBSERVERS_PARAM = "disable_observers"; public static final String CONTENT_LANGUAGES_IN_LANGUAGE_PICKER = "ContentLanguagesInLanguagePicker"; - public static final String CONTENT_LANGUAGES_DISABLE_OBSERVERS_PARAM = "disable_observers"; // Do not instantiate this class. private TranslateFeatureList() {}
diff --git a/components/unexportable_keys/BUILD.gn b/components/unexportable_keys/BUILD.gn index 53be0cf4..cc27357 100644 --- a/components/unexportable_keys/BUILD.gn +++ b/components/unexportable_keys/BUILD.gn
@@ -4,6 +4,10 @@ static_library("unexportable_keys") { sources = [ + "background_long_task_scheduler.cc", + "background_long_task_scheduler.h", + "background_task.h", + "background_task_impl.h", "background_task_priority.h", "ref_counted_unexportable_signing_key.cc", "ref_counted_unexportable_signing_key.h", @@ -21,7 +25,10 @@ source_set("unit_tests") { testonly = true - sources = [ "unexportable_key_task_manager_unittest.cc" ] + sources = [ + "background_long_task_scheduler_unittest.cc", + "unexportable_key_task_manager_unittest.cc", + ] deps = [ ":unexportable_keys",
diff --git a/components/unexportable_keys/background_long_task_scheduler.cc b/components/unexportable_keys/background_long_task_scheduler.cc new file mode 100644 index 0000000..903419c --- /dev/null +++ b/components/unexportable_keys/background_long_task_scheduler.cc
@@ -0,0 +1,95 @@ +// Copyright 2023 The Chromium Authors +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#include "components/unexportable_keys/background_long_task_scheduler.h" + +#include "base/check_op.h" +#include "base/containers/circular_deque.h" +#include "base/memory/scoped_refptr.h" +#include "base/memory/weak_ptr.h" +#include "base/task/sequenced_task_runner.h" +#include "components/unexportable_keys/background_task.h" +#include "components/unexportable_keys/background_task_priority.h" + +namespace unexportable_keys { + +BackgroundLongTaskScheduler::BackgroundLongTaskScheduler( + scoped_refptr<base::SequencedTaskRunner> background_task_runner) + : background_task_runner_(std::move(background_task_runner)) { + DCHECK(background_task_runner_); +} + +BackgroundLongTaskScheduler::~BackgroundLongTaskScheduler() = default; + +void BackgroundLongTaskScheduler::PostTask(std::unique_ptr<BackgroundTask> task, + BackgroundTaskPriority priority) { + GetTaskQueueForPriority(priority).push_back(std::move(task)); + // If no task is running, schedule `task` immediately. + if (!running_task_) { + MaybeRunNextPendingTask(); + } +} + +void BackgroundLongTaskScheduler::OnTaskCompleted(BackgroundTask* task) { + DCHECK_EQ(running_task_.get(), task); + running_task_.reset(); + MaybeRunNextPendingTask(); +} + +void BackgroundLongTaskScheduler::MaybeRunNextPendingTask() { + DCHECK(!running_task_); + + running_task_ = TakeNextPendingTask(); + if (!running_task_) { + // There is no more pending tasks. Nothing to do. + return; + } + running_task_->Run( + background_task_runner_, + base::BindOnce(&BackgroundLongTaskScheduler::OnTaskCompleted, + weak_ptr_factory_.GetWeakPtr())); +} + +BackgroundLongTaskScheduler::TaskQueue& +BackgroundLongTaskScheduler::GetTaskQueueForPriority( + BackgroundTaskPriority priority) { + size_t index = static_cast<size_t>(priority); + CHECK_LT(index, kNumTaskPriorities); + return task_queue_by_priority_[index]; +} + +BackgroundLongTaskScheduler::TaskQueue* +BackgroundLongTaskScheduler::GetHighestPriorityNonEmptyTaskQueue() { + // Highest priority has the highest value. + for (int i = kNumTaskPriorities - 1; i >= 0; --i) { + TaskQueue& queue = task_queue_by_priority_[i]; + if (!queue.empty()) { + return &queue; + } + } + return nullptr; +} + +std::unique_ptr<BackgroundTask> +BackgroundLongTaskScheduler::TakeNextPendingTask() { + std::unique_ptr<BackgroundTask> next_task; + while (!next_task) { + TaskQueue* next_queue = GetHighestPriorityNonEmptyTaskQueue(); + if (!next_queue) { + return nullptr; + } + + next_task = std::move(next_queue->front()); + next_queue->pop_front(); + if (next_task->GetStatus() == BackgroundTask::Status::kCanceled) { + // Dismiss a canceled task and try the next one. + next_task.reset(); + } else { + DCHECK_EQ(next_task->GetStatus(), BackgroundTask::Status::kPending); + } + } + return next_task; +} + +} // namespace unexportable_keys
diff --git a/components/unexportable_keys/background_long_task_scheduler.h b/components/unexportable_keys/background_long_task_scheduler.h new file mode 100644 index 0000000..aee46f5 --- /dev/null +++ b/components/unexportable_keys/background_long_task_scheduler.h
@@ -0,0 +1,80 @@ +// Copyright 2023 The Chromium Authors +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#ifndef COMPONENTS_UNEXPORTABLE_KEYS_BACKGROUND_LONG_TASK_SCHEDULER_H_ +#define COMPONENTS_UNEXPORTABLE_KEYS_BACKGROUND_LONG_TASK_SCHEDULER_H_ + +#include <memory> + +#include "base/containers/circular_deque.h" +#include "base/memory/scoped_refptr.h" +#include "base/memory/weak_ptr.h" +#include "components/unexportable_keys/background_task_priority.h" + +namespace base { +class SequencedTaskRunner; +} // namespace base + +namespace unexportable_keys { + +class BackgroundTask; + +// `BackgroundLongTaskScheduler` allows scheduling `BackgroundTask`s to be run +// on a background thread. It's designed specifically to run long blocking tasks +// that cannot be run in parallel. +// +// The scheduler posts tasks to the background thread one by one to have a +// full control of which task is running next on the main thread. Since the +// tasks being run are long, the risk of running a wrong task outweighs extra +// overhead caused by additional thread hops. +// +// Supported features: +// - Multiple task priorities (defined in background_task_priority.h). Tasks +// with a higher priority are always posted to the background thread before +// tasks with a lower priority. +// Lower-priority tasks are subject to starvation. +// - Dynamic priority changes. Not implemented yet. +// TODO(b/263249728): support dynamic priorities. +// - Task cancellation. A task never runs if it gets cancelled before it's been +// posted on the background thread. +class BackgroundLongTaskScheduler { + public: + explicit BackgroundLongTaskScheduler( + scoped_refptr<base::SequencedTaskRunner> background_task_runner); + ~BackgroundLongTaskScheduler(); + + BackgroundLongTaskScheduler(const BackgroundLongTaskScheduler&) = delete; + BackgroundLongTaskScheduler& operator=(const BackgroundLongTaskScheduler&) = + delete; + + void PostTask(std::unique_ptr<BackgroundTask> task, + BackgroundTaskPriority priority); + + private: + // Type representing a single task queue with a specific priority. + using TaskQueue = base::circular_deque<std::unique_ptr<BackgroundTask>>; + + void OnTaskCompleted(BackgroundTask* task); + + void MaybeRunNextPendingTask(); + TaskQueue& GetTaskQueueForPriority(BackgroundTaskPriority priority); + TaskQueue* GetHighestPriorityNonEmptyTaskQueue(); + std::unique_ptr<BackgroundTask> TakeNextPendingTask(); + + std::array<TaskQueue, kNumTaskPriorities> task_queue_by_priority_; + + // `BackgroundTask` that is currently running on `background_task_runner_`. + // It is nullptr if no task is running. + std::unique_ptr<BackgroundTask> running_task_; + + // Task runner that has at most one task (`running_task_`) in its queue at any + // moment. + scoped_refptr<base::SequencedTaskRunner> background_task_runner_; + + base::WeakPtrFactory<BackgroundLongTaskScheduler> weak_ptr_factory_{this}; +}; + +} // namespace unexportable_keys + +#endif // COMPONENTS_UNEXPORTABLE_KEYS_BACKGROUND_LONG_TASK_SCHEDULER_H_
diff --git a/components/unexportable_keys/background_long_task_scheduler_unittest.cc b/components/unexportable_keys/background_long_task_scheduler_unittest.cc new file mode 100644 index 0000000..a505fb2d4 --- /dev/null +++ b/components/unexportable_keys/background_long_task_scheduler_unittest.cc
@@ -0,0 +1,181 @@ +// Copyright 2023 The Chromium Authors +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#include "components/unexportable_keys/background_long_task_scheduler.h" + +#include "base/cancelable_callback.h" +#include "base/functional/callback.h" +#include "base/memory/scoped_refptr.h" +#include "base/task/sequenced_task_runner.h" +#include "base/task/thread_pool.h" +#include "base/test/bind.h" +#include "base/test/task_environment.h" +#include "base/test/test_future.h" +#include "components/unexportable_keys/background_task_impl.h" +#include "components/unexportable_keys/background_task_priority.h" +#include "testing/gtest/include/gtest/gtest.h" + +namespace unexportable_keys { + +// Data shared between all tasks on the background thread. +struct BackgroundThreadData { + size_t task_count = 0; +}; + +// FakeTask returns how many tasks has been executed on the background thread +// including the current one, at the moment of the task running. +class FakeTask : public internal::BackgroundTaskImpl<size_t> { + public: + explicit FakeTask(BackgroundThreadData& background_data, + base::OnceCallback<void(size_t)> callback) + : internal::BackgroundTaskImpl<size_t>( + base::BindLambdaForTesting( + [&background_data]() { return ++background_data.task_count; }), + std::move(callback)) {} +}; + +class BackgroundLongTaskSchedulerTest : public testing::Test { + public: + BackgroundLongTaskSchedulerTest() + : background_task_runner_( + base::ThreadPool::CreateSequencedTaskRunner({})) {} + ~BackgroundLongTaskSchedulerTest() override = default; + + void RunAllBackgroundTasks() { task_environment_.RunUntilIdle(); } + + BackgroundLongTaskScheduler& scheduler() { return scheduler_; } + + BackgroundThreadData& background_data() { return background_data_; } + + private: + base::test::TaskEnvironment task_environment_{ + base::test::TaskEnvironment::ThreadPoolExecutionMode:: + QUEUED}; // QUEUED - tasks don't run until `RunUntilIdle()` is + // called. + scoped_refptr<base::SequencedTaskRunner> background_task_runner_; + BackgroundLongTaskScheduler scheduler_{background_task_runner_}; + BackgroundThreadData background_data_; +}; + +TEST_F(BackgroundLongTaskSchedulerTest, PostTask) { + base::test::TestFuture<size_t> future; + scheduler().PostTask( + std::make_unique<FakeTask>(background_data(), future.GetCallback()), + BackgroundTaskPriority::kBestEffort); + EXPECT_FALSE(future.IsReady()); + + RunAllBackgroundTasks(); + + EXPECT_TRUE(future.IsReady()); + EXPECT_EQ(future.Get(), 1U); +} + +TEST_F(BackgroundLongTaskSchedulerTest, PostTwoTasks) { + base::test::TestFuture<size_t> future; + base::test::TestFuture<size_t> future2; + // The first task gets scheduled on the background thread immediately. + scheduler().PostTask( + std::make_unique<FakeTask>(background_data(), future.GetCallback()), + BackgroundTaskPriority::kBestEffort); + scheduler().PostTask( + std::make_unique<FakeTask>(background_data(), future2.GetCallback()), + BackgroundTaskPriority::kUserBlocking); + + RunAllBackgroundTasks(); + + EXPECT_EQ(future.Get(), 1U); + EXPECT_EQ(future2.Get(), 2U); +} + +TEST_F(BackgroundLongTaskSchedulerTest, PostTwoTasks_Sequentially) { + base::test::TestFuture<size_t> future; + scheduler().PostTask( + std::make_unique<FakeTask>(background_data(), future.GetCallback()), + BackgroundTaskPriority::kBestEffort); + RunAllBackgroundTasks(); + EXPECT_EQ(future.Get(), 1U); + + base::test::TestFuture<size_t> future2; + scheduler().PostTask( + std::make_unique<FakeTask>(background_data(), future2.GetCallback()), + BackgroundTaskPriority::kBestEffort); + RunAllBackgroundTasks(); + EXPECT_EQ(future2.Get(), 2U); +} + +TEST_F(BackgroundLongTaskSchedulerTest, TaskPriority) { + base::test::TestFuture<size_t> future; + base::test::TestFuture<size_t> future2; + base::test::TestFuture<size_t> future3; + // The first task gets scheduled on the background thread immediately. + scheduler().PostTask( + std::make_unique<FakeTask>(background_data(), future.GetCallback()), + BackgroundTaskPriority::kBestEffort); + scheduler().PostTask( + std::make_unique<FakeTask>(background_data(), future2.GetCallback()), + BackgroundTaskPriority::kUserVisible); + // `future3` has higher priority than `future2` and should run before, even + // though it was scheduled after. + scheduler().PostTask( + std::make_unique<FakeTask>(background_data(), future3.GetCallback()), + BackgroundTaskPriority::kUserBlocking); + + RunAllBackgroundTasks(); + + EXPECT_EQ(future.Get(), 1U); + EXPECT_EQ(future3.Get(), 2U); + EXPECT_EQ(future2.Get(), 3U); +} + +TEST_F(BackgroundLongTaskSchedulerTest, CancelPendingTask) { + base::test::TestFuture<size_t> future; + base::test::TestFuture<size_t> future2; + base::CancelableOnceCallback<void(size_t)> cancelable_wrapper2( + future2.GetCallback()); + base::test::TestFuture<size_t> future3; + // The first task gets scheduled on the background thread immediately. + scheduler().PostTask( + std::make_unique<FakeTask>(background_data(), future.GetCallback()), + BackgroundTaskPriority::kBestEffort); + scheduler().PostTask(std::make_unique<FakeTask>( + background_data(), cancelable_wrapper2.callback()), + BackgroundTaskPriority::kBestEffort); + scheduler().PostTask( + std::make_unique<FakeTask>(background_data(), future3.GetCallback()), + BackgroundTaskPriority::kBestEffort); + + cancelable_wrapper2.Cancel(); + RunAllBackgroundTasks(); + + EXPECT_EQ(future.Get(), 1U); + // `future2` wasn't run since the task was canceled before it was scheduled. + EXPECT_EQ(future3.Get(), 2U); +} + +TEST_F(BackgroundLongTaskSchedulerTest, CancelRunningTask) { + base::test::TestFuture<size_t> future; + base::CancelableOnceCallback<void(size_t)> cancelable_wrapper( + future.GetCallback()); + scheduler().PostTask(std::make_unique<FakeTask>( + background_data(), cancelable_wrapper.callback()), + BackgroundTaskPriority::kBestEffort); + + cancelable_wrapper.Cancel(); + RunAllBackgroundTasks(); + + // The main thread callback wasn't run but the background task completed + // anyways. + EXPECT_FALSE(future.IsReady()); + + // Check that the background count has been incremented by posting another + // task. + base::test::TestFuture<size_t> future2; + scheduler().PostTask( + std::make_unique<FakeTask>(background_data(), future2.GetCallback()), + BackgroundTaskPriority::kBestEffort); + RunAllBackgroundTasks(); + EXPECT_EQ(future2.Get(), 2U); +} + +} // namespace unexportable_keys
diff --git a/components/unexportable_keys/background_task.h b/components/unexportable_keys/background_task.h new file mode 100644 index 0000000..1a29080 --- /dev/null +++ b/components/unexportable_keys/background_task.h
@@ -0,0 +1,42 @@ +// Copyright 2023 The Chromium Authors +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#ifndef COMPONENTS_UNEXPORTABLE_KEYS_BACKGROUND_TASK_H_ +#define COMPONENTS_UNEXPORTABLE_KEYS_BACKGROUND_TASK_H_ + +#include "base/functional/callback_forward.h" +#include "base/memory/scoped_refptr.h" + +namespace base { +class SequencedTaskRunner; +} + +namespace unexportable_keys { + +// Interface for tasks scheduled on `BackgroundLongTaskScheduler`. +class BackgroundTask { + public: + // Different statuses that the task can have. + enum class Status { + kPending, // The task is waiting in a queue. + kCanceled, // The task has been canceled by the caller. + kPosted // The task has been posted on the background thread. + }; + + virtual ~BackgroundTask() = default; + + // Runs the task on `background_task_runner` and invokes + // `on_complete_callback` with `this` on the posting thread once the task + // completes. + virtual void Run( + scoped_refptr<base::SequencedTaskRunner> background_task_runner, + base::OnceCallback<void(BackgroundTask* task)> on_complete_callback) = 0; + + // Returns the current status of the task. + virtual Status GetStatus() const = 0; +}; + +} // namespace unexportable_keys + +#endif // COMPONENTS_UNEXPORTABLE_KEYS_BACKGROUND_TASK_H_
diff --git a/components/unexportable_keys/background_task_impl.h b/components/unexportable_keys/background_task_impl.h new file mode 100644 index 0000000..78b5a46 --- /dev/null +++ b/components/unexportable_keys/background_task_impl.h
@@ -0,0 +1,61 @@ +// Copyright 2023 The Chromium Authors +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#ifndef COMPONENTS_UNEXPORTABLE_KEYS_BACKGROUND_TASK_IMPL_H_ +#define COMPONENTS_UNEXPORTABLE_KEYS_BACKGROUND_TASK_IMPL_H_ + +#include "base/functional/callback.h" +#include "base/location.h" +#include "base/memory/scoped_refptr.h" +#include "base/task/sequenced_task_runner.h" +#include "components/unexportable_keys/background_task.h" + +namespace unexportable_keys::internal { + +// A template class implementing `BackgroundTask`. Background task is +// represented by a `task_` callback with a specific `ReturnType` that is passed +// from the background thread to a `reply_` callback. +template <typename ReturnType> +class BackgroundTaskImpl : public BackgroundTask { + public: + // `task` is a callback that runs on the background thread and returns a + // value. + // `reply` is invoked on the posting thread with the return result of + // `task`. + BackgroundTaskImpl(base::OnceCallback<ReturnType()> task, + base::OnceCallback<void(ReturnType)> reply) + : task_(std::move(task)), reply_(std::move(reply)) { + DCHECK(task_); + DCHECK(reply_); + } + ~BackgroundTaskImpl() override = default; + + // BackgroundTask: + void Run(scoped_refptr<base::SequencedTaskRunner> background_task_runner, + base::OnceCallback<void(BackgroundTask* task)> on_complete_callback) + override { + background_task_runner->PostTaskAndReplyWithResult( + FROM_HERE, std::move(task_), + std::move(reply_).Then( + base::BindOnce(std::move(on_complete_callback), this))); + } + + BackgroundTask::Status GetStatus() const override { + if (reply_.is_null()) { + // `reply_` has already been posted to the background task runner. + return BackgroundTask::Status::kPosted; + } + + return reply_.IsCancelled() ? BackgroundTask::Status::kCanceled + : BackgroundTask::Status::kPending; + } + + private: + base::OnceCallback<ReturnType()> task_; + base::OnceCallback<void(ReturnType)> reply_; +}; + +} // namespace unexportable_keys::internal + +#endif // COMPONENTS_UNEXPORTABLE_KEYS_BACKGROUND_TASK_IMPL_H_
diff --git a/content/browser/devtools/devtools_instrumentation.cc b/content/browser/devtools/devtools_instrumentation.cc index 2586a6c..1a46842 100644 --- a/content/browser/devtools/devtools_instrumentation.cc +++ b/content/browser/devtools/devtools_instrumentation.cc
@@ -361,7 +361,7 @@ } void WillInitiatePrerender(FrameTree& frame_tree) { - DCHECK_EQ(FrameTree::Type::kPrerender, frame_tree.type()); + DCHECK(frame_tree.is_prerendering()); auto* wc = WebContentsImpl::FromFrameTreeNode(frame_tree.root()); if (auto* host = WebContentsDevToolsAgentHost::GetFor(wc)) host->WillInitiatePrerender(frame_tree.root()); @@ -1673,6 +1673,9 @@ CrossOriginPortalPostMessageError; case blink::mojom::GenericIssueErrorType::kFormLabelForNameError: return protocol::Audits::GenericIssueErrorTypeEnum::FormLabelForNameError; + case blink::mojom::GenericIssueErrorType::kFormDuplicateIdForInputError: + return protocol::Audits::GenericIssueErrorTypeEnum:: + FormDuplicateIdForInputError; } }
diff --git a/content/browser/direct_sockets/direct_sockets_udp_unittest.cc b/content/browser/direct_sockets/direct_sockets_udp_unittest.cc index 7743db2..e31c4c4 100644 --- a/content/browser/direct_sockets/direct_sockets_udp_unittest.cc +++ b/content/browser/direct_sockets/direct_sockets_udp_unittest.cc
@@ -10,6 +10,7 @@ #include "base/task/sequenced_task_runner.h" #include "base/test/bind.h" #include "base/test/task_environment.h" +#include "base/test/test_future.h" #include "mojo/public/cpp/bindings/receiver.h" #include "net/base/ip_endpoint.h" #include "services/network/public/mojom/udp_socket.mojom.h" @@ -26,7 +27,7 @@ class MockNetworkContext; -enum class RecordedCall { kReceiveMore, kSend }; +enum class RecordedCall { kReceiveMore, kSend, kClose }; std::unique_ptr<network::mojom::UDPSocket> CreateMockUDPSocket( MockNetworkContext* network_context, @@ -90,6 +91,8 @@ std::move(callback).Run(net::OK); } + void Close() override { network_context_->Record(RecordedCall::kClose); } + const raw_ptr<MockNetworkContext> network_context_; mojo::Receiver<network::mojom::UDPSocket> receiver_{this}; mojo::Remote<network::mojom::UDPSocketListener> listener_; @@ -123,54 +126,41 @@ mojo::Receiver<network::mojom::UDPSocketListener> socket_listener_receiver{ &listener}; - DirectUDPSocketImpl socket( + auto socket = std::make_unique<DirectUDPSocketImpl>( &mock_network_context, socket_listener_receiver.BindNewPipeAndPassRemote()); { - base::RunLoop run_loop; + base::test::TestFuture<int32_t, const absl::optional<net::IPEndPoint>&> + future; const net::IPEndPoint remote_addr; network::mojom::UDPSocketOptionsPtr options; - socket.Connect( - remote_addr, std::move(options), - - base::BindLambdaForTesting( - [&run_loop](int result, const absl::optional<net::IPEndPoint>&) { - EXPECT_EQ(result, net::OK); - run_loop.Quit(); - })); - run_loop.Run(); + socket->Connect(remote_addr, std::move(options), future.GetCallback()); + EXPECT_EQ(future.Get<0>(), net::OK); } // Successful calls. - socket.ReceiveMore(kNumAdditionalDatagrams); + socket->ReceiveMore(kNumAdditionalDatagrams); for (unsigned i = 0; i < 3; ++i) { - base::RunLoop run_loop; - socket.Send(kData, base::BindLambdaForTesting([&run_loop](int32_t result) { - EXPECT_EQ(result, net::OK); - run_loop.Quit(); - })); - run_loop.Run(); + base::test::TestFuture<int32_t> future; + socket->Send(kData, future.GetCallback()); + EXPECT_EQ(future.Get(), net::OK); } - socket.Close(); - // Unsuccessful calls after Close. - socket.ReceiveMore(kNumAdditionalDatagrams); { - base::RunLoop run_loop; - socket.Send(kData, base::BindLambdaForTesting([&run_loop](int32_t result) { - EXPECT_EQ(result, net::ERR_FAILED); - run_loop.Quit(); - })); - run_loop.Run(); + // Reset the socket and wait until call to Close() propagates. + base::RunLoop loop; + socket.reset(); + loop.RunUntilIdle(); } // Only the calls before Close reach the MockUDPSocket. - DCHECK_EQ(4U, mock_network_context.history().size()); + DCHECK_EQ(5U, mock_network_context.history().size()); EXPECT_EQ(mock_network_context.history()[0], RecordedCall::kReceiveMore); EXPECT_EQ(mock_network_context.history()[1], RecordedCall::kSend); EXPECT_EQ(mock_network_context.history()[2], RecordedCall::kSend); EXPECT_EQ(mock_network_context.history()[3], RecordedCall::kSend); + EXPECT_EQ(mock_network_context.history()[4], RecordedCall::kClose); } } // namespace content
diff --git a/content/browser/direct_sockets/direct_udp_socket_impl.cc b/content/browser/direct_sockets/direct_udp_socket_impl.cc index f975091..9a5d497 100644 --- a/content/browser/direct_sockets/direct_udp_socket_impl.cc +++ b/content/browser/direct_sockets/direct_udp_socket_impl.cc
@@ -19,7 +19,11 @@ &DirectUDPSocketImpl::OnDisconnect, base::Unretained(this))); } -DirectUDPSocketImpl::~DirectUDPSocketImpl() = default; +DirectUDPSocketImpl::~DirectUDPSocketImpl() { + if (remote_.is_bound()) { + remote_->Close(); + } +} void DirectUDPSocketImpl::Connect(const net::IPEndPoint& remote_addr, network::mojom::UDPSocketOptionsPtr options, @@ -46,14 +50,6 @@ std::move(callback)); } -void DirectUDPSocketImpl::Close() { - if (!remote_.is_bound()) { - return; - } - remote_->Close(); - remote_.reset(); -} - void DirectUDPSocketImpl::OnDisconnect() { remote_.reset(); }
diff --git a/content/browser/direct_sockets/direct_udp_socket_impl.h b/content/browser/direct_sockets/direct_udp_socket_impl.h index 535806a..28a7756 100644 --- a/content/browser/direct_sockets/direct_udp_socket_impl.h +++ b/content/browser/direct_sockets/direct_udp_socket_impl.h
@@ -36,7 +36,6 @@ // blink::mojom::DirectUDPSocket: void ReceiveMore(uint32_t num_additional_datagrams) override; void Send(base::span<const uint8_t> data, SendCallback callback) override; - void Close() override; private: void OnDisconnect();
diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/browser/renderer_host/render_frame_host_impl.cc index 85fe3f5..afa248c 100644 --- a/content/browser/renderer_host/render_frame_host_impl.cc +++ b/content/browser/renderer_host/render_frame_host_impl.cc
@@ -5033,7 +5033,17 @@ return; } - if (frame_tree_node_->render_manager()->is_attaching_inner_delegate()) { + // This method should be called in the pending deletion state except the + // placeholder RFHs for an inner WebContents that use unload without changing + // lifecycle states. When attaching a GuestView as the inner WebContents, + // `RFH::SwapOuterDelegateFrame()` is called for the placeholder RFH so that + // it makes its renderer send this message. `owner_` is non null since this + // attachment can only happen for subframes and pending deletion is the only + // case where subframes may have a null `owner_`. + RenderFrameHostOwner* owner = + IsPendingDeletion() ? GetFrameTreeNodeForUnload() : owner_; + if (!is_main_frame() && + owner->GetRenderFrameHostManager().is_attaching_inner_delegate()) { // This RFH was unloaded while attaching an inner delegate. The RFH // will stay around but it will no longer be associated with a RenderFrame. RenderFrameDeleted(); @@ -8765,7 +8775,7 @@ // Reset navigations only when entering "pending deletion" state due to // frame detach if the kStopCancellingNavigationsOnCommitAndNewNavigation // flag is enabled, or for all pending deletion cases otherwise. - frame_tree_node_->ResetAllNavigationsForFrameDetach(); + GetFrameTreeNodeForUnload()->ResetAllNavigationsForFrameDetach(); } else { CHECK( pending_deletion_reason == PendingDeletionReason::kSwappedOut ||
diff --git a/content/browser/renderer_host/render_frame_host_impl.h b/content/browser/renderer_host/render_frame_host_impl.h index 2ecf78d..7290d38 100644 --- a/content/browser/renderer_host/render_frame_host_impl.h +++ b/content/browser/renderer_host/render_frame_host_impl.h
@@ -3788,13 +3788,30 @@ // mistakes when the associated FrameTreeNode changes (e.g. during prerender // activations). // - // This points to: - // - Owning FrameTreeNode for main RenderFrameHosts in kActive, kPrerender, - // kSpeculative or kPendingCommit lifecycle states. - // - Null for main RenderFrameHosts in kPendingDeletion lifecycle state. - // - Null for main RenderFrameHosts stored in BFCache. - // - Owning FrameTreeNode for subframes (which stays the same for the entire - // lifetime of a subframe RenderFrameHostImpl). + // All RenderFrameHosts are created with a non-null `owner_`. When + // RenderFrameHostManager replaces its current RenderFrameHost with another + // RenderFrameHost (e.g., after a navigation), the old RenderFrameHost's + // `owner_` becomes null. The old RenderFrameHost will then enter back-forward + // cache or become pending deletion. + // + // Invariants: + // - If `lifecycle_state_` is one of: kSpeculative, kPrerendering, kActive, or + // kPendingCommit then `owner_` != nullptr. + // + // - If `lifecycle_state_` == kBackForwardCache, then the top-level + // RenderFrameHost has no `owner_`. RenderFrameHosts nested below in iframes + // still have an `owner_` while in the back-forward cache. + // + // - If `lifecycle_state_` is kRunningUnloadHandlers or kReadyToBeDeleted + // (i.e., pending deletion), then `owner_` will sometimes be null. + // Specifically, RenderFrameHosts that have been replaced (e.g., after a + // navigation) will have a null `owner_`, while their children will continue + // to have a non-null `owner_`. Detached <iframe> RenderFrameHosts also + // continue to have a non-null `owner_`. + // + // In particular: + // - IsActive() => owner_. + // - !owner_ => IsPendingDeletion() || IsInBackForwardCache(). raw_ptr<RenderFrameHostOwner> owner_ = nullptr; // Stores all of the state related to each browsing context +
diff --git a/content/browser/renderer_host/render_frame_host_owner.h b/content/browser/renderer_host/render_frame_host_owner.h index 760be050..8dea3744 100644 --- a/content/browser/renderer_host/render_frame_host_owner.h +++ b/content/browser/renderer_host/render_frame_host_owner.h
@@ -117,7 +117,9 @@ subresource_web_bundle_navigation_info, int http_response_code) = 0; - // Cancel ongoing navigation in this frame, if any. + // Cancels the navigation owned by the FrameTreeNode. + // Note: this does not cancel navigations that are owned by the current or + // speculative RenderFrameHosts. virtual void CancelNavigation() = 0; // Return the iframe.credentialless attribute value.
diff --git a/content/browser/starscan_load_observer.cc b/content/browser/starscan_load_observer.cc index 6d4b301e..2c08531 100644 --- a/content/browser/starscan_load_observer.cc +++ b/content/browser/starscan_load_observer.cc
@@ -7,6 +7,7 @@ #include "base/allocator/partition_allocator/starscan/pcscan.h" #include "base/logging.h" #include "content/browser/renderer_host/frame_tree.h" +#include "content/browser/renderer_host/navigation_request.h" #include "content/browser/renderer_host/render_frame_host_impl.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/navigation_handle.h" @@ -32,10 +33,12 @@ // We don't disable PCScan for a prerendering page's navigation since // it doesn't invoke DidStopLoading. - RenderFrameHostImpl* rfh = static_cast<RenderFrameHostImpl*>( - navigation_handle->GetRenderFrameHost()); - if (rfh->frame_tree()->type() == FrameTree::Type::kPrerender) + if (NavigationRequest::From(navigation_handle) + ->frame_tree_node() + ->frame_tree() + .is_prerendering()) { return; + } // Protect against ReadyToCommitNavigation() being called twice in a row. if (is_loading_)
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc index 75fc94d..c69ae7d 100644 --- a/content/browser/web_contents/web_contents_impl.cc +++ b/content/browser/web_contents/web_contents_impl.cc
@@ -1429,7 +1429,7 @@ ->lifecycle_state() == RenderFrameHostImpl::LifecycleStateImpl::kPrerendering; } - return frame_tree_node->frame_tree().type() == FrameTree::Type::kPrerender; + return frame_tree_node->GetFrameType() == FrameType::kPrerenderMainFrame; } RenderFrameHostImpl* WebContentsImpl::UnsafeFindFrameByFrameTreeNodeId(
diff --git a/content/public/test/prerender_test_util.cc b/content/public/test/prerender_test_util.cc index 57370e0..395a941 100644 --- a/content/public/test/prerender_test_util.cc +++ b/content/public/test/prerender_test_util.cc
@@ -470,10 +470,16 @@ RenderFrameHostImpl::LifecycleStateImpl::kPrerendering) { return ::testing::AssertionFailure() << "subframe in incorrect state"; } - if (rfhi->frame_tree()->type() != FrameTree::Type::kPrerender) { - return ::testing::AssertionFailure() << "frame tree had incorrect type"; - } } + + // Make sure that all the PrerenderHost frame trees are prerendering. + const std::vector<FrameTree*> prerender_frame_trees = + registry.GetPrerenderFrameTrees(); + std::for_each(std::begin(prerender_frame_trees), + std::end(prerender_frame_trees), [](auto const& frame_tree) { + ASSERT_TRUE(frame_tree->is_prerendering()); + }); + return ::testing::AssertionSuccess(); }
diff --git a/content/test/gpu/gpu_tests/test_expectations/pixel_expectations.txt b/content/test/gpu/gpu_tests/test_expectations/pixel_expectations.txt index 5fe1334..ec76940 100644 --- a/content/test/gpu/gpu_tests/test_expectations/pixel_expectations.txt +++ b/content/test/gpu/gpu_tests/test_expectations/pixel_expectations.txt
@@ -295,7 +295,7 @@ # devices or Lacros FYI x64 Release (Intel) yet. crbug.com/1230619 [ android android-pixel-2 ] Pixel_WebGLFloat [ Failure ] crbug.com/1230619 [ android android-pixel-4 ] Pixel_WebGLFloat [ Failure ] -crbug.com/1230619 [ android android-pixel-6 ] Pixel_WebGLFloat [ Failure ] +crbug.com/1230619 [ android android-pixel-6 angle-disabled no-passthrough ] Pixel_WebGLFloat [ Failure ] crbug.com/1230619 [ android android-SM-A135M ] Pixel_WebGLFloat [ Failure ] crbug.com/1230619 [ android android-SM-A235M ] Pixel_WebGLFloat [ Failure ] crbug.com/1230619 [ linux intel display-server-wayland ] Pixel_WebGLFloat [ Failure ] @@ -323,7 +323,7 @@ crbug.com/1268120 [ mac asan ] Pixel_WebGPUToDataURL [ Failure ] crbug.com/1268120 [ mac asan ] Pixel_WebGPUDisplayP3 [ Failure ] -crbug.com/1297636 [ mac ] Pixel_WebGPUImportUnaccelerated2DCanvas [ Failure ] +crbug.com/1297636 [ mac mac-x86_64 ] Pixel_WebGPUImportUnaccelerated2DCanvas [ Failure ] # Pixel_WebGPUDisplayP3 socket timeout on Mac FYI Retina Release (NVIDIA) crbug.com/1392819 [ mac nvidia no-asan ] Pixel_WebGPUDisplayP3 [ Failure ] @@ -395,7 +395,7 @@ # Pixel_MediaRecorderFromVideoElement fails on several FYI bots crbug.com/1382332 [ amd-0x7340 release-x64 target-cpu-64 win10 ] Pixel_MediaRecorderFromVideoElementWithOoprCanvasDisabled [ Failure ] -crbug.com/1382332 [ mac ] Pixel_MediaRecorderFromVideoElement [ Failure ] +crbug.com/1382332 [ amd-0x6821 asan mac-x86_64 monterey release ] Pixel_MediaRecorderFromVideoElement [ Failure ] crbug.com/1382332 [ amd-0x6821 asan mac-x86_64 monterey release ] Pixel_MediaRecorderFromVideoElementWithOoprCanvasDisabled [ Failure ] crbug.com/1382332 [ mac-x86_64 mojave no-asan nvidia-0xfe9 release ] Pixel_MediaRecorderFromVideoElementWithOoprCanvasDisabled [ Failure ] crbug.com/1382332 [ chromeos ] Pixel_MediaRecorderFromVideoElement [ Failure ]
diff --git a/extensions/browser/extension_event_histogram_value.h b/extensions/browser/extension_event_histogram_value.h index e104bde3..cb390b3 100644 --- a/extensions/browser/extension_event_histogram_value.h +++ b/extensions/browser/extension_event_histogram_value.h
@@ -519,6 +519,10 @@ PASSWORDS_PRIVATE_ON_PASSWORD_MANAGER_AUTH_TIMEOUT = 497, PASSWORDS_PRIVATE_ON_INSECURE_CREDENTIALS_CHANGED = 498, VIRTUAL_KEYBOARD_PRIVATE_ON_COLOR_PROVIDER_CHANGED = 499, + SMART_CARD_PROVIDER_PRIVATE_ON_ESTABLISH_CONTEXT_REQUESTED = 500, + SMART_CARD_PROVIDER_PRIVATE_ON_RELEASE_CONTEXT_REQUESTED = 501, + SMART_CARD_PROVIDER_PRIVATE_ON_LIST_READERS_REQUESTED = 502, + SMART_CARD_PROVIDER_PRIVATE_ON_GET_STATUS_CHANGE_REQUESTED = 503, // Last entry: Add new entries above, then run: // tools/metrics/histograms/update_extension_histograms.py ENUM_BOUNDARY
diff --git a/extensions/browser/extension_function_histogram_value.h b/extensions/browser/extension_function_histogram_value.h index 0ecba3e..a7b36433 100644 --- a/extensions/browser/extension_function_histogram_value.h +++ b/extensions/browser/extension_function_histogram_value.h
@@ -1811,6 +1811,10 @@ FILEMANAGERPRIVATEINTERNAL_SEARCHFILES = 1748, SYSTEMLOG_ADD = 1749, DECLARATIVENETREQUEST_GETDISABLEDRULEIDS = 1750, + SMARTCARDPROVIDERPRIVATE_REPORTESTABLISHCONTEXTRESULT = 1751, + SMARTCARDPROVIDERPRIVATE_REPORTRELEASECONTEXTRESULT = 1752, + SMARTCARDPROVIDERPRIVATE_REPORTLISTREADERSRESULT = 1753, + SMARTCARDPROVIDERPRIVATE_REPORTGETSTATUSCHANGERESULT = 1754, // Last entry: Add new entries above, then run: // tools/metrics/histograms/update_extension_histograms.py ENUM_BOUNDARY
diff --git a/extensions/common/mojom/api_permission_id.mojom b/extensions/common/mojom/api_permission_id.mojom index 2dc3b55..43e0d4a4 100644 --- a/extensions/common/mojom/api_permission_id.mojom +++ b/extensions/common/mojom/api_permission_id.mojom
@@ -271,6 +271,7 @@ kChromeOSTelemetryNetworkInformation = 244, kPdfViewerPrivate = 245, kSystemLog = 246, + kSmartCardProviderPrivate = 247, // Add new entries at the end of the enum and be sure to update the // "ExtensionPermission3" enum in tools/metrics/histograms/enums.xml
diff --git a/fuchsia_web/shell/web_engine_shell.cml b/fuchsia_web/shell/web_engine_shell.cml index 7f20d5c4..1ea9df29 100644 --- a/fuchsia_web/shell/web_engine_shell.cml +++ b/fuchsia_web/shell/web_engine_shell.cml
@@ -3,9 +3,6 @@ // found in the LICENSE file. { include: [ - "syslog/client.shard.cml", - "vulkan/client.shard.cml", - // CML shards intended for tests are used here because this component is // launched as a test. While it doesn't fit the typical use-case for a test // component, it's a useful way to be able to launch the component from a @@ -13,6 +10,7 @@ // to function correctly. "//build/config/fuchsia/test/chromium_test_facet.shard.test-cml", "//build/config/fuchsia/test/elf_test_ambient_exec_runner.shard.test-cml", + "syslog/client.shard.cml", ], program: { binary: "web_engine_shell_exec", @@ -25,9 +23,15 @@ "fuchsia.sys.Environment", "fuchsia.sys.Launcher", "fuchsia.sys.Loader", - "fuchsia.web.ContextProvider", ], }, + + // Used conditionally based on the absence of `--use-web-instance` on the + // command line at runtime. + { + protocol: "fuchsia.web.ContextProvider", + availability: "optional", + }, { storage: "data", path: "/data", @@ -40,7 +44,6 @@ // Uses below this line are for web_instance.cmx { protocol: [ - "fuchsia.accessibility.semantics.SemanticsManager", "fuchsia.buildinfo.Provider", "fuchsia.device.NameProvider", "fuchsia.fonts.Provider", @@ -50,7 +53,6 @@ "fuchsia.kernel.VmexResource", "fuchsia.media.Audio", "fuchsia.media.AudioDeviceEnumerator", - "fuchsia.media.drm.Widevine", "fuchsia.media.ProfileProvider", "fuchsia.media.SessionAudioConsumerFactory", "fuchsia.mediacodec.CodecFactory", @@ -59,12 +61,32 @@ "fuchsia.net.name.Lookup", "fuchsia.posix.socket.Provider", "fuchsia.process.Launcher", + "fuchsia.sysmem.Allocator", + "fuchsia.ui.input3.Keyboard", + ], + }, + + // Used conditionally based on the value of `enable_widevine` at build time. + // TODO(crbug.com/1379411): Use a shard to conditionally use based on + // build-time config. + { + protocol: "fuchsia.media.drm.Widevine", + availability: "optional", + }, + + // Used conditionally based on the absence of `--headless` on the command + // line at runtime. + { + protocol: [ + "fuchsia.accessibility.semantics.SemanticsManager", + "fuchsia.tracing.provider.Registry", "fuchsia.ui.composition.Allocator", "fuchsia.ui.composition.Flatland", - "fuchsia.ui.input3.Keyboard", "fuchsia.ui.policy.Presenter", "fuchsia.ui.scenic.Scenic", + "fuchsia.vulkan.loader.Loader", ], + availability: "optional", }, { protocol: "fuchsia.tracing.perfetto.ProducerConnector",
diff --git a/gpu/command_buffer/service/DEPS b/gpu/command_buffer/service/DEPS index 92293950..f6471a3 100644 --- a/gpu/command_buffer/service/DEPS +++ b/gpu/command_buffer/service/DEPS
@@ -13,4 +13,5 @@ "+components/viz/common/resources/resource_format_utils.h", "+components/viz/common/resources/resource_sizes.h", "+components/viz/common/resources/shared_image_format.h", + "+ui/ozone/buildflags.h", ]
diff --git a/gpu/command_buffer/service/gles2_cmd_decoder.cc b/gpu/command_buffer/service/gles2_cmd_decoder.cc index 0f9dfe6..aade054b 100644 --- a/gpu/command_buffer/service/gles2_cmd_decoder.cc +++ b/gpu/command_buffer/service/gles2_cmd_decoder.cc
@@ -66,7 +66,6 @@ #include "gpu/command_buffer/service/gpu_fence_manager.h" #include "gpu/command_buffer/service/gpu_state_tracer.h" #include "gpu/command_buffer/service/gpu_tracer.h" -#include "gpu/command_buffer/service/image_factory.h" #include "gpu/command_buffer/service/logger.h" #include "gpu/command_buffer/service/mailbox_manager.h" #include "gpu/command_buffer/service/memory_tracking.h" @@ -653,12 +652,10 @@ public ErrorStateClient, public ui::GpuSwitchingObserver { public: - GLES2DecoderImpl( - DecoderClient* client, - CommandBufferServiceBase* command_buffer_service, - Outputter* outputter, - ContextGroup* group, - std::unique_ptr<ImageFactory> image_factory_for_nacl_swapchain); + GLES2DecoderImpl(DecoderClient* client, + CommandBufferServiceBase* command_buffer_service, + Outputter* outputter, + ContextGroup* group); GLES2DecoderImpl(const GLES2DecoderImpl&) = delete; GLES2DecoderImpl& operator=(const GLES2DecoderImpl&) = delete; @@ -2506,9 +2503,11 @@ #endif unsigned int RequiredTextureTypeForAnonymousImage(); - ImageFactory* image_factory_for_nacl_swapchain() { - return image_factory_for_nacl_swapchain_.get(); +#if BUILDFLAG(IS_OZONE) + ImageFactoryNativePixmap* image_factory_for_nacl_swapchain() { + return &image_factory_for_nacl_swapchain_; } +#endif // Helper method to call glClear workaround. void ClearFramebufferForWorkaround(GLbitfield mask); @@ -2831,7 +2830,9 @@ std::set<scoped_refptr<TextureRef>> texture_refs_pending_destruction_; #endif - const std::unique_ptr<ImageFactory> image_factory_for_nacl_swapchain_; +#if BUILDFLAG(IS_OZONE) + ImageFactoryNativePixmap image_factory_for_nacl_swapchain_; +#endif base::WeakPtrFactory<GLES2DecoderImpl> weak_ptr_factory_{this}; }; @@ -3070,8 +3071,12 @@ : memory_tracker_(decoder->memory_tracker()), bytes_allocated_(0), decoder_(decoder) { +#if BUILDFLAG(IS_OZONE) DCHECK(!decoder_->should_use_native_gmb_for_backbuffer_ || decoder_->image_factory_for_nacl_swapchain()); +#else + DCHECK(!decoder_->should_use_native_gmb_for_backbuffer_); +#endif } BackTexture::~BackTexture() { @@ -3288,8 +3293,6 @@ "BackTexture::DestroyNativeGpuMemoryBuffer", decoder_->error_state_.get()); - image_->ReleaseTexImage(Target()); - decoder_->texture_manager()->SetLevelImage(texture_ref_.get(), Target(), 0, nullptr, Texture::UNBOUND); image_ = nullptr; @@ -3469,22 +3472,14 @@ outputter, group); } - std::unique_ptr<ImageFactory> image_factory_for_nacl_swapchain; -#if BUILDFLAG(IS_OZONE) - image_factory_for_nacl_swapchain = - std::make_unique<ImageFactoryNativePixmap>(); -#endif - - return new GLES2DecoderImpl(client, command_buffer_service, outputter, group, - std::move(image_factory_for_nacl_swapchain)); + return new GLES2DecoderImpl(client, command_buffer_service, outputter, group); } GLES2DecoderImpl::GLES2DecoderImpl( DecoderClient* client, CommandBufferServiceBase* command_buffer_service, Outputter* outputter, - ContextGroup* group, - std::unique_ptr<ImageFactory> image_factory_for_nacl_swapchain) + ContextGroup* group) : GLES2Decoder(client, command_buffer_service, outputter), group_(group), logger_(&debug_marker_manager_, @@ -3550,9 +3545,7 @@ gpu_debug_commands_(false), validation_fbo_multisample_(0), validation_fbo_(0), - texture_manager_service_id_generation_(0), - image_factory_for_nacl_swapchain_( - std::move(image_factory_for_nacl_swapchain)) { + texture_manager_service_id_generation_(0) { DCHECK(client); DCHECK(group); } @@ -3649,23 +3642,22 @@ should_use_native_gmb_for_backbuffer_ = attrib_helper.should_use_native_gmb_for_backbuffer; if (should_use_native_gmb_for_backbuffer_) { - gpu::ImageFactory* image_factory = image_factory_for_nacl_swapchain(); bool supported = false; - if (image_factory) { - switch (image_factory->RequiredTextureType()) { - case GL_TEXTURE_RECTANGLE_ARB: - supported = feature_info_->feature_flags().arb_texture_rectangle; - break; - case GL_TEXTURE_EXTERNAL_OES: - supported = feature_info_->feature_flags().oes_egl_image_external; - break; - case GL_TEXTURE_2D: - supported = true; - break; - default: - break; - } +#if BUILDFLAG(IS_OZONE) + switch (image_factory_for_nacl_swapchain()->RequiredTextureType()) { + case GL_TEXTURE_RECTANGLE_ARB: + supported = feature_info_->feature_flags().arb_texture_rectangle; + break; + case GL_TEXTURE_EXTERNAL_OES: + supported = feature_info_->feature_flags().oes_egl_image_external; + break; + case GL_TEXTURE_2D: + supported = true; + break; + default: + break; } +#endif if (!supported) { LOG(ERROR) << "ContextResult::kFatalFailure: " @@ -19298,8 +19290,11 @@ } bool GLES2DecoderImpl::ChromiumImageNeedsRGBEmulation() { - gpu::ImageFactory* factory = image_factory_for_nacl_swapchain(); - return factory ? !factory->SupportsFormatRGB() : false; +#if BUILDFLAG(IS_OZONE) + return image_factory_for_nacl_swapchain()->SupportsFormatRGB(); +#else + return false; +#endif } void GLES2DecoderImpl::ClearFramebufferForWorkaround(GLbitfield mask) { @@ -19555,32 +19550,28 @@ #if BUILDFLAG(IS_OZONE) bool GLES2DecoderImpl::SupportsCreateAnonymousImage() { - if (auto* image_factory_native_pixmap = - image_factory_for_nacl_swapchain()->AsImageFactoryNativePixmap()) { - return image_factory_native_pixmap->SupportsCreateAnonymousImage(); - } - - return false; + return image_factory_for_nacl_swapchain()->SupportsCreateAnonymousImage(); } scoped_refptr<gl::GLImageNativePixmap> GLES2DecoderImpl::CreateAnonymousImage( const gfx::Size& size, gfx::BufferFormat format, bool* is_cleared) { - if (auto* image_factory_native_pixmap = - image_factory_for_nacl_swapchain()->AsImageFactoryNativePixmap()) { - return image_factory_native_pixmap->CreateAnonymousImage( - size, format, gfx::BufferUsage::SCANOUT, gpu::kNullSurfaceHandle, - is_cleared); - } - - return nullptr; + return image_factory_for_nacl_swapchain()->CreateAnonymousImage( + size, format, gfx::BufferUsage::SCANOUT, gpu::kNullSurfaceHandle, + is_cleared); } + #endif // An image can only be bound to a texture with the appropriate type. unsigned int GLES2DecoderImpl::RequiredTextureTypeForAnonymousImage() { +#if BUILDFLAG(IS_OZONE) return image_factory_for_nacl_swapchain()->RequiredTextureType(); +#else + NOTREACHED(); + return 0; +#endif } // Include the auto-generated part of this file. We split this because it means
diff --git a/gpu/command_buffer/service/passthrough_abstract_texture_impl.cc b/gpu/command_buffer/service/passthrough_abstract_texture_impl.cc index cc2b0b4e..b94ebe9 100644 --- a/gpu/command_buffer/service/passthrough_abstract_texture_impl.cc +++ b/gpu/command_buffer/service/passthrough_abstract_texture_impl.cc
@@ -55,22 +55,12 @@ const GLuint target = texture_passthrough_->target(); const GLuint level = 0; - // If the previous execution of SetUnboundImage() set an image, check if the - // image has since been bound and release it if so. - if (decoder_managed_image_) { - gl::GLImage* current_image = - texture_passthrough_->GetLevelImage(target, level); - bool is_bound = !texture_passthrough_->is_bind_pending(); - if (current_image && is_bound) - current_image->ReleaseTexImage(target); - } - // Configure the new image. - decoder_managed_image_ = (image != nullptr); - if (decoder_managed_image_) + if (image) { texture_passthrough_->set_bind_pending(); - else + } else { texture_passthrough_->clear_bind_pending(); + } texture_passthrough_->SetLevelImage(target, level, image); } #else
diff --git a/gpu/command_buffer/service/passthrough_abstract_texture_impl.h b/gpu/command_buffer/service/passthrough_abstract_texture_impl.h index 323f3bf0..4cd009c 100644 --- a/gpu/command_buffer/service/passthrough_abstract_texture_impl.h +++ b/gpu/command_buffer/service/passthrough_abstract_texture_impl.h
@@ -46,9 +46,6 @@ private: scoped_refptr<TexturePassthrough> texture_passthrough_; -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) - bool decoder_managed_image_ = false; -#endif raw_ptr<gl::GLApi> gl_api_; raw_ptr<GLES2DecoderPassthroughImpl> decoder_; CleanupCallback cleanup_cb_;
diff --git a/gpu/command_buffer/service/validating_abstract_texture_impl.cc b/gpu/command_buffer/service/validating_abstract_texture_impl.cc index 8a1bc877a..73bb784 100644 --- a/gpu/command_buffer/service/validating_abstract_texture_impl.cc +++ b/gpu/command_buffer/service/validating_abstract_texture_impl.cc
@@ -60,18 +60,7 @@ const GLuint target = texture_ref_->texture()->target(); const GLint level = 0; - // If the previous execution of SetUnboundImage() set an image, check if the - // image has since been bound and release it if so. - if (decoder_managed_image_) { - Texture::ImageState image_state; - gl::GLImage* current_image = - texture_ref_->texture()->GetLevelImage(target, 0, &image_state); - if (current_image && image_state == Texture::BOUND) - current_image->ReleaseTexImage(target); - } - // Configure the new image. - decoder_managed_image_ = (image != nullptr); Texture::ImageState state = Texture::ImageState::UNBOUND; GetTextureManager()->SetLevelImage(texture_ref_.get(), target, level, image, state);
diff --git a/gpu/command_buffer/service/validating_abstract_texture_impl.h b/gpu/command_buffer/service/validating_abstract_texture_impl.h index c49c0af..7691704 100644 --- a/gpu/command_buffer/service/validating_abstract_texture_impl.h +++ b/gpu/command_buffer/service/validating_abstract_texture_impl.h
@@ -61,9 +61,6 @@ void SetLevelInfo(); scoped_refptr<TextureRef> texture_ref_; -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) - bool decoder_managed_image_ = false; -#endif raw_ptr<DecoderContext> decoder_context_ = nullptr; DestructionCB destruction_cb_;
diff --git a/gpu/command_buffer/tests/gl_oes_egl_image_unittest.cc b/gpu/command_buffer/tests/gl_oes_egl_image_unittest.cc index bfa52dd..b895c3c2 100644 --- a/gpu/command_buffer/tests/gl_oes_egl_image_unittest.cc +++ b/gpu/command_buffer/tests/gl_oes_egl_image_unittest.cc
@@ -170,13 +170,11 @@ nullptr); EXPECT_TRUE(GL_NO_ERROR == glGetError()); - // Release the image. // TODO(crbug.com/1323341): This call is likely unnecessary, but it's not // currently possible to actually run the test to completion to verify. See // https://chromium-review.googlesource.com/c/chromium/src/+/4055269/comment/e8eed809_ffcdfc9c/. gl_.decoder()->AttachImageToTextureWithClientBinding( texture_id, GL_TEXTURE_2D, image.get()); - image->ReleaseTexImage(GL_TEXTURE_2D); // Clean up. glDeleteProgram(program);
diff --git a/headless/BUILD.gn b/headless/BUILD.gn index 7987fdf..a85e7cad 100644 --- a/headless/BUILD.gn +++ b/headless/BUILD.gn
@@ -835,7 +835,6 @@ static_library("headless_shell_browser_lib") { sources = [ "app/headless_shell.cc", - "app/headless_shell.h", "app/headless_shell_command_line.cc", "app/headless_shell_command_line.h", "app/headless_shell_switches.h", @@ -875,7 +874,6 @@ static_library("headless_shell_lib") { sources = [ "app/headless_shell.cc", - "app/headless_shell.h", "app/headless_shell_command_line.cc", "app/headless_shell_command_line.h", "app/headless_shell_switches.h",
diff --git a/headless/app/headless_shell.cc b/headless/app/headless_shell.cc index 9bf5877..22b713ad 100644 --- a/headless/app/headless_shell.cc +++ b/headless/app/headless_shell.cc
@@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "headless/app/headless_shell.h" +#include "headless/public/headless_shell.h" #include <memory> @@ -16,6 +16,7 @@ #include "build/branding_buildflags.h" #include "build/build_config.h" #include "content/public/app/content_main.h" +#include "content/public/common/content_switches.h" #include "headless/app/headless_shell_command_line.h" #include "headless/app/headless_shell_switches.h" #include "headless/lib/browser/headless_browser_impl.h" @@ -25,7 +26,6 @@ #include "headless/public/headless_browser_context.h" #include "headless/public/headless_web_contents.h" #include "net/base/filename_util.h" -#include "net/http/http_util.h" #include "url/gurl.h" #if BUILDFLAG(IS_MAC) @@ -70,10 +70,25 @@ base::MakeAbsoluteFilePath(base::FilePath(arg))); } -} // namespace +// An application which implements a simple headless browser. +class HeadlessShell { + public: + HeadlessShell() = default; -HeadlessShell::HeadlessShell() = default; -HeadlessShell::~HeadlessShell() = default; + HeadlessShell(const HeadlessShell&) = delete; + HeadlessShell& operator=(const HeadlessShell&) = delete; + + ~HeadlessShell() = default; + + void OnBrowserStart(HeadlessBrowser* browser); + + private: + void ShutdownSoon(); + void Shutdown(); + + raw_ptr<HeadlessBrowser> browser_ = nullptr; + raw_ptr<HeadlessBrowserContext> browser_context_ = nullptr; +}; void HeadlessShell::OnBrowserStart(HeadlessBrowser* browser) { browser_ = browser; @@ -144,20 +159,98 @@ HeadlessCommandHandler::ProcessCommands( HeadlessWebContentsImpl::From(web_contents)->web_contents(), std::move(target_url), - base::BindOnce(&HeadlessShell::ShutdownSoon, weak_factory_.GetWeakPtr())); + base::BindOnce(&HeadlessShell::ShutdownSoon, base::Unretained(this))); #endif } void HeadlessShell::ShutdownSoon() { browser_->BrowserMainThread()->PostTask( FROM_HERE, - base::BindOnce(&HeadlessShell::Shutdown, weak_factory_.GetWeakPtr())); + base::BindOnce(&HeadlessShell::Shutdown, base::Unretained(this))); } void HeadlessShell::Shutdown() { browser_->Shutdown(); } +int RunContentMain( + HeadlessBrowser::Options options, + base::OnceCallback<void(HeadlessBrowser*)> on_browser_start_callback) { + content::ContentMainParams params(nullptr); +#if BUILDFLAG(IS_WIN) + // Sandbox info has to be set and initialized. + CHECK(options.sandbox_info); + params.instance = options.instance; + params.sandbox_info = std::move(options.sandbox_info); +#elif !BUILDFLAG(IS_ANDROID) + params.argc = options.argc; + params.argv = options.argv; +#endif + + auto browser = std::make_unique<HeadlessBrowserImpl>( + std::move(on_browser_start_callback), std::move(options)); + HeadlessContentMainDelegate delegate(std::move(browser)); + params.delegate = &delegate; + return content::ContentMain(std::move(params)); +} + +#if BUILDFLAG(IS_WIN) +void RunChildProcessIfNeeded(HINSTANCE instance, + sandbox::SandboxInterfaceInfo* sandbox_info) { + base::CommandLine::Init(0, nullptr); + HeadlessBrowser::Options::Builder builder(0, nullptr); + builder.SetInstance(instance); + builder.SetSandboxInfo(std::move(sandbox_info)); +#else +void RunChildProcessIfNeeded(int argc, const char** argv) { + base::CommandLine::Init(argc, argv); + HeadlessBrowser::Options::Builder builder(argc, argv); +#endif // BUILDFLAG(IS_WIN) + const base::CommandLine& command_line( + *base::CommandLine::ForCurrentProcess()); + + if (!command_line.HasSwitch(::switches::kProcessType)) + return; + + int rc = RunContentMain(builder.Build(), + base::OnceCallback<void(HeadlessBrowser*)>()); + + // Note that exiting from here means that base::AtExitManager objects will not + // have a chance to be destroyed (typically in main/WinMain). + // Use TerminateCurrentProcessImmediately instead of exit to avoid shutdown + // crashes and slowdowns on shutdown. + base::Process::TerminateCurrentProcessImmediately(rc); +} + +int HeadlessBrowserMain(HeadlessBrowser::Options options) { +#if DCHECK_IS_ON() + // The browser can only be initialized once. + static bool browser_was_initialized; + DCHECK(!browser_was_initialized); + browser_was_initialized = true; + + // Child processes should not end up here. + DCHECK(!base::CommandLine::ForCurrentProcess()->HasSwitch( + ::switches::kProcessType)); +#endif + HeadlessShell shell; + + return RunContentMain( + std::move(options), + base::BindOnce(&HeadlessShell::OnBrowserStart, base::Unretained(&shell))); +} + +} // namespace + +// An entry point for chrome. +int HeadlessShellMain(const content::ContentMainParams& params) { +#if BUILDFLAG(IS_WIN) + return HeadlessShellMain(params.instance, params.sandbox_info); +#else + return HeadlessShellMain(params.argc, params.argv); +#endif +} + #if BUILDFLAG(IS_WIN) int HeadlessShellMain(HINSTANCE instance, sandbox::SandboxInterfaceInfo* sandbox_info) { @@ -212,90 +305,7 @@ return EXIT_FAILURE; } - HeadlessShell shell; - - return HeadlessBrowserMain( - builder.Build(), - base::BindOnce(&HeadlessShell::OnBrowserStart, base::Unretained(&shell))); -} - -int HeadlessShellMain(const content::ContentMainParams& params) { -#if BUILDFLAG(IS_WIN) - return HeadlessShellMain(params.instance, params.sandbox_info); -#else - return HeadlessShellMain(params.argc, params.argv); -#endif -} - -namespace { - -int RunContentMain( - HeadlessBrowser::Options options, - base::OnceCallback<void(HeadlessBrowser*)> on_browser_start_callback) { - content::ContentMainParams params(nullptr); -#if BUILDFLAG(IS_WIN) - // Sandbox info has to be set and initialized. - CHECK(options.sandbox_info); - params.instance = options.instance; - params.sandbox_info = std::move(options.sandbox_info); -#elif !BUILDFLAG(IS_ANDROID) - params.argc = options.argc; - params.argv = options.argv; -#endif - - auto browser = std::make_unique<HeadlessBrowserImpl>( - std::move(on_browser_start_callback), std::move(options)); - HeadlessContentMainDelegate delegate(std::move(browser)); - params.delegate = &delegate; - return content::ContentMain(std::move(params)); -} - -} // namespace - -#if BUILDFLAG(IS_WIN) -void RunChildProcessIfNeeded(HINSTANCE instance, - sandbox::SandboxInterfaceInfo* sandbox_info) { - base::CommandLine::Init(0, nullptr); - HeadlessBrowser::Options::Builder builder(0, nullptr); - builder.SetInstance(instance); - builder.SetSandboxInfo(std::move(sandbox_info)); -#else -void RunChildProcessIfNeeded(int argc, const char** argv) { - base::CommandLine::Init(argc, argv); - HeadlessBrowser::Options::Builder builder(argc, argv); -#endif // BUILDFLAG(IS_WIN) - const base::CommandLine& command_line( - *base::CommandLine::ForCurrentProcess()); - - if (!command_line.HasSwitch(::switches::kProcessType)) - return; - - int rc = RunContentMain(builder.Build(), - base::OnceCallback<void(HeadlessBrowser*)>()); - - // Note that exiting from here means that base::AtExitManager objects will not - // have a chance to be destroyed (typically in main/WinMain). - // Use TerminateCurrentProcessImmediately instead of exit to avoid shutdown - // crashes and slowdowns on shutdown. - base::Process::TerminateCurrentProcessImmediately(rc); -} - -int HeadlessBrowserMain( - HeadlessBrowser::Options options, - base::OnceCallback<void(HeadlessBrowser*)> on_browser_start_callback) { - DCHECK(!on_browser_start_callback.is_null()); -#if DCHECK_IS_ON() - // The browser can only be initialized once. - static bool browser_was_initialized; - DCHECK(!browser_was_initialized); - browser_was_initialized = true; - - // Child processes should not end up here. - DCHECK(!base::CommandLine::ForCurrentProcess()->HasSwitch( - ::switches::kProcessType)); -#endif - return RunContentMain(std::move(options), - std::move(on_browser_start_callback)); + return HeadlessBrowserMain(builder.Build()); } } // namespace headless
diff --git a/headless/app/headless_shell.h b/headless/app/headless_shell.h deleted file mode 100644 index cadd9f75..0000000 --- a/headless/app/headless_shell.h +++ /dev/null
@@ -1,40 +0,0 @@ -// Copyright 2017 The Chromium Authors -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef HEADLESS_APP_HEADLESS_SHELL_H_ -#define HEADLESS_APP_HEADLESS_SHELL_H_ - -#include "base/memory/raw_ptr.h" -#include "base/memory/weak_ptr.h" - -namespace headless { - -class HeadlessBrowser; -class HeadlessBrowserContext; - -// An application which implements a simple headless browser. -class HeadlessShell { - public: - HeadlessShell(); - - HeadlessShell(const HeadlessShell&) = delete; - HeadlessShell& operator=(const HeadlessShell&) = delete; - - ~HeadlessShell(); - - void OnBrowserStart(HeadlessBrowser* browser); - - private: - void ShutdownSoon(); - void Shutdown(); - - raw_ptr<HeadlessBrowser> browser_ = nullptr; // Not owned. - raw_ptr<HeadlessBrowserContext> browser_context_ = nullptr; - - base::WeakPtrFactory<HeadlessShell> weak_factory_{this}; -}; - -} // namespace headless - -#endif // HEADLESS_APP_HEADLESS_SHELL_H_
diff --git a/headless/app/headless_shell_command_line.cc b/headless/app/headless_shell_command_line.cc index 72f7f85..751941f 100644 --- a/headless/app/headless_shell_command_line.cc +++ b/headless/app/headless_shell_command_line.cc
@@ -47,7 +47,7 @@ bool HandleRemoteDebuggingPort(base::CommandLine& command_line, HeadlessBrowser::Options::Builder& builder) { - DCHECK(command_line.HasSwitch(switches::kRemoteDebuggingPort)); + DCHECK(command_line.HasSwitch(::switches::kRemoteDebuggingPort)); net::IPAddress address; std::string address_str = kLocalHost; @@ -199,8 +199,8 @@ bool IsRemoteDebuggingEnabled() { const base::CommandLine& command_line = *base::CommandLine::ForCurrentProcess(); - return command_line.HasSwitch(switches::kRemoteDebuggingPort) || - command_line.HasSwitch(switches::kRemoteDebuggingPipe); + return command_line.HasSwitch(::switches::kRemoteDebuggingPort) || + command_line.HasSwitch(::switches::kRemoteDebuggingPipe); } } // namespace headless
diff --git a/headless/app/headless_shell_switches.h b/headless/app/headless_shell_switches.h index 46587c51..f848da5 100644 --- a/headless/app/headless_shell_switches.h +++ b/headless/app/headless_shell_switches.h
@@ -5,7 +5,6 @@ #ifndef HEADLESS_APP_HEADLESS_SHELL_SWITCHES_H_ #define HEADLESS_APP_HEADLESS_SHELL_SWITCHES_H_ -#include "content/public/common/content_switches.h" #include "headless/public/headless_export.h" namespace headless { @@ -33,10 +32,6 @@ HEADLESS_EXPORT extern const char kBlockNewWebContents[]; HEADLESS_EXPORT extern const char kExplicitlyAllowedPorts[]; -// Switches which are replicated from content. -using ::switches::kRemoteDebuggingPort; -using ::switches::kRemoteDebuggingPipe; - } // namespace switches } // namespace headless
diff --git a/headless/public/headless_browser.h b/headless/public/headless_browser.h index 713b61c5..cb66a076 100644 --- a/headless/public/headless_browser.h +++ b/headless/public/headless_browser.h
@@ -10,9 +10,7 @@ #include <unordered_set> #include <vector> -#include "base/command_line.h" #include "base/files/file_path.h" -#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "build/build_config.h" #include "headless/public/headless_browser_context.h" @@ -216,47 +214,6 @@ Options options_; }; -#if !BUILDFLAG(IS_WIN) -// The headless browser may need to create child processes (e.g., a renderer -// which runs web content). This is done by re-executing the parent process as -// a zygote[1] and forking each child process from that zygote. -// -// For this to work, the embedder should call RunChildProcess as soon as -// possible (i.e., before creating any threads) to pass control to the headless -// library. In a browser process this function will return immediately, but in a -// child process it will never return. For example: -// -// int main(int argc, const char** argv) { -// headless::RunChildProcessIfNeeded(argc, argv); -// headless::HeadlessBrowser::Options::Builder builder(argc, argv); -// return headless::HeadlessBrowserMain( -// builder.Build(), -// base::OnceCallback<void(headless::HeadlessBrowser*)>()); -// } -// -// [1] -// https://chromium.googlesource.com/chromium/src/+/main/docs/linux/zygote.md -void RunChildProcessIfNeeded(int argc, const char** argv); -#else -// In Windows, the headless browser may need to create child processes. This is -// done by re-executing the parent process which may have been initialized with -// different libraries (e.g. child_dll). In this case, the embedder has to pass -// the appropiate HINSTANCE and initalization sandbox_info to properly launch -// the child process. -void RunChildProcessIfNeeded(HINSTANCE instance, - sandbox::SandboxInterfaceInfo* sandbox_info); -#endif // !BUILDFLAG(IS_WIN) - -// Main entry point for running the headless browser. This function constructs -// the headless browser instance, passing it to the given -// |on_browser_start_callback| callback. Note that since this function executes -// the main loop, it will only return after HeadlessBrowser::Shutdown() is -// called, returning the exit code for the process. It is not possible to -// initialize the browser again after it has been torn down. -int HeadlessBrowserMain( - HeadlessBrowser::Options options, - base::OnceCallback<void(HeadlessBrowser*)> on_browser_start_callback); - } // namespace headless #endif // HEADLESS_PUBLIC_HEADLESS_BROWSER_H_
diff --git a/headless/test/headless_protocol_browsertest.cc b/headless/test/headless_protocol_browsertest.cc index f528bb0..9ce1277 100644 --- a/headless/test/headless_protocol_browsertest.cc +++ b/headless/test/headless_protocol_browsertest.cc
@@ -13,6 +13,7 @@ #include "base/memory/scoped_refptr.h" #include "base/path_service.h" #include "build/build_config.h" +#include "content/public/common/content_switches.h" #include "headless/app/headless_shell_switches.h" #include "headless/lib/browser/headless_web_contents_impl.h" #include "headless/test/headless_browser_test_utils.h"
diff --git a/ios/chrome/browser/passwords/ios_chrome_account_password_store_factory.mm b/ios/chrome/browser/passwords/ios_chrome_account_password_store_factory.mm index e5b4e25d..e9a208f 100644 --- a/ios/chrome/browser/passwords/ios_chrome_account_password_store_factory.mm +++ b/ios/chrome/browser/passwords/ios_chrome_account_password_store_factory.mm
@@ -12,6 +12,7 @@ #import "base/no_destructor.h" #import "components/keyed_service/core/service_access_type.h" #import "components/keyed_service/ios/browser_state_dependency_manager.h" +#import "components/password_manager/core/browser/affiliation/affiliations_prefetcher.h" #import "components/password_manager/core/browser/login_database.h" #import "components/password_manager/core/browser/password_manager_util.h" #import "components/password_manager/core/browser/password_store_built_in_backend.h" @@ -20,11 +21,16 @@ #import "ios/chrome/browser/browser_state/browser_state_otr_helper.h" #import "ios/chrome/browser/browser_state/chrome_browser_state.h" #import "ios/chrome/browser/passwords/credentials_cleaner_runner_factory.h" +#import "ios/chrome/browser/passwords/ios_chrome_affiliation_service_factory.h" +#import "ios/chrome/browser/passwords/ios_chrome_affiliations_prefetcher_factory.h" #if !defined(__has_feature) || !__has_feature(objc_arc) #error "This file requires ARC support." #endif +using password_manager::AffiliatedMatchHelper; +using password_manager::AffiliationService; + // static scoped_refptr<password_manager::PasswordStoreInterface> IOSChromeAccountPasswordStoreFactory::GetForBrowserState( @@ -79,14 +85,21 @@ std::make_unique<password_manager::PasswordStoreBuiltInBackend>( std::move(login_db))); - // TODO(crbug.com/1100818): Pass the affiliated_match_helper. + AffiliationService* affiliation_service = + IOSChromeAffiliationServiceFactory::GetForBrowserState(context); + std::unique_ptr<AffiliatedMatchHelper> affiliated_match_helper = + std::make_unique<AffiliatedMatchHelper>(affiliation_service); + password_store->Init(browser_state->GetPrefs(), - /*affiliated_match_helper=*/nullptr); + std::move(affiliated_match_helper)); password_manager_util::RemoveUselessCredentials( CredentialsCleanerRunnerFactory::GetForBrowserState(browser_state), password_store, browser_state->GetPrefs(), base::Minutes(1), base::NullCallback()); + + IOSChromeAffiliationsPrefetcherFactory::GetForBrowserState(context) + ->RegisterPasswordStore(password_store.get()); return password_store; }
diff --git a/ios/chrome/browser/prefs/BUILD.gn b/ios/chrome/browser/prefs/BUILD.gn index 5175252..47d8873 100644 --- a/ios/chrome/browser/prefs/BUILD.gn +++ b/ios/chrome/browser/prefs/BUILD.gn
@@ -97,10 +97,10 @@ "//ios/chrome/browser/ui/authentication", "//ios/chrome/browser/ui/authentication/signin", "//ios/chrome/browser/ui/bookmarks:constants", + "//ios/chrome/browser/ui/bookmarks:core", "//ios/chrome/browser/ui/content_suggestions", "//ios/chrome/browser/ui/first_run:field_trial", "//ios/chrome/browser/ui/incognito_reauth:incognito_reauth_scene_agent", - "//ios/chrome/browser/ui/legacy_bookmarks:core", "//ios/chrome/browser/ui/ntp:field_trial", "//ios/chrome/browser/ui/reading_list:reading_list_constants", "//ios/chrome/browser/voice:prefs",
diff --git a/ios/chrome/browser/prefs/browser_prefs.mm b/ios/chrome/browser/prefs/browser_prefs.mm index 1074117..bad0a781 100644 --- a/ios/chrome/browser/prefs/browser_prefs.mm +++ b/ios/chrome/browser/prefs/browser_prefs.mm
@@ -67,13 +67,13 @@ #import "ios/chrome/browser/push_notification/push_notification_service.h" #import "ios/chrome/browser/ui/authentication/signin/signin_coordinator.h" #import "ios/chrome/browser/ui/authentication/signin_promo_view_mediator.h" +#import "ios/chrome/browser/ui/bookmarks/bookmark_mediator.h" +#import "ios/chrome/browser/ui/bookmarks/bookmark_path_cache.h" +#import "ios/chrome/browser/ui/bookmarks/bookmark_utils_ios.h" #import "ios/chrome/browser/ui/content_suggestions/content_suggestions_mediator.h" #import "ios/chrome/browser/ui/first_run/fre_field_trial.h" #import "ios/chrome/browser/ui/first_run/trending_queries_field_trial.h" #import "ios/chrome/browser/ui/incognito_reauth/incognito_reauth_scene_agent.h" -#import "ios/chrome/browser/ui/legacy_bookmarks/legacy_bookmark_mediator.h" -#import "ios/chrome/browser/ui/legacy_bookmarks/legacy_bookmark_path_cache.h" -#import "ios/chrome/browser/ui/legacy_bookmarks/legacy_bookmark_utils_ios.h" #import "ios/chrome/browser/ui/ntp/ios_popular_sites_field_trial.h" #import "ios/chrome/browser/ui/ui_feature_flags.h" #import "ios/chrome/browser/voice/voice_search_prefs_registration.h"
diff --git a/ios/chrome/browser/ui/bookmarks/BUILD.gn b/ios/chrome/browser/ui/bookmarks/BUILD.gn index 898b6bb..9eb8cd89 100644 --- a/ios/chrome/browser/ui/bookmarks/BUILD.gn +++ b/ios/chrome/browser/ui/bookmarks/BUILD.gn
@@ -2,6 +2,176 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. +source_set("bookmarks") { + configs += [ "//build/config/compiler:enable_arc" ] + sources = [ + "bookmark_home_consumer.h", + "bookmark_home_mediator.h", + "bookmark_home_mediator.mm", + "bookmark_home_shared_state.h", + "bookmark_home_shared_state.mm", + "bookmark_home_view_controller.h", + "bookmark_home_view_controller.mm", + "bookmark_interaction_controller.h", + "bookmark_interaction_controller.mm", + "bookmark_interaction_controller_delegate.h", + "bookmark_navigation_controller.h", + "bookmark_navigation_controller.mm", + "bookmark_navigation_controller_delegate.h", + "bookmark_navigation_controller_delegate.mm", + "bookmark_promo_controller.h", + "bookmark_promo_controller.mm", + "bookmark_transitioning_delegate.h", + "bookmark_transitioning_delegate.mm", + "synced_bookmarks_bridge.h", + "synced_bookmarks_bridge.mm", + ] + deps = [ + ":bookmarks_ui", + ":constants", + ":core", + "resources:bookmark_blue_check", + "resources:bookmark_blue_folder", + "resources:bookmark_blue_new_folder", + "resources:bookmark_empty", + "resources:bookmark_empty_star", + "//base", + "//components/bookmarks/browser", + "//components/bookmarks/common", + "//components/bookmarks/managed", + "//components/prefs", + "//components/prefs/ios", + "//components/signin/public/identity_manager", + "//components/signin/public/identity_manager/objc", + "//components/strings", + "//components/sync/driver", + "//ios/chrome/app:tests_hook", + "//ios/chrome/app/strings", + "//ios/chrome/browser/bookmarks", + "//ios/chrome/browser/browser_state", + "//ios/chrome/browser/drag_and_drop", + "//ios/chrome/browser/favicon", + "//ios/chrome/browser/main:public", + "//ios/chrome/browser/metrics:metrics_internal", + "//ios/chrome/browser/policy:policy_util", + "//ios/chrome/browser/signin", + "//ios/chrome/browser/sync", + "//ios/chrome/browser/tabs", + "//ios/chrome/browser/ui:feature_flags", + "//ios/chrome/browser/ui/alert_coordinator", + "//ios/chrome/browser/ui/authentication", + "//ios/chrome/browser/ui/authentication:signin_presenter", + "//ios/chrome/browser/ui/authentication/cells", + "//ios/chrome/browser/ui/authentication/enterprise:enterprise_utils", + "//ios/chrome/browser/ui/bookmarks/cells", + "//ios/chrome/browser/ui/commands", + "//ios/chrome/browser/ui/default_promo:utils", + "//ios/chrome/browser/ui/elements", + "//ios/chrome/browser/ui/incognito_reauth:incognito_reauth_scene_agent", + "//ios/chrome/browser/ui/keyboard", + "//ios/chrome/browser/ui/list_model", + "//ios/chrome/browser/ui/main:scene_state_header", + "//ios/chrome/browser/ui/menu", + "//ios/chrome/browser/ui/sharing", + "//ios/chrome/browser/ui/sharing/activity_services", + "//ios/chrome/browser/ui/table_view", + "//ios/chrome/browser/ui/table_view:presentation", + "//ios/chrome/browser/ui/table_view:styler", + "//ios/chrome/browser/ui/table_view:utils", + "//ios/chrome/browser/ui/table_view:views", + "//ios/chrome/browser/ui/util:url_with_title", + "//ios/chrome/browser/url_loading", + "//ios/chrome/browser/web_state_list", + "//ios/chrome/browser/window_activities", + "//ios/chrome/common/ui/colors", + "//ios/chrome/common/ui/favicon:favicon", + "//ios/chrome/common/ui/favicon:favicon_constants", + "//ios/chrome/common/ui/util", + "//ios/third_party/material_components_ios", + "//ui/base", + ] + frameworks = [ "UIKit.framework" ] +} + +source_set("core") { + configs += [ "//build/config/compiler:enable_arc" ] + sources = [ + "bookmark_mediator.h", + "bookmark_mediator.mm", + "bookmark_path_cache.h", + "bookmark_path_cache.mm", + "bookmark_utils_ios.h", + "bookmark_utils_ios.mm", + "undo_manager_bridge_observer.h", + "undo_manager_bridge_observer.mm", + "undo_manager_wrapper.h", + "undo_manager_wrapper.mm", + ] + deps = [ + "//components/bookmarks/browser", + "//components/pref_registry", + "//components/prefs", + "//components/query_parser", + "//components/strings", + "//components/undo", + "//ios/chrome/app/strings", + "//ios/chrome/browser/bookmarks", + "//ios/chrome/browser/browser_state", + "//ios/chrome/browser/flags:system_flags", + "//ios/chrome/browser/main:public", + "//ios/chrome/browser/prefs:pref_names", + "//ios/chrome/browser/ui/default_promo:utils", + "//ios/chrome/browser/ui/util", + "//ios/chrome/browser/ui/util:url_with_title", + "//ios/chrome/browser/undo", + "//ios/chrome/common/ui/colors", + "//ios/third_party/material_components_ios", + "//ui/base", + ] + frameworks = [ "UIKit.framework" ] +} + +source_set("bookmarks_ui") { + configs += [ "//build/config/compiler:enable_arc" ] + sources = [ + "bookmark_edit_view_controller.h", + "bookmark_edit_view_controller.mm", + "bookmark_folder_editor_view_controller.h", + "bookmark_folder_editor_view_controller.mm", + "bookmark_folder_view_controller.h", + "bookmark_folder_view_controller.mm", + ] + deps = [ + ":constants", + ":core", + "//base", + "//base:i18n", + "//components/bookmarks/browser", + "//components/strings", + "//components/url_formatter", + "//ios/chrome/app/strings", + "//ios/chrome/browser/bookmarks", + "//ios/chrome/browser/browser_state", + "//ios/chrome/browser/flags:system_flags", + "//ios/chrome/browser/main:public", + "//ios/chrome/browser/ui/alert_coordinator", + "//ios/chrome/browser/ui/bookmarks/cells", + "//ios/chrome/browser/ui/commands", + "//ios/chrome/browser/ui/icons", + "//ios/chrome/browser/ui/image_util", + "//ios/chrome/browser/ui/keyboard", + "//ios/chrome/browser/ui/table_view", + "//ios/chrome/browser/ui/table_view:presentation", + "//ios/chrome/browser/ui/table_view:styler", + "//ios/chrome/browser/ui/table_view:utils", + "//ios/chrome/browser/ui/table_view:views", + "//ios/chrome/common/ui/util", + "//ui/base", + ] + allow_circular_includes_from = [ "//ios/chrome/browser/ui/bookmarks/cells" ] + frameworks = [ "UIKit.framework" ] +} + source_set("constants") { configs += [ "//build/config/compiler:enable_arc" ] sources = [ @@ -11,6 +181,40 @@ deps = [] } +source_set("unit_tests") { + configs += [ "//build/config/compiler:enable_arc" ] + testonly = true + sources = [ + "bookmark_edit_view_controller_unittest.mm", + "bookmark_home_view_controller_unittest.mm", + "bookmark_path_cache_unittest.mm", + "bookmark_utils_ios_unittest.mm", + ] + deps = [ + ":bookmarks", + ":bookmarks_ui", + ":constants", + ":core", + "//base", + "//base/test:test_support", + "//components/bookmarks/browser", + "//components/bookmarks/test", + "//components/sync_preferences:test_support", + "//ios/chrome/browser/bookmarks", + "//ios/chrome/browser/bookmarks:test_support", + "//ios/chrome/browser/bookmarks:test_support", + "//ios/chrome/browser/browser_state:test_support", + "//ios/chrome/browser/flags:system_flags", + "//ios/chrome/browser/main:public", + "//ios/chrome/browser/main:test_support", + "//ios/chrome/browser/ui/commands", + "//ios/chrome/test:test_support", + "//ios/web/public/test", + "//testing/gtest", + "//third_party/ocmock:ocmock", + ] +} + source_set("eg2_tests") { configs += [ "//build/config/compiler:enable_arc", @@ -62,7 +266,9 @@ "bookmark_earl_grey_app_interface.mm", ] deps = [ + ":bookmarks", ":constants", + ":core", "//base", "//base/test:test_support", "//components/bookmarks/browser", @@ -73,8 +279,6 @@ "//ios/chrome/browser/browser_state", "//ios/chrome/browser/prefs:pref_names", "//ios/chrome/browser/signin:fake_system_identity", - "//ios/chrome/browser/ui/legacy_bookmarks", - "//ios/chrome/browser/ui/legacy_bookmarks:core", "//ios/chrome/browser/ui/popup_menu:constants", "//ios/chrome/test/app:test_support", "//ios/testing:nserror_support",
diff --git a/ios/chrome/browser/ui/bookmarks/bookmark_earl_grey_app_interface.mm b/ios/chrome/browser/ui/bookmarks/bookmark_earl_grey_app_interface.mm index 17db912b..f4a1dd2 100644 --- a/ios/chrome/browser/ui/bookmarks/bookmark_earl_grey_app_interface.mm +++ b/ios/chrome/browser/ui/bookmarks/bookmark_earl_grey_app_interface.mm
@@ -15,8 +15,8 @@ #import "ios/chrome/browser/browser_state/chrome_browser_state.h" #import "ios/chrome/browser/prefs/pref_names.h" #import "ios/chrome/browser/signin/fake_system_identity.h" -#import "ios/chrome/browser/ui/legacy_bookmarks/legacy_bookmark_path_cache.h" -#import "ios/chrome/browser/ui/legacy_bookmarks/legacy_bookmark_utils_ios.h" +#import "ios/chrome/browser/ui/bookmarks/bookmark_path_cache.h" +#import "ios/chrome/browser/ui/bookmarks/bookmark_utils_ios.h" #import "ios/chrome/test/app/chrome_test_util.h" #import "ios/testing/nserror_util.h" #import "ui/base/models/tree_node_iterator.h"
diff --git a/ios/chrome/browser/ui/legacy_bookmarks/legacy_bookmark_edit_view_controller.h b/ios/chrome/browser/ui/bookmarks/bookmark_edit_view_controller.h similarity index 89% rename from ios/chrome/browser/ui/legacy_bookmarks/legacy_bookmark_edit_view_controller.h rename to ios/chrome/browser/ui/bookmarks/bookmark_edit_view_controller.h index a9028ab8..5054d77 100644 --- a/ios/chrome/browser/ui/legacy_bookmarks/legacy_bookmark_edit_view_controller.h +++ b/ios/chrome/browser/ui/bookmarks/bookmark_edit_view_controller.h
@@ -1,8 +1,8 @@ // Copyright 2014 The Chromium Authors // 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_LEGACY_BOOKMARKS_LEGACY_BOOKMARK_EDIT_VIEW_CONTROLLER_H_ -#define IOS_CHROME_BROWSER_UI_LEGACY_BOOKMARKS_LEGACY_BOOKMARK_EDIT_VIEW_CONTROLLER_H_ +#ifndef IOS_CHROME_BROWSER_UI_BOOKMARKS_BOOKMARK_EDIT_VIEW_CONTROLLER_H_ +#define IOS_CHROME_BROWSER_UI_BOOKMARKS_BOOKMARK_EDIT_VIEW_CONTROLLER_H_ #import <UIKit/UIKit.h> @@ -65,4 +65,4 @@ @end -#endif // IOS_CHROME_BROWSER_UI_LEGACY_BOOKMARKS_LEGACY_BOOKMARK_EDIT_VIEW_CONTROLLER_H_ +#endif // IOS_CHROME_BROWSER_UI_BOOKMARKS_BOOKMARK_EDIT_VIEW_CONTROLLER_H_
diff --git a/ios/chrome/browser/ui/legacy_bookmarks/legacy_bookmark_edit_view_controller.mm b/ios/chrome/browser/ui/bookmarks/bookmark_edit_view_controller.mm similarity index 98% rename from ios/chrome/browser/ui/legacy_bookmarks/legacy_bookmark_edit_view_controller.mm rename to ios/chrome/browser/ui/bookmarks/bookmark_edit_view_controller.mm index e453907..57cba94 100644 --- a/ios/chrome/browser/ui/legacy_bookmarks/legacy_bookmark_edit_view_controller.mm +++ b/ios/chrome/browser/ui/bookmarks/bookmark_edit_view_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/legacy_bookmarks/legacy_bookmark_edit_view_controller.h" +#import "ios/chrome/browser/ui/bookmarks/bookmark_edit_view_controller.h" #import <memory> #import <set> @@ -23,16 +23,16 @@ #import "ios/chrome/browser/flags/system_flags.h" #import "ios/chrome/browser/main/browser.h" #import "ios/chrome/browser/ui/alert_coordinator/action_sheet_coordinator.h" +#import "ios/chrome/browser/ui/bookmarks/bookmark_folder_view_controller.h" +#import "ios/chrome/browser/ui/bookmarks/bookmark_mediator.h" #import "ios/chrome/browser/ui/bookmarks/bookmark_ui_constants.h" +#import "ios/chrome/browser/ui/bookmarks/bookmark_utils_ios.h" #import "ios/chrome/browser/ui/bookmarks/cells/bookmark_parent_folder_item.h" #import "ios/chrome/browser/ui/bookmarks/cells/bookmark_text_field_item.h" #import "ios/chrome/browser/ui/commands/snackbar_commands.h" #import "ios/chrome/browser/ui/icons/chrome_icon.h" #import "ios/chrome/browser/ui/image_util/image_util.h" #import "ios/chrome/browser/ui/keyboard/UIKeyCommand+Chrome.h" -#import "ios/chrome/browser/ui/legacy_bookmarks/legacy_bookmark_folder_view_controller.h" -#import "ios/chrome/browser/ui/legacy_bookmarks/legacy_bookmark_mediator.h" -#import "ios/chrome/browser/ui/legacy_bookmarks/legacy_bookmark_utils_ios.h" #import "ios/chrome/browser/ui/table_view/cells/table_view_text_header_footer_item.h" #import "ios/chrome/browser/ui/table_view/chrome_table_view_styler.h" #import "ios/chrome/browser/ui/table_view/table_view_utils.h"
diff --git a/ios/chrome/browser/ui/legacy_bookmarks/legacy_bookmark_edit_view_controller_unittest.mm b/ios/chrome/browser/ui/bookmarks/bookmark_edit_view_controller_unittest.mm similarity index 95% rename from ios/chrome/browser/ui/legacy_bookmarks/legacy_bookmark_edit_view_controller_unittest.mm rename to ios/chrome/browser/ui/bookmarks/bookmark_edit_view_controller_unittest.mm index 381eeee..7ddb13f 100644 --- a/ios/chrome/browser/ui/legacy_bookmarks/legacy_bookmark_edit_view_controller_unittest.mm +++ b/ios/chrome/browser/ui/bookmarks/bookmark_edit_view_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/legacy_bookmarks/legacy_bookmark_edit_view_controller.h" +#import "ios/chrome/browser/ui/bookmarks/bookmark_edit_view_controller.h" #if !defined(__has_feature) || !__has_feature(objc_arc) #error "This file requires ARC support."
diff --git a/ios/chrome/browser/ui/legacy_bookmarks/legacy_bookmark_folder_editor_view_controller.h b/ios/chrome/browser/ui/bookmarks/bookmark_folder_editor_view_controller.h similarity index 73% rename from ios/chrome/browser/ui/legacy_bookmarks/legacy_bookmark_folder_editor_view_controller.h rename to ios/chrome/browser/ui/bookmarks/bookmark_folder_editor_view_controller.h index c306a59..67fbc86 100644 --- a/ios/chrome/browser/ui/legacy_bookmarks/legacy_bookmark_folder_editor_view_controller.h +++ b/ios/chrome/browser/ui/bookmarks/bookmark_folder_editor_view_controller.h
@@ -1,14 +1,14 @@ // Copyright 2014 The Chromium Authors // 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_LEGACY_BOOKMARKS_LEGACY_BOOKMARK_FOLDER_EDITOR_VIEW_CONTROLLER_H_ -#define IOS_CHROME_BROWSER_UI_LEGACY_BOOKMARKS_LEGACY_BOOKMARK_FOLDER_EDITOR_VIEW_CONTROLLER_H_ +#ifndef IOS_CHROME_BROWSER_UI_BOOKMARKS_BOOKMARK_FOLDER_EDITOR_VIEW_CONTROLLER_H_ +#define IOS_CHROME_BROWSER_UI_BOOKMARKS_BOOKMARK_FOLDER_EDITOR_VIEW_CONTROLLER_H_ #import <UIKit/UIKit.h> #import "ios/chrome/browser/ui/table_view/chrome_table_view_controller.h" -@class LegacyBookmarkFolderEditorViewController; +@class BookmarkFolderEditorViewController; class Browser; @protocol SnackbarCommands; @@ -17,32 +17,31 @@ class BookmarkNode; } // namespace bookmarks -@protocol LegacyBookmarkFolderEditorViewControllerDelegate +@protocol BookmarkFolderEditorViewControllerDelegate // Called when the controller successfully created or edited `folder`. -- (void)bookmarkFolderEditor: - (LegacyBookmarkFolderEditorViewController*)folderEditor +- (void)bookmarkFolderEditor:(BookmarkFolderEditorViewController*)folderEditor didFinishEditingFolder:(const bookmarks::BookmarkNode*)folder; // Called when the user deletes the edited folder. // This is never called if the editor is created with // `folderCreatorWithBookmarkModel:parentFolder:`. - (void)bookmarkFolderEditorDidDeleteEditedFolder: - (LegacyBookmarkFolderEditorViewController*)folderEditor; + (BookmarkFolderEditorViewController*)folderEditor; // Called when the user cancels the folder creation. - (void)bookmarkFolderEditorDidCancel: - (LegacyBookmarkFolderEditorViewController*)folderEditor; + (BookmarkFolderEditorViewController*)folderEditor; // Called when the controller is going to commit the title change. - (void)bookmarkFolderEditorWillCommitTitleChange: - (LegacyBookmarkFolderEditorViewController*)folderEditor; + (BookmarkFolderEditorViewController*)folderEditor; @end // View controller for creating or editing a bookmark folder. Allows editing of // the title and selecting the parent folder of the bookmark. // This controller monitors the state of the bookmark model, so changes to the // bookmark model can affect this controller's state. -@interface LegacyBookmarkFolderEditorViewController +@interface BookmarkFolderEditorViewController : ChromeTableViewController <UIAdaptivePresentationControllerDelegate> -@property(nonatomic, weak) id<LegacyBookmarkFolderEditorViewControllerDelegate> +@property(nonatomic, weak) id<BookmarkFolderEditorViewControllerDelegate> delegate; // Snackbar commands handler for this ViewController. @@ -70,4 +69,4 @@ @end -#endif // IOS_CHROME_BROWSER_UI_LEGACY_BOOKMARKS_LEGACY_BOOKMARK_FOLDER_EDITOR_VIEW_CONTROLLER_H_ +#endif // IOS_CHROME_BROWSER_UI_BOOKMARKS_BOOKMARK_FOLDER_EDITOR_VIEW_CONTROLLER_H_
diff --git a/ios/chrome/browser/ui/legacy_bookmarks/legacy_bookmark_folder_editor_view_controller.mm b/ios/chrome/browser/ui/bookmarks/bookmark_folder_editor_view_controller.mm similarity index 97% rename from ios/chrome/browser/ui/legacy_bookmarks/legacy_bookmark_folder_editor_view_controller.mm rename to ios/chrome/browser/ui/bookmarks/bookmark_folder_editor_view_controller.mm index bbe083f..ffa2ba7 100644 --- a/ios/chrome/browser/ui/legacy_bookmarks/legacy_bookmark_folder_editor_view_controller.mm +++ b/ios/chrome/browser/ui/bookmarks/bookmark_folder_editor_view_controller.mm
@@ -1,7 +1,7 @@ // Copyright 2014 The Chromium Authors // 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/legacy_bookmarks/legacy_bookmark_folder_editor_view_controller.h" +#import "ios/chrome/browser/ui/bookmarks/bookmark_folder_editor_view_controller.h" #import <memory> #import <set> @@ -20,13 +20,13 @@ #import "ios/chrome/browser/browser_state/chrome_browser_state.h" #import "ios/chrome/browser/main/browser.h" #import "ios/chrome/browser/ui/alert_coordinator/action_sheet_coordinator.h" +#import "ios/chrome/browser/ui/bookmarks/bookmark_folder_view_controller.h" #import "ios/chrome/browser/ui/bookmarks/bookmark_ui_constants.h" +#import "ios/chrome/browser/ui/bookmarks/bookmark_utils_ios.h" #import "ios/chrome/browser/ui/bookmarks/cells/bookmark_parent_folder_item.h" #import "ios/chrome/browser/ui/bookmarks/cells/bookmark_text_field_item.h" #import "ios/chrome/browser/ui/commands/snackbar_commands.h" #import "ios/chrome/browser/ui/icons/chrome_icon.h" -#import "ios/chrome/browser/ui/legacy_bookmarks/legacy_bookmark_folder_view_controller.h" -#import "ios/chrome/browser/ui/legacy_bookmarks/legacy_bookmark_utils_ios.h" #import "ios/chrome/browser/ui/table_view/chrome_table_view_styler.h" #import "ios/chrome/browser/ui/table_view/table_view_utils.h" #import "ios/chrome/browser/ui/util/rtl_geometry.h" @@ -54,7 +54,7 @@ } // namespace -@interface LegacyBookmarkFolderEditorViewController () < +@interface BookmarkFolderEditorViewController () < BookmarkFolderViewControllerDelegate, BookmarkModelBridgeObserver, BookmarkTextFieldItemDelegate> { @@ -93,7 +93,7 @@ @end -@implementation LegacyBookmarkFolderEditorViewController +@implementation BookmarkFolderEditorViewController @synthesize bookmarkModel = _bookmarkModel; @synthesize delegate = _delegate; @@ -114,7 +114,7 @@ parentFolder:(const BookmarkNode*)parentFolder browser:(Browser*)browser { DCHECK(browser); - LegacyBookmarkFolderEditorViewController* folderCreator = + BookmarkFolderEditorViewController* folderCreator = [[self alloc] initWithBookmarkModel:bookmarkModel]; folderCreator.parentFolder = parentFolder; folderCreator.folder = NULL; @@ -130,7 +130,7 @@ DCHECK(folder); DCHECK(!bookmarkModel->is_permanent_node(folder)); DCHECK(browser); - LegacyBookmarkFolderEditorViewController* folderEditor = + BookmarkFolderEditorViewController* folderEditor = [[self alloc] initWithBookmarkModel:bookmarkModel]; folderEditor.parentFolder = folder->parent(); folderEditor.folder = folder;
diff --git a/ios/chrome/browser/ui/legacy_bookmarks/legacy_bookmark_folder_view_controller.h b/ios/chrome/browser/ui/bookmarks/bookmark_folder_view_controller.h similarity index 90% rename from ios/chrome/browser/ui/legacy_bookmarks/legacy_bookmark_folder_view_controller.h rename to ios/chrome/browser/ui/bookmarks/bookmark_folder_view_controller.h index e517b8c..251d3eb 100644 --- a/ios/chrome/browser/ui/legacy_bookmarks/legacy_bookmark_folder_view_controller.h +++ b/ios/chrome/browser/ui/bookmarks/bookmark_folder_view_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_LEGACY_BOOKMARKS_LEGACY_BOOKMARK_FOLDER_VIEW_CONTROLLER_H_ -#define IOS_CHROME_BROWSER_UI_LEGACY_BOOKMARKS_LEGACY_BOOKMARK_FOLDER_VIEW_CONTROLLER_H_ +#ifndef IOS_CHROME_BROWSER_UI_BOOKMARKS_BOOKMARK_FOLDER_VIEW_CONTROLLER_H_ +#define IOS_CHROME_BROWSER_UI_BOOKMARKS_BOOKMARK_FOLDER_VIEW_CONTROLLER_H_ #import <UIKit/UIKit.h> #include <set> @@ -69,4 +69,4 @@ @end -#endif // IOS_CHROME_BROWSER_UI_LEGACY_BOOKMARKS_LEGACY_BOOKMARK_FOLDER_VIEW_CONTROLLER_H_ +#endif // IOS_CHROME_BROWSER_UI_BOOKMARKS_BOOKMARK_FOLDER_VIEW_CONTROLLER_H_
diff --git a/ios/chrome/browser/ui/legacy_bookmarks/legacy_bookmark_folder_view_controller.mm b/ios/chrome/browser/ui/bookmarks/bookmark_folder_view_controller.mm similarity index 94% rename from ios/chrome/browser/ui/legacy_bookmarks/legacy_bookmark_folder_view_controller.mm rename to ios/chrome/browser/ui/bookmarks/bookmark_folder_view_controller.mm index ae57395..7e561f7a 100644 --- a/ios/chrome/browser/ui/legacy_bookmarks/legacy_bookmark_folder_view_controller.mm +++ b/ios/chrome/browser/ui/bookmarks/bookmark_folder_view_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/legacy_bookmarks/legacy_bookmark_folder_view_controller.h" +#import "ios/chrome/browser/ui/bookmarks/bookmark_folder_view_controller.h" #import <memory> #import <vector> @@ -12,12 +12,12 @@ #import "base/strings/sys_string_conversions.h" #import "components/bookmarks/browser/bookmark_model.h" #import "ios/chrome/browser/bookmarks/bookmark_model_bridge_observer.h" +#import "ios/chrome/browser/ui/bookmarks/bookmark_folder_editor_view_controller.h" #import "ios/chrome/browser/ui/bookmarks/bookmark_ui_constants.h" +#import "ios/chrome/browser/ui/bookmarks/bookmark_utils_ios.h" #import "ios/chrome/browser/ui/bookmarks/cells/bookmark_folder_item.h" #import "ios/chrome/browser/ui/commands/snackbar_commands.h" #import "ios/chrome/browser/ui/icons/chrome_icon.h" -#import "ios/chrome/browser/ui/legacy_bookmarks/legacy_bookmark_folder_editor_view_controller.h" -#import "ios/chrome/browser/ui/legacy_bookmarks/legacy_bookmark_utils_ios.h" #import "ios/chrome/browser/ui/table_view/table_view_utils.h" #import "ios/chrome/common/ui/colors/semantic_color_names.h" #import "ios/chrome/grit/ios_strings.h" @@ -51,7 +51,7 @@ using bookmarks::BookmarkNode; @interface BookmarkFolderViewController () < - LegacyBookmarkFolderEditorViewControllerDelegate, + BookmarkFolderEditorViewControllerDelegate, BookmarkModelBridgeObserver, UITableViewDataSource, UITableViewDelegate> { @@ -74,7 +74,7 @@ // The view controller to present when creating a new folder. @property(nonatomic, strong) - LegacyBookmarkFolderEditorViewController* folderAddController; + BookmarkFolderEditorViewController* folderAddController; // A linear list of folders. @property(nonatomic, assign, readonly) @@ -268,10 +268,9 @@ } } -#pragma mark - LegacyBookmarkFolderEditorViewControllerDelegate +#pragma mark - BookmarkFolderEditorViewControllerDelegate -- (void)bookmarkFolderEditor: - (LegacyBookmarkFolderEditorViewController*)folderEditor +- (void)bookmarkFolderEditor:(BookmarkFolderEditorViewController*)folderEditor didFinishEditingFolder:(const BookmarkNode*)folder { DCHECK(folder); [self reloadModel]; @@ -280,19 +279,19 @@ } - (void)bookmarkFolderEditorDidDeleteEditedFolder: - (LegacyBookmarkFolderEditorViewController*)folderEditor { + (BookmarkFolderEditorViewController*)folderEditor { NOTREACHED(); } - (void)bookmarkFolderEditorDidCancel: - (LegacyBookmarkFolderEditorViewController*)folderEditor { + (BookmarkFolderEditorViewController*)folderEditor { [self.navigationController popViewControllerAnimated:YES]; self.folderAddController.delegate = nil; self.folderAddController = nil; } - (void)bookmarkFolderEditorWillCommitTitleChange: - (LegacyBookmarkFolderEditorViewController*)controller { + (BookmarkFolderEditorViewController*)controller { // Do nothing. } @@ -440,8 +439,8 @@ - (void)pushFolderAddViewController { DCHECK(self.allowsNewFolders); - LegacyBookmarkFolderEditorViewController* folderCreator = - [LegacyBookmarkFolderEditorViewController + BookmarkFolderEditorViewController* folderCreator = + [BookmarkFolderEditorViewController folderCreatorWithBookmarkModel:self.bookmarkModel parentFolder:self.selectedFolder browser:self.browser];
diff --git a/ios/chrome/browser/ui/legacy_bookmarks/legacy_bookmark_home_consumer.h b/ios/chrome/browser/ui/bookmarks/bookmark_home_consumer.h similarity index 87% rename from ios/chrome/browser/ui/legacy_bookmarks/legacy_bookmark_home_consumer.h rename to ios/chrome/browser/ui/bookmarks/bookmark_home_consumer.h index 7ccc059..94edb9d4 100644 --- a/ios/chrome/browser/ui/legacy_bookmarks/legacy_bookmark_home_consumer.h +++ b/ios/chrome/browser/ui/bookmarks/bookmark_home_consumer.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_LEGACY_BOOKMARKS_LEGACY_BOOKMARK_HOME_CONSUMER_H_ -#define IOS_CHROME_BROWSER_UI_LEGACY_BOOKMARKS_LEGACY_BOOKMARK_HOME_CONSUMER_H_ +#ifndef IOS_CHROME_BROWSER_UI_BOOKMARKS_BOOKMARK_HOME_CONSUMER_H_ +#define IOS_CHROME_BROWSER_UI_BOOKMARKS_BOOKMARK_HOME_CONSUMER_H_ #import "ios/chrome/browser/ui/table_view/chrome_table_view_consumer.h" @@ -51,4 +51,4 @@ @end -#endif // IOS_CHROME_BROWSER_UI_LEGACY_BOOKMARKS_LEGACY_BOOKMARK_HOME_CONSUMER_H_ +#endif // IOS_CHROME_BROWSER_UI_BOOKMARKS_BOOKMARK_HOME_CONSUMER_H_
diff --git a/ios/chrome/browser/ui/legacy_bookmarks/legacy_bookmark_home_mediator.h b/ios/chrome/browser/ui/bookmarks/bookmark_home_mediator.h similarity index 85% rename from ios/chrome/browser/ui/legacy_bookmarks/legacy_bookmark_home_mediator.h rename to ios/chrome/browser/ui/bookmarks/bookmark_home_mediator.h index 28fb9e049..46c21c5 100644 --- a/ios/chrome/browser/ui/legacy_bookmarks/legacy_bookmark_home_mediator.h +++ b/ios/chrome/browser/ui/bookmarks/bookmark_home_mediator.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_LEGACY_BOOKMARKS_LEGACY_BOOKMARK_HOME_MEDIATOR_H_ -#define IOS_CHROME_BROWSER_UI_LEGACY_BOOKMARKS_LEGACY_BOOKMARK_HOME_MEDIATOR_H_ +#ifndef IOS_CHROME_BROWSER_UI_BOOKMARKS_BOOKMARK_HOME_MEDIATOR_H_ +#define IOS_CHROME_BROWSER_UI_BOOKMARKS_BOOKMARK_HOME_MEDIATOR_H_ #import <Foundation/Foundation.h> @@ -44,4 +44,4 @@ @end -#endif // IOS_CHROME_BROWSER_UI_LEGACY_BOOKMARKS_LEGACY_BOOKMARK_HOME_MEDIATOR_H_ +#endif // IOS_CHROME_BROWSER_UI_BOOKMARKS_BOOKMARK_HOME_MEDIATOR_H_
diff --git a/ios/chrome/browser/ui/legacy_bookmarks/legacy_bookmark_home_mediator.mm b/ios/chrome/browser/ui/bookmarks/bookmark_home_mediator.mm similarity index 97% rename from ios/chrome/browser/ui/legacy_bookmarks/legacy_bookmark_home_mediator.mm rename to ios/chrome/browser/ui/bookmarks/bookmark_home_mediator.mm index 3b3db134..e76b44c7 100644 --- a/ios/chrome/browser/ui/legacy_bookmarks/legacy_bookmark_home_mediator.mm +++ b/ios/chrome/browser/ui/bookmarks/bookmark_home_mediator.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/legacy_bookmarks/legacy_bookmark_home_mediator.h" +#import "ios/chrome/browser/ui/bookmarks/bookmark_home_mediator.h" #import "base/check.h" #import "base/mac/foundation_util.h" @@ -24,11 +24,11 @@ #import "ios/chrome/browser/ui/authentication/enterprise/enterprise_utils.h" #import "ios/chrome/browser/ui/authentication/signin_presenter.h" #import "ios/chrome/browser/ui/authentication/signin_promo_view_mediator.h" +#import "ios/chrome/browser/ui/bookmarks/bookmark_home_consumer.h" +#import "ios/chrome/browser/ui/bookmarks/bookmark_home_shared_state.h" +#import "ios/chrome/browser/ui/bookmarks/bookmark_promo_controller.h" #import "ios/chrome/browser/ui/bookmarks/cells/bookmark_home_node_item.h" -#import "ios/chrome/browser/ui/legacy_bookmarks/legacy_bookmark_home_consumer.h" -#import "ios/chrome/browser/ui/legacy_bookmarks/legacy_bookmark_home_shared_state.h" -#import "ios/chrome/browser/ui/legacy_bookmarks/legacy_bookmark_promo_controller.h" -#import "ios/chrome/browser/ui/legacy_bookmarks/legacy_synced_bookmarks_bridge.h" +#import "ios/chrome/browser/ui/bookmarks/synced_bookmarks_bridge.h" #import "ios/chrome/browser/ui/table_view/cells/table_view_text_item.h" #import "ios/chrome/browser/ui/table_view/table_view_model.h" #import "ios/chrome/browser/ui/ui_feature_flags.h"
diff --git a/ios/chrome/browser/ui/legacy_bookmarks/legacy_bookmark_home_shared_state.h b/ios/chrome/browser/ui/bookmarks/bookmark_home_shared_state.h similarity index 93% rename from ios/chrome/browser/ui/legacy_bookmarks/legacy_bookmark_home_shared_state.h rename to ios/chrome/browser/ui/bookmarks/bookmark_home_shared_state.h index 88b0775..28584fe7 100644 --- a/ios/chrome/browser/ui/legacy_bookmarks/legacy_bookmark_home_shared_state.h +++ b/ios/chrome/browser/ui/bookmarks/bookmark_home_shared_state.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_LEGACY_BOOKMARKS_LEGACY_BOOKMARK_HOME_SHARED_STATE_H_ -#define IOS_CHROME_BROWSER_UI_LEGACY_BOOKMARKS_LEGACY_BOOKMARK_HOME_SHARED_STATE_H_ +#ifndef IOS_CHROME_BROWSER_UI_BOOKMARKS_BOOKMARK_HOME_SHARED_STATE_H_ +#define IOS_CHROME_BROWSER_UI_BOOKMARKS_BOOKMARK_HOME_SHARED_STATE_H_ #import <UIKit/UIKit.h> @@ -117,4 +117,4 @@ @end -#endif // IOS_CHROME_BROWSER_UI_LEGACY_BOOKMARKS_LEGACY_BOOKMARK_HOME_SHARED_STATE_H_ +#endif // IOS_CHROME_BROWSER_UI_BOOKMARKS_BOOKMARK_HOME_SHARED_STATE_H_
diff --git a/ios/chrome/browser/ui/legacy_bookmarks/legacy_bookmark_home_shared_state.mm b/ios/chrome/browser/ui/bookmarks/bookmark_home_shared_state.mm similarity index 96% rename from ios/chrome/browser/ui/legacy_bookmarks/legacy_bookmark_home_shared_state.mm rename to ios/chrome/browser/ui/bookmarks/bookmark_home_shared_state.mm index 8dee83e..8ea1485 100644 --- a/ios/chrome/browser/ui/legacy_bookmarks/legacy_bookmark_home_shared_state.mm +++ b/ios/chrome/browser/ui/bookmarks/bookmark_home_shared_state.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/legacy_bookmarks/legacy_bookmark_home_shared_state.h" +#import "ios/chrome/browser/ui/bookmarks/bookmark_home_shared_state.h" #import "base/check.h" #import "ios/chrome/browser/ui/bookmarks/cells/bookmark_table_cell_title_editing.h"
diff --git a/ios/chrome/browser/ui/legacy_bookmarks/legacy_bookmark_home_view_controller.h b/ios/chrome/browser/ui/bookmarks/bookmark_home_view_controller.h similarity index 91% rename from ios/chrome/browser/ui/legacy_bookmarks/legacy_bookmark_home_view_controller.h rename to ios/chrome/browser/ui/bookmarks/bookmark_home_view_controller.h index 8c008ea6..d0b1814 100644 --- a/ios/chrome/browser/ui/legacy_bookmarks/legacy_bookmark_home_view_controller.h +++ b/ios/chrome/browser/ui/bookmarks/bookmark_home_view_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_LEGACY_BOOKMARKS_LEGACY_BOOKMARK_HOME_VIEW_CONTROLLER_H_ -#define IOS_CHROME_BROWSER_UI_LEGACY_BOOKMARKS_LEGACY_BOOKMARK_HOME_VIEW_CONTROLLER_H_ +#ifndef IOS_CHROME_BROWSER_UI_BOOKMARKS_BOOKMARK_HOME_VIEW_CONTROLLER_H_ +#define IOS_CHROME_BROWSER_UI_BOOKMARKS_BOOKMARK_HOME_VIEW_CONTROLLER_H_ #import <UIKit/UIKit.h> @@ -74,4 +74,4 @@ @end -#endif // IOS_CHROME_BROWSER_UI_LEGACY_BOOKMARKS_LEGACY_BOOKMARK_HOME_VIEW_CONTROLLER_H_ +#endif // IOS_CHROME_BROWSER_UI_BOOKMARKS_BOOKMARK_HOME_VIEW_CONTROLLER_H_
diff --git a/ios/chrome/browser/ui/legacy_bookmarks/legacy_bookmark_home_view_controller.mm b/ios/chrome/browser/ui/bookmarks/bookmark_home_view_controller.mm similarity index 98% rename from ios/chrome/browser/ui/legacy_bookmarks/legacy_bookmark_home_view_controller.mm rename to ios/chrome/browser/ui/bookmarks/bookmark_home_view_controller.mm index 4e836c63..088c8d15 100644 --- a/ios/chrome/browser/ui/legacy_bookmarks/legacy_bookmark_home_view_controller.mm +++ b/ios/chrome/browser/ui/bookmarks/bookmark_home_view_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/legacy_bookmarks/legacy_bookmark_home_view_controller.h" +#import "ios/chrome/browser/ui/bookmarks/bookmark_home_view_controller.h" #import "base/ios/ios_util.h" #import "base/mac/foundation_util.h" @@ -34,7 +34,18 @@ #import "ios/chrome/browser/ui/alert_coordinator/alert_coordinator.h" #import "ios/chrome/browser/ui/authentication/cells/signin_promo_view_configurator.h" #import "ios/chrome/browser/ui/authentication/cells/table_view_signin_promo_item.h" +#import "ios/chrome/browser/ui/bookmarks/bookmark_edit_view_controller.h" +#import "ios/chrome/browser/ui/bookmarks/bookmark_folder_editor_view_controller.h" +#import "ios/chrome/browser/ui/bookmarks/bookmark_folder_view_controller.h" +#import "ios/chrome/browser/ui/bookmarks/bookmark_home_consumer.h" +#import "ios/chrome/browser/ui/bookmarks/bookmark_home_mediator.h" +#import "ios/chrome/browser/ui/bookmarks/bookmark_home_shared_state.h" +#import "ios/chrome/browser/ui/bookmarks/bookmark_interaction_controller.h" +#import "ios/chrome/browser/ui/bookmarks/bookmark_interaction_controller_delegate.h" +#import "ios/chrome/browser/ui/bookmarks/bookmark_navigation_controller.h" +#import "ios/chrome/browser/ui/bookmarks/bookmark_path_cache.h" #import "ios/chrome/browser/ui/bookmarks/bookmark_ui_constants.h" +#import "ios/chrome/browser/ui/bookmarks/bookmark_utils_ios.h" #import "ios/chrome/browser/ui/bookmarks/cells/bookmark_folder_item.h" #import "ios/chrome/browser/ui/bookmarks/cells/bookmark_home_node_item.h" #import "ios/chrome/browser/ui/bookmarks/cells/bookmark_table_cell_title_edit_delegate.h" @@ -45,17 +56,6 @@ #import "ios/chrome/browser/ui/elements/home_waiting_view.h" #import "ios/chrome/browser/ui/incognito_reauth/incognito_reauth_scene_agent.h" #import "ios/chrome/browser/ui/keyboard/UIKeyCommand+Chrome.h" -#import "ios/chrome/browser/ui/legacy_bookmarks/legacy_bookmark_edit_view_controller.h" -#import "ios/chrome/browser/ui/legacy_bookmarks/legacy_bookmark_folder_editor_view_controller.h" -#import "ios/chrome/browser/ui/legacy_bookmarks/legacy_bookmark_folder_view_controller.h" -#import "ios/chrome/browser/ui/legacy_bookmarks/legacy_bookmark_home_consumer.h" -#import "ios/chrome/browser/ui/legacy_bookmarks/legacy_bookmark_home_mediator.h" -#import "ios/chrome/browser/ui/legacy_bookmarks/legacy_bookmark_home_shared_state.h" -#import "ios/chrome/browser/ui/legacy_bookmarks/legacy_bookmark_interaction_controller.h" -#import "ios/chrome/browser/ui/legacy_bookmarks/legacy_bookmark_interaction_controller_delegate.h" -#import "ios/chrome/browser/ui/legacy_bookmarks/legacy_bookmark_navigation_controller.h" -#import "ios/chrome/browser/ui/legacy_bookmarks/legacy_bookmark_path_cache.h" -#import "ios/chrome/browser/ui/legacy_bookmarks/legacy_bookmark_utils_ios.h" #import "ios/chrome/browser/ui/main/scene_state_browser_agent.h" #import "ios/chrome/browser/ui/menu/browser_action_factory.h" #import "ios/chrome/browser/ui/menu/menu_histograms.h"
diff --git a/ios/chrome/browser/ui/legacy_bookmarks/legacy_bookmark_home_view_controller_unittest.mm b/ios/chrome/browser/ui/bookmarks/bookmark_home_view_controller_unittest.mm similarity index 97% rename from ios/chrome/browser/ui/legacy_bookmarks/legacy_bookmark_home_view_controller_unittest.mm rename to ios/chrome/browser/ui/bookmarks/bookmark_home_view_controller_unittest.mm index 41aed92..5a4c9bb 100644 --- a/ios/chrome/browser/ui/legacy_bookmarks/legacy_bookmark_home_view_controller_unittest.mm +++ b/ios/chrome/browser/ui/bookmarks/bookmark_home_view_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/legacy_bookmarks/legacy_bookmark_home_view_controller.h" +#import "ios/chrome/browser/ui/bookmarks/bookmark_home_view_controller.h" #import "base/test/metrics/user_action_tester.h" #import "components/bookmarks/browser/bookmark_model.h"
diff --git a/ios/chrome/browser/ui/legacy_bookmarks/legacy_bookmark_interaction_controller.h b/ios/chrome/browser/ui/bookmarks/bookmark_interaction_controller.h similarity index 86% rename from ios/chrome/browser/ui/legacy_bookmarks/legacy_bookmark_interaction_controller.h rename to ios/chrome/browser/ui/bookmarks/bookmark_interaction_controller.h index 09c8f88..1211973 100644 --- a/ios/chrome/browser/ui/legacy_bookmarks/legacy_bookmark_interaction_controller.h +++ b/ios/chrome/browser/ui/bookmarks/bookmark_interaction_controller.h
@@ -1,8 +1,8 @@ // Copyright 2013 The Chromium Authors // 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_LEGACY_BOOKMARKS_LEGACY_BOOKMARK_INTERACTION_CONTROLLER_H_ -#define IOS_CHROME_BROWSER_UI_LEGACY_BOOKMARKS_LEGACY_BOOKMARK_INTERACTION_CONTROLLER_H_ +#ifndef IOS_CHROME_BROWSER_UI_BOOKMARKS_BOOKMARK_INTERACTION_CONTROLLER_H_ +#define IOS_CHROME_BROWSER_UI_BOOKMARKS_BOOKMARK_INTERACTION_CONTROLLER_H_ #import <UIKit/UIKit.h> @@ -58,4 +58,4 @@ @end -#endif // IOS_CHROME_BROWSER_UI_LEGACY_BOOKMARKS_LEGACY_BOOKMARK_INTERACTION_CONTROLLER_H_ +#endif // IOS_CHROME_BROWSER_UI_BOOKMARKS_BOOKMARK_INTERACTION_CONTROLLER_H_
diff --git a/ios/chrome/browser/ui/legacy_bookmarks/legacy_bookmark_interaction_controller.mm b/ios/chrome/browser/ui/bookmarks/bookmark_interaction_controller.mm similarity index 93% rename from ios/chrome/browser/ui/legacy_bookmarks/legacy_bookmark_interaction_controller.mm rename to ios/chrome/browser/ui/bookmarks/bookmark_interaction_controller.mm index 0e9c3fce..0aa1b57 100644 --- a/ios/chrome/browser/ui/legacy_bookmarks/legacy_bookmark_interaction_controller.mm +++ b/ios/chrome/browser/ui/bookmarks/bookmark_interaction_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/legacy_bookmarks/legacy_bookmark_interaction_controller.h" +#import "ios/chrome/browser/ui/bookmarks/bookmark_interaction_controller.h" #import <stdint.h> @@ -22,21 +22,21 @@ #import "ios/chrome/browser/main/browser.h" #import "ios/chrome/browser/metrics/new_tab_page_uma.h" #import "ios/chrome/browser/tabs/tab_title_util.h" +#import "ios/chrome/browser/ui/bookmarks/bookmark_edit_view_controller.h" +#import "ios/chrome/browser/ui/bookmarks/bookmark_folder_editor_view_controller.h" +#import "ios/chrome/browser/ui/bookmarks/bookmark_folder_view_controller.h" +#import "ios/chrome/browser/ui/bookmarks/bookmark_home_view_controller.h" +#import "ios/chrome/browser/ui/bookmarks/bookmark_interaction_controller_delegate.h" +#import "ios/chrome/browser/ui/bookmarks/bookmark_mediator.h" +#import "ios/chrome/browser/ui/bookmarks/bookmark_navigation_controller.h" +#import "ios/chrome/browser/ui/bookmarks/bookmark_navigation_controller_delegate.h" +#import "ios/chrome/browser/ui/bookmarks/bookmark_path_cache.h" +#import "ios/chrome/browser/ui/bookmarks/bookmark_transitioning_delegate.h" +#import "ios/chrome/browser/ui/bookmarks/bookmark_utils_ios.h" #import "ios/chrome/browser/ui/commands/application_commands.h" #import "ios/chrome/browser/ui/commands/command_dispatcher.h" #import "ios/chrome/browser/ui/commands/snackbar_commands.h" #import "ios/chrome/browser/ui/default_promo/default_browser_utils.h" -#import "ios/chrome/browser/ui/legacy_bookmarks/legacy_bookmark_edit_view_controller.h" -#import "ios/chrome/browser/ui/legacy_bookmarks/legacy_bookmark_folder_editor_view_controller.h" -#import "ios/chrome/browser/ui/legacy_bookmarks/legacy_bookmark_folder_view_controller.h" -#import "ios/chrome/browser/ui/legacy_bookmarks/legacy_bookmark_home_view_controller.h" -#import "ios/chrome/browser/ui/legacy_bookmarks/legacy_bookmark_interaction_controller_delegate.h" -#import "ios/chrome/browser/ui/legacy_bookmarks/legacy_bookmark_mediator.h" -#import "ios/chrome/browser/ui/legacy_bookmarks/legacy_bookmark_navigation_controller.h" -#import "ios/chrome/browser/ui/legacy_bookmarks/legacy_bookmark_navigation_controller_delegate.h" -#import "ios/chrome/browser/ui/legacy_bookmarks/legacy_bookmark_path_cache.h" -#import "ios/chrome/browser/ui/legacy_bookmarks/legacy_bookmark_transitioning_delegate.h" -#import "ios/chrome/browser/ui/legacy_bookmarks/legacy_bookmark_utils_ios.h" #import "ios/chrome/browser/ui/table_view/table_view_navigation_controller.h" #import "ios/chrome/browser/ui/table_view/table_view_presentation_controller.h" #import "ios/chrome/browser/ui/table_view/table_view_presentation_controller_delegate.h" @@ -73,7 +73,7 @@ @interface BookmarkInteractionController () < BookmarkEditViewControllerDelegate, - LegacyBookmarkFolderEditorViewControllerDelegate, + BookmarkFolderEditorViewControllerDelegate, BookmarkFolderViewControllerDelegate, BookmarkHomeViewControllerDelegate, TableViewPresentationControllerDelegate> { @@ -117,8 +117,7 @@ // A reference to the potentially presented folder editor. This will be non-nil // when `currentPresentedState` is FOLDER_EDITOR. -@property(nonatomic, strong) - LegacyBookmarkFolderEditorViewController* folderEditor; +@property(nonatomic, strong) BookmarkFolderEditorViewController* folderEditor; // A reference to the potentially presented folder selector. This will be // non-nil when `currentPresentedState` is FOLDER_SELECTION. @@ -335,8 +334,8 @@ editorController = bookmarkEditor; } else if (node->type() == BookmarkNode::FOLDER) { self.currentPresentedState = PresentedState::FOLDER_EDITOR; - LegacyBookmarkFolderEditorViewController* folderEditor = - [LegacyBookmarkFolderEditorViewController + BookmarkFolderEditorViewController* folderEditor = + [BookmarkFolderEditorViewController folderEditorWithBookmarkModel:self.bookmarkModel folder:node browser:_browser]; @@ -495,27 +494,26 @@ [self.delegate bookmarkInteractionControllerWillCommitTitleOrUrlChange:self]; } -#pragma mark - LegacyBookmarkFolderEditorViewControllerDelegate +#pragma mark - BookmarkFolderEditorViewControllerDelegate -- (void)bookmarkFolderEditor: - (LegacyBookmarkFolderEditorViewController*)folderEditor +- (void)bookmarkFolderEditor:(BookmarkFolderEditorViewController*)folderEditor didFinishEditingFolder:(const BookmarkNode*)folder { DCHECK(folder); [self dismissFolderEditorAnimated:YES]; } - (void)bookmarkFolderEditorDidDeleteEditedFolder: - (LegacyBookmarkFolderEditorViewController*)folderEditor { + (BookmarkFolderEditorViewController*)folderEditor { [self dismissFolderEditorAnimated:YES]; } - (void)bookmarkFolderEditorDidCancel: - (LegacyBookmarkFolderEditorViewController*)folderEditor { + (BookmarkFolderEditorViewController*)folderEditor { [self dismissFolderEditorAnimated:YES]; } - (void)bookmarkFolderEditorWillCommitTitleChange: - (LegacyBookmarkFolderEditorViewController*)controller { + (BookmarkFolderEditorViewController*)controller { [self.delegate bookmarkInteractionControllerWillCommitTitleOrUrlChange:self]; }
diff --git a/ios/chrome/browser/ui/legacy_bookmarks/legacy_bookmark_interaction_controller_delegate.h b/ios/chrome/browser/ui/bookmarks/bookmark_interaction_controller_delegate.h similarity index 71% rename from ios/chrome/browser/ui/legacy_bookmarks/legacy_bookmark_interaction_controller_delegate.h rename to ios/chrome/browser/ui/bookmarks/bookmark_interaction_controller_delegate.h index f1c2609..eeaf7945 100644 --- a/ios/chrome/browser/ui/legacy_bookmarks/legacy_bookmark_interaction_controller_delegate.h +++ b/ios/chrome/browser/ui/bookmarks/bookmark_interaction_controller_delegate.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_LEGACY_BOOKMARKS_LEGACY_BOOKMARK_INTERACTION_CONTROLLER_DELEGATE_H_ -#define IOS_CHROME_BROWSER_UI_LEGACY_BOOKMARKS_LEGACY_BOOKMARK_INTERACTION_CONTROLLER_DELEGATE_H_ +#ifndef IOS_CHROME_BROWSER_UI_BOOKMARKS_BOOKMARK_INTERACTION_CONTROLLER_DELEGATE_H_ +#define IOS_CHROME_BROWSER_UI_BOOKMARKS_BOOKMARK_INTERACTION_CONTROLLER_DELEGATE_H_ @class BookmarkInteractionController; @@ -22,4 +22,4 @@ @end -#endif // IOS_CHROME_BROWSER_UI_LEGACY_BOOKMARKS_LEGACY_BOOKMARK_INTERACTION_CONTROLLER_DELEGATE_H_ +#endif // IOS_CHROME_BROWSER_UI_BOOKMARKS_BOOKMARK_INTERACTION_CONTROLLER_DELEGATE_H_
diff --git a/ios/chrome/browser/ui/legacy_bookmarks/legacy_bookmark_mediator.h b/ios/chrome/browser/ui/bookmarks/bookmark_mediator.h similarity index 87% rename from ios/chrome/browser/ui/legacy_bookmarks/legacy_bookmark_mediator.h rename to ios/chrome/browser/ui/bookmarks/bookmark_mediator.h index e405034..4dec65c 100644 --- a/ios/chrome/browser/ui/legacy_bookmarks/legacy_bookmark_mediator.h +++ b/ios/chrome/browser/ui/bookmarks/bookmark_mediator.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_LEGACY_BOOKMARKS_LEGACY_BOOKMARK_MEDIATOR_H_ -#define IOS_CHROME_BROWSER_UI_LEGACY_BOOKMARKS_LEGACY_BOOKMARK_MEDIATOR_H_ +#ifndef IOS_CHROME_BROWSER_UI_BOOKMARKS_BOOKMARK_MEDIATOR_H_ +#define IOS_CHROME_BROWSER_UI_BOOKMARKS_BOOKMARK_MEDIATOR_H_ #import <UIKit/UIKit.h> @@ -52,4 +52,4 @@ @end -#endif // IOS_CHROME_BROWSER_UI_LEGACY_BOOKMARKS_LEGACY_BOOKMARK_MEDIATOR_H_ +#endif // IOS_CHROME_BROWSER_UI_BOOKMARKS_BOOKMARK_MEDIATOR_H_
diff --git a/ios/chrome/browser/ui/legacy_bookmarks/legacy_bookmark_mediator.mm b/ios/chrome/browser/ui/bookmarks/bookmark_mediator.mm similarity index 96% rename from ios/chrome/browser/ui/legacy_bookmarks/legacy_bookmark_mediator.mm rename to ios/chrome/browser/ui/bookmarks/bookmark_mediator.mm index f3b4bb2..5e0effe 100644 --- a/ios/chrome/browser/ui/legacy_bookmarks/legacy_bookmark_mediator.mm +++ b/ios/chrome/browser/ui/bookmarks/bookmark_mediator.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/legacy_bookmarks/legacy_bookmark_mediator.h" +#import "ios/chrome/browser/ui/bookmarks/bookmark_mediator.h" #import <MaterialComponents/MaterialSnackbar.h> @@ -17,8 +17,8 @@ #import "ios/chrome/browser/bookmarks/bookmark_model_factory.h" #import "ios/chrome/browser/browser_state/chrome_browser_state.h" #import "ios/chrome/browser/prefs/pref_names.h" +#import "ios/chrome/browser/ui/bookmarks/bookmark_utils_ios.h" #import "ios/chrome/browser/ui/default_promo/default_browser_utils.h" -#import "ios/chrome/browser/ui/legacy_bookmarks/legacy_bookmark_utils_ios.h" #import "ios/chrome/browser/ui/util/uikit_ui_util.h" #import "ios/chrome/browser/ui/util/url_with_title.h" #import "ios/chrome/grit/ios_strings.h"
diff --git a/ios/chrome/browser/ui/bookmarks/bookmark_navigation_controller.h b/ios/chrome/browser/ui/bookmarks/bookmark_navigation_controller.h new file mode 100644 index 0000000..c28a8ff --- /dev/null +++ b/ios/chrome/browser/ui/bookmarks/bookmark_navigation_controller.h
@@ -0,0 +1,13 @@ +// Copyright 2014 The Chromium Authors +// 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_BOOKMARKS_BOOKMARK_NAVIGATION_CONTROLLER_H_ +#define IOS_CHROME_BROWSER_UI_BOOKMARKS_BOOKMARK_NAVIGATION_CONTROLLER_H_ + +#import <UIKit/UIKit.h> + +@interface BookmarkNavigationController : UINavigationController +@end + +#endif // IOS_CHROME_BROWSER_UI_BOOKMARKS_BOOKMARK_NAVIGATION_CONTROLLER_H_
diff --git a/ios/chrome/browser/ui/legacy_bookmarks/legacy_bookmark_navigation_controller.mm b/ios/chrome/browser/ui/bookmarks/bookmark_navigation_controller.mm similarity index 84% rename from ios/chrome/browser/ui/legacy_bookmarks/legacy_bookmark_navigation_controller.mm rename to ios/chrome/browser/ui/bookmarks/bookmark_navigation_controller.mm index 69b2858..1168764 100644 --- a/ios/chrome/browser/ui/legacy_bookmarks/legacy_bookmark_navigation_controller.mm +++ b/ios/chrome/browser/ui/bookmarks/bookmark_navigation_controller.mm
@@ -2,10 +2,10 @@ // 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/legacy_bookmarks/legacy_bookmark_navigation_controller.h" +#import "ios/chrome/browser/ui/bookmarks/bookmark_navigation_controller.h" #import "ios/chrome/browser/ui/bookmarks/bookmark_ui_constants.h" -#import "ios/chrome/browser/ui/legacy_bookmarks/legacy_bookmark_utils_ios.h" +#import "ios/chrome/browser/ui/bookmarks/bookmark_utils_ios.h" #import "ios/chrome/common/ui/colors/semantic_color_names.h" #if !defined(__has_feature) || !__has_feature(objc_arc)
diff --git a/ios/chrome/browser/ui/legacy_bookmarks/legacy_bookmark_navigation_controller_delegate.h b/ios/chrome/browser/ui/bookmarks/bookmark_navigation_controller_delegate.h similarity index 70% rename from ios/chrome/browser/ui/legacy_bookmarks/legacy_bookmark_navigation_controller_delegate.h rename to ios/chrome/browser/ui/bookmarks/bookmark_navigation_controller_delegate.h index 6f8caa56..84e0cd85 100644 --- a/ios/chrome/browser/ui/legacy_bookmarks/legacy_bookmark_navigation_controller_delegate.h +++ b/ios/chrome/browser/ui/bookmarks/bookmark_navigation_controller_delegate.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_LEGACY_BOOKMARKS_LEGACY_BOOKMARK_NAVIGATION_CONTROLLER_DELEGATE_H_ -#define IOS_CHROME_BROWSER_UI_LEGACY_BOOKMARKS_LEGACY_BOOKMARK_NAVIGATION_CONTROLLER_DELEGATE_H_ +#ifndef IOS_CHROME_BROWSER_UI_BOOKMARKS_BOOKMARK_NAVIGATION_CONTROLLER_DELEGATE_H_ +#define IOS_CHROME_BROWSER_UI_BOOKMARKS_BOOKMARK_NAVIGATION_CONTROLLER_DELEGATE_H_ #import <UIKit/UIKit.h> @@ -21,4 +21,4 @@ @end -#endif // IOS_CHROME_BROWSER_UI_LEGACY_BOOKMARKS_LEGACY_BOOKMARK_NAVIGATION_CONTROLLER_DELEGATE_H_ +#endif // IOS_CHROME_BROWSER_UI_BOOKMARKS_BOOKMARK_NAVIGATION_CONTROLLER_DELEGATE_H_
diff --git a/ios/chrome/browser/ui/legacy_bookmarks/legacy_bookmark_navigation_controller_delegate.mm b/ios/chrome/browser/ui/bookmarks/bookmark_navigation_controller_delegate.mm similarity index 93% rename from ios/chrome/browser/ui/legacy_bookmarks/legacy_bookmark_navigation_controller_delegate.mm rename to ios/chrome/browser/ui/bookmarks/bookmark_navigation_controller_delegate.mm index 6d99e6b..9caecbe 100644 --- a/ios/chrome/browser/ui/legacy_bookmarks/legacy_bookmark_navigation_controller_delegate.mm +++ b/ios/chrome/browser/ui/bookmarks/bookmark_navigation_controller_delegate.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/legacy_bookmarks/legacy_bookmark_navigation_controller_delegate.h" +#import "ios/chrome/browser/ui/bookmarks/bookmark_navigation_controller_delegate.h" #import "base/mac/foundation_util.h" #import "ios/chrome/browser/ui/table_view/chrome_table_view_controller.h"
diff --git a/ios/chrome/browser/ui/legacy_bookmarks/legacy_bookmark_path_cache.h b/ios/chrome/browser/ui/bookmarks/bookmark_path_cache.h similarity index 86% rename from ios/chrome/browser/ui/legacy_bookmarks/legacy_bookmark_path_cache.h rename to ios/chrome/browser/ui/bookmarks/bookmark_path_cache.h index 1a485b6..79e37d64 100644 --- a/ios/chrome/browser/ui/legacy_bookmarks/legacy_bookmark_path_cache.h +++ b/ios/chrome/browser/ui/bookmarks/bookmark_path_cache.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_LEGACY_BOOKMARKS_LEGACY_BOOKMARK_PATH_CACHE_H_ -#define IOS_CHROME_BROWSER_UI_LEGACY_BOOKMARKS_LEGACY_BOOKMARK_PATH_CACHE_H_ +#ifndef IOS_CHROME_BROWSER_UI_BOOKMARKS_BOOKMARK_PATH_CACHE_H_ +#define IOS_CHROME_BROWSER_UI_BOOKMARKS_BOOKMARK_PATH_CACHE_H_ #import <UIKit/UIKit.h> @@ -43,4 +43,4 @@ @end -#endif // IOS_CHROME_BROWSER_UI_LEGACY_BOOKMARKS_LEGACY_BOOKMARK_PATH_CACHE_H_ +#endif // IOS_CHROME_BROWSER_UI_BOOKMARKS_BOOKMARK_PATH_CACHE_H_
diff --git a/ios/chrome/browser/ui/legacy_bookmarks/legacy_bookmark_path_cache.mm b/ios/chrome/browser/ui/bookmarks/bookmark_path_cache.mm similarity index 93% rename from ios/chrome/browser/ui/legacy_bookmarks/legacy_bookmark_path_cache.mm rename to ios/chrome/browser/ui/bookmarks/bookmark_path_cache.mm index aff2d95..e443721 100644 --- a/ios/chrome/browser/ui/legacy_bookmarks/legacy_bookmark_path_cache.mm +++ b/ios/chrome/browser/ui/bookmarks/bookmark_path_cache.mm
@@ -2,14 +2,14 @@ // 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/legacy_bookmarks/legacy_bookmark_path_cache.h" +#import "ios/chrome/browser/ui/bookmarks/bookmark_path_cache.h" #import "components/bookmarks/browser/bookmark_model.h" #import "components/bookmarks/browser/bookmark_node.h" #import "components/pref_registry/pref_registry_syncable.h" #import "components/prefs/pref_service.h" #import "ios/chrome/browser/prefs/pref_names.h" -#import "ios/chrome/browser/ui/legacy_bookmarks/legacy_bookmark_utils_ios.h" +#import "ios/chrome/browser/ui/bookmarks/bookmark_utils_ios.h" #if !defined(__has_feature) || !__has_feature(objc_arc) #error "This file requires ARC support."
diff --git a/ios/chrome/browser/ui/legacy_bookmarks/legacy_bookmark_path_cache_unittest.mm b/ios/chrome/browser/ui/bookmarks/bookmark_path_cache_unittest.mm similarity index 96% rename from ios/chrome/browser/ui/legacy_bookmarks/legacy_bookmark_path_cache_unittest.mm rename to ios/chrome/browser/ui/bookmarks/bookmark_path_cache_unittest.mm index f26c95c..7f37163c 100644 --- a/ios/chrome/browser/ui/legacy_bookmarks/legacy_bookmark_path_cache_unittest.mm +++ b/ios/chrome/browser/ui/bookmarks/bookmark_path_cache_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/legacy_bookmarks/legacy_bookmark_path_cache.h" +#import "ios/chrome/browser/ui/bookmarks/bookmark_path_cache.h" #import "components/bookmarks/browser/bookmark_model.h" #import "components/sync_preferences/testing_pref_service_syncable.h"
diff --git a/ios/chrome/browser/ui/legacy_bookmarks/legacy_bookmark_promo_controller.h b/ios/chrome/browser/ui/bookmarks/bookmark_promo_controller.h similarity index 87% rename from ios/chrome/browser/ui/legacy_bookmarks/legacy_bookmark_promo_controller.h rename to ios/chrome/browser/ui/bookmarks/bookmark_promo_controller.h index b229a0a..dd6c5e28 100644 --- a/ios/chrome/browser/ui/legacy_bookmarks/legacy_bookmark_promo_controller.h +++ b/ios/chrome/browser/ui/bookmarks/bookmark_promo_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_LEGACY_BOOKMARKS_LEGACY_BOOKMARK_PROMO_CONTROLLER_H_ -#define IOS_CHROME_BROWSER_UI_LEGACY_BOOKMARKS_LEGACY_BOOKMARK_PROMO_CONTROLLER_H_ +#ifndef IOS_CHROME_BROWSER_UI_BOOKMARKS_BOOKMARK_PROMO_CONTROLLER_H_ +#define IOS_CHROME_BROWSER_UI_BOOKMARKS_BOOKMARK_PROMO_CONTROLLER_H_ #import <UIKit/UIKit.h> @@ -53,4 +53,4 @@ @end -#endif // IOS_CHROME_BROWSER_UI_LEGACY_BOOKMARKS_LEGACY_BOOKMARK_PROMO_CONTROLLER_H_ +#endif // IOS_CHROME_BROWSER_UI_BOOKMARKS_BOOKMARK_PROMO_CONTROLLER_H_
diff --git a/ios/chrome/browser/ui/legacy_bookmarks/legacy_bookmark_promo_controller.mm b/ios/chrome/browser/ui/bookmarks/bookmark_promo_controller.mm similarity index 98% rename from ios/chrome/browser/ui/legacy_bookmarks/legacy_bookmark_promo_controller.mm rename to ios/chrome/browser/ui/bookmarks/bookmark_promo_controller.mm index 4d0aa14..a8d8eb78 100644 --- a/ios/chrome/browser/ui/legacy_bookmarks/legacy_bookmark_promo_controller.mm +++ b/ios/chrome/browser/ui/bookmarks/bookmark_promo_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/legacy_bookmarks/legacy_bookmark_promo_controller.h" +#import "ios/chrome/browser/ui/bookmarks/bookmark_promo_controller.h" #import <memory>
diff --git a/ios/chrome/browser/ui/legacy_bookmarks/legacy_bookmark_transitioning_delegate.h b/ios/chrome/browser/ui/bookmarks/bookmark_transitioning_delegate.h similarity index 65% rename from ios/chrome/browser/ui/legacy_bookmarks/legacy_bookmark_transitioning_delegate.h rename to ios/chrome/browser/ui/bookmarks/bookmark_transitioning_delegate.h index 154ea99..5a1ce65 100644 --- a/ios/chrome/browser/ui/legacy_bookmarks/legacy_bookmark_transitioning_delegate.h +++ b/ios/chrome/browser/ui/bookmarks/bookmark_transitioning_delegate.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_LEGACY_BOOKMARKS_LEGACY_BOOKMARK_TRANSITIONING_DELEGATE_H_ -#define IOS_CHROME_BROWSER_UI_LEGACY_BOOKMARKS_LEGACY_BOOKMARK_TRANSITIONING_DELEGATE_H_ +#ifndef IOS_CHROME_BROWSER_UI_BOOKMARKS_BOOKMARK_TRANSITIONING_DELEGATE_H_ +#define IOS_CHROME_BROWSER_UI_BOOKMARKS_BOOKMARK_TRANSITIONING_DELEGATE_H_ #import <UIKit/UIKit.h> @@ -18,4 +18,4 @@ @end -#endif // IOS_CHROME_BROWSER_UI_LEGACY_BOOKMARKS_LEGACY_BOOKMARK_TRANSITIONING_DELEGATE_H_ +#endif // IOS_CHROME_BROWSER_UI_BOOKMARKS_BOOKMARK_TRANSITIONING_DELEGATE_H_
diff --git a/ios/chrome/browser/ui/legacy_bookmarks/legacy_bookmark_transitioning_delegate.mm b/ios/chrome/browser/ui/bookmarks/bookmark_transitioning_delegate.mm similarity index 97% rename from ios/chrome/browser/ui/legacy_bookmarks/legacy_bookmark_transitioning_delegate.mm rename to ios/chrome/browser/ui/bookmarks/bookmark_transitioning_delegate.mm index 0f77569..f880c4d1 100644 --- a/ios/chrome/browser/ui/legacy_bookmarks/legacy_bookmark_transitioning_delegate.mm +++ b/ios/chrome/browser/ui/bookmarks/bookmark_transitioning_delegate.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/legacy_bookmarks/legacy_bookmark_transitioning_delegate.h" +#import "ios/chrome/browser/ui/bookmarks/bookmark_transitioning_delegate.h" #import "base/mac/foundation_util.h" #import "ios/chrome/browser/ui/table_view/table_view_animator.h"
diff --git a/ios/chrome/browser/ui/legacy_bookmarks/legacy_bookmark_utils_ios.h b/ios/chrome/browser/ui/bookmarks/bookmark_utils_ios.h similarity index 95% rename from ios/chrome/browser/ui/legacy_bookmarks/legacy_bookmark_utils_ios.h rename to ios/chrome/browser/ui/bookmarks/bookmark_utils_ios.h index 7d09273..46e17cd 100644 --- a/ios/chrome/browser/ui/legacy_bookmarks/legacy_bookmark_utils_ios.h +++ b/ios/chrome/browser/ui/bookmarks/bookmark_utils_ios.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_LEGACY_BOOKMARKS_LEGACY_BOOKMARK_UTILS_IOS_H_ -#define IOS_CHROME_BROWSER_UI_LEGACY_BOOKMARKS_LEGACY_BOOKMARK_UTILS_IOS_H_ +#ifndef IOS_CHROME_BROWSER_UI_BOOKMARKS_BOOKMARK_UTILS_IOS_H_ +#define IOS_CHROME_BROWSER_UI_BOOKMARKS_BOOKMARK_UTILS_IOS_H_ #import <UIKit/UIKit.h> @@ -144,4 +144,4 @@ } // namespace bookmark_utils_ios -#endif // IOS_CHROME_BROWSER_UI_LEGACY_BOOKMARKS_LEGACY_BOOKMARK_UTILS_IOS_H_ +#endif // IOS_CHROME_BROWSER_UI_BOOKMARKS_BOOKMARK_UTILS_IOS_H_
diff --git a/ios/chrome/browser/ui/legacy_bookmarks/legacy_bookmark_utils_ios.mm b/ios/chrome/browser/ui/bookmarks/bookmark_utils_ios.mm similarity index 98% rename from ios/chrome/browser/ui/legacy_bookmarks/legacy_bookmark_utils_ios.mm rename to ios/chrome/browser/ui/bookmarks/bookmark_utils_ios.mm index 3f56c97..32217ef2 100644 --- a/ios/chrome/browser/ui/legacy_bookmarks/legacy_bookmark_utils_ios.mm +++ b/ios/chrome/browser/ui/bookmarks/bookmark_utils_ios.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/legacy_bookmarks/legacy_bookmark_utils_ios.h" +#import "ios/chrome/browser/ui/bookmarks/bookmark_utils_ios.h" #import <stdint.h> @@ -26,7 +26,7 @@ #import "components/strings/grit/components_strings.h" #import "ios/chrome/browser/bookmarks/bookmarks_utils.h" #import "ios/chrome/browser/flags/system_flags.h" -#import "ios/chrome/browser/ui/legacy_bookmarks/legacy_undo_manager_wrapper.h" +#import "ios/chrome/browser/ui/bookmarks/undo_manager_wrapper.h" #import "ios/chrome/browser/ui/util/uikit_ui_util.h" #import "ios/chrome/grit/ios_strings.h" #import "third_party/skia/include/core/SkColor.h"
diff --git a/ios/chrome/browser/ui/legacy_bookmarks/legacy_bookmark_utils_ios_unittest.mm b/ios/chrome/browser/ui/bookmarks/bookmark_utils_ios_unittest.mm similarity index 98% rename from ios/chrome/browser/ui/legacy_bookmarks/legacy_bookmark_utils_ios_unittest.mm rename to ios/chrome/browser/ui/bookmarks/bookmark_utils_ios_unittest.mm index e3b33c5..2d7233c 100644 --- a/ios/chrome/browser/ui/legacy_bookmarks/legacy_bookmark_utils_ios_unittest.mm +++ b/ios/chrome/browser/ui/bookmarks/bookmark_utils_ios_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/legacy_bookmarks/legacy_bookmark_utils_ios.h" +#import "ios/chrome/browser/ui/bookmarks/bookmark_utils_ios.h" #import <memory> #import <vector>
diff --git a/ios/chrome/browser/ui/bookmarks/cells/BUILD.gn b/ios/chrome/browser/ui/bookmarks/cells/BUILD.gn index 9631a54..8a7f3e7 100644 --- a/ios/chrome/browser/ui/bookmarks/cells/BUILD.gn +++ b/ios/chrome/browser/ui/bookmarks/cells/BUILD.gn
@@ -25,8 +25,8 @@ "//ios/chrome/browser/ui/authentication", "//ios/chrome/browser/ui/authentication/cells", "//ios/chrome/browser/ui/bookmarks:constants", + "//ios/chrome/browser/ui/bookmarks:core", "//ios/chrome/browser/ui/icons", - "//ios/chrome/browser/ui/legacy_bookmarks:core", "//ios/chrome/browser/ui/ntp:logo", "//ios/chrome/browser/ui/table_view:styler", "//ios/chrome/browser/ui/table_view/cells",
diff --git a/ios/chrome/browser/ui/bookmarks/cells/bookmark_folder_item.mm b/ios/chrome/browser/ui/bookmarks/cells/bookmark_folder_item.mm index 6869d7d..142105a7 100644 --- a/ios/chrome/browser/ui/bookmarks/cells/bookmark_folder_item.mm +++ b/ios/chrome/browser/ui/bookmarks/cells/bookmark_folder_item.mm
@@ -7,8 +7,8 @@ #import "base/i18n/rtl.h" #import "base/mac/foundation_util.h" #import "ios/chrome/browser/ui/bookmarks/bookmark_ui_constants.h" +#import "ios/chrome/browser/ui/bookmarks/bookmark_utils_ios.h" #import "ios/chrome/browser/ui/bookmarks/cells/bookmark_table_cell_title_edit_delegate.h" -#import "ios/chrome/browser/ui/legacy_bookmarks/legacy_bookmark_utils_ios.h" #import "ios/chrome/browser/ui/util/rtl_geometry.h" #import "ios/chrome/grit/ios_strings.h" #import "ui/base/l10n/l10n_util_mac.h"
diff --git a/ios/chrome/browser/ui/bookmarks/cells/bookmark_home_node_item.mm b/ios/chrome/browser/ui/bookmarks/cells/bookmark_home_node_item.mm index 71e5d73..6e333a8 100644 --- a/ios/chrome/browser/ui/bookmarks/cells/bookmark_home_node_item.mm +++ b/ios/chrome/browser/ui/bookmarks/cells/bookmark_home_node_item.mm
@@ -8,8 +8,8 @@ #import "base/strings/sys_string_conversions.h" #import "components/bookmarks/browser/bookmark_node.h" #import "components/url_formatter/elide_url.h" +#import "ios/chrome/browser/ui/bookmarks/bookmark_utils_ios.h" #import "ios/chrome/browser/ui/bookmarks/cells/bookmark_folder_item.h" -#import "ios/chrome/browser/ui/legacy_bookmarks/legacy_bookmark_utils_ios.h" #import "ios/chrome/browser/ui/table_view/cells/table_view_url_item.h" #if !defined(__has_feature) || !__has_feature(objc_arc)
diff --git a/ios/chrome/browser/ui/bookmarks/cells/bookmark_parent_folder_item.mm b/ios/chrome/browser/ui/bookmarks/cells/bookmark_parent_folder_item.mm index ac8e1d34..d1c3970 100644 --- a/ios/chrome/browser/ui/bookmarks/cells/bookmark_parent_folder_item.mm +++ b/ios/chrome/browser/ui/bookmarks/cells/bookmark_parent_folder_item.mm
@@ -7,8 +7,8 @@ #import "base/i18n/rtl.h" #import "base/mac/foundation_util.h" #import "ios/chrome/browser/ui/bookmarks/bookmark_ui_constants.h" +#import "ios/chrome/browser/ui/bookmarks/bookmark_utils_ios.h" #import "ios/chrome/browser/ui/icons/chrome_icon.h" -#import "ios/chrome/browser/ui/legacy_bookmarks/legacy_bookmark_utils_ios.h" #import "ios/chrome/browser/ui/util/uikit_ui_util.h" #import "ios/chrome/common/ui/colors/semantic_color_names.h" #import "ios/chrome/common/ui/util/constraints_ui_util.h"
diff --git a/ios/chrome/browser/ui/bookmarks/cells/bookmark_text_field_item.mm b/ios/chrome/browser/ui/bookmarks/cells/bookmark_text_field_item.mm index aab2574c..8511f4d 100644 --- a/ios/chrome/browser/ui/bookmarks/cells/bookmark_text_field_item.mm +++ b/ios/chrome/browser/ui/bookmarks/cells/bookmark_text_field_item.mm
@@ -7,7 +7,7 @@ #import "base/check_op.h" #import "base/mac/foundation_util.h" #import "ios/chrome/browser/ui/bookmarks/bookmark_ui_constants.h" -#import "ios/chrome/browser/ui/legacy_bookmarks/legacy_bookmark_utils_ios.h" +#import "ios/chrome/browser/ui/bookmarks/bookmark_utils_ios.h" #import "ios/chrome/browser/ui/util/uikit_ui_util.h" #import "ios/chrome/common/ui/colors/semantic_color_names.h" #import "ios/chrome/common/ui/util/constraints_ui_util.h"
diff --git a/ios/chrome/browser/ui/legacy_bookmarks/legacy_synced_bookmarks_bridge.h b/ios/chrome/browser/ui/bookmarks/synced_bookmarks_bridge.h similarity index 82% rename from ios/chrome/browser/ui/legacy_bookmarks/legacy_synced_bookmarks_bridge.h rename to ios/chrome/browser/ui/bookmarks/synced_bookmarks_bridge.h index 430e6fe..2aef2c3 100644 --- a/ios/chrome/browser/ui/legacy_bookmarks/legacy_synced_bookmarks_bridge.h +++ b/ios/chrome/browser/ui/bookmarks/synced_bookmarks_bridge.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_LEGACY_BOOKMARKS_LEGACY_SYNCED_BOOKMARKS_BRIDGE_H_ -#define IOS_CHROME_BROWSER_UI_LEGACY_BOOKMARKS_LEGACY_SYNCED_BOOKMARKS_BRIDGE_H_ +#ifndef IOS_CHROME_BROWSER_UI_BOOKMARKS_SYNCED_BOOKMARKS_BRIDGE_H_ +#define IOS_CHROME_BROWSER_UI_BOOKMARKS_SYNCED_BOOKMARKS_BRIDGE_H_ #import <Foundation/Foundation.h> @@ -41,4 +41,4 @@ } // namespace sync_bookmarks -#endif // IOS_CHROME_BROWSER_UI_LEGACY_BOOKMARKS_LEGACY_SYNCED_BOOKMARKS_BRIDGE_H_ +#endif // IOS_CHROME_BROWSER_UI_BOOKMARKS_SYNCED_BOOKMARKS_BRIDGE_H_
diff --git a/ios/chrome/browser/ui/legacy_bookmarks/legacy_synced_bookmarks_bridge.mm b/ios/chrome/browser/ui/bookmarks/synced_bookmarks_bridge.mm similarity index 96% rename from ios/chrome/browser/ui/legacy_bookmarks/legacy_synced_bookmarks_bridge.mm rename to ios/chrome/browser/ui/bookmarks/synced_bookmarks_bridge.mm index dd3fb8f2..116aef882 100644 --- a/ios/chrome/browser/ui/legacy_bookmarks/legacy_synced_bookmarks_bridge.mm +++ b/ios/chrome/browser/ui/bookmarks/synced_bookmarks_bridge.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/legacy_bookmarks/legacy_synced_bookmarks_bridge.h" +#import "ios/chrome/browser/ui/bookmarks/synced_bookmarks_bridge.h" #import "components/prefs/pref_service.h" #import "components/signin/public/identity_manager/identity_manager.h"
diff --git a/ios/chrome/browser/ui/legacy_bookmarks/legacy_undo_manager_bridge_observer.h b/ios/chrome/browser/ui/bookmarks/undo_manager_bridge_observer.h similarity index 76% rename from ios/chrome/browser/ui/legacy_bookmarks/legacy_undo_manager_bridge_observer.h rename to ios/chrome/browser/ui/bookmarks/undo_manager_bridge_observer.h index 2938305..c9e7e6d 100644 --- a/ios/chrome/browser/ui/legacy_bookmarks/legacy_undo_manager_bridge_observer.h +++ b/ios/chrome/browser/ui/bookmarks/undo_manager_bridge_observer.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_LEGACY_BOOKMARKS_LEGACY_UNDO_MANAGER_BRIDGE_OBSERVER_H_ -#define IOS_CHROME_BROWSER_UI_LEGACY_BOOKMARKS_LEGACY_UNDO_MANAGER_BRIDGE_OBSERVER_H_ +#ifndef IOS_CHROME_BROWSER_UI_BOOKMARKS_UNDO_MANAGER_BRIDGE_OBSERVER_H_ +#define IOS_CHROME_BROWSER_UI_BOOKMARKS_UNDO_MANAGER_BRIDGE_OBSERVER_H_ #include "base/compiler_specific.h" #include "components/undo/undo_manager_observer.h" @@ -28,4 +28,4 @@ }; } // namespace bookmarks -#endif // IOS_CHROME_BROWSER_UI_LEGACY_BOOKMARKS_LEGACY_UNDO_MANAGER_BRIDGE_OBSERVER_H_ +#endif // IOS_CHROME_BROWSER_UI_BOOKMARKS_UNDO_MANAGER_BRIDGE_OBSERVER_H_
diff --git a/ios/chrome/browser/ui/legacy_bookmarks/legacy_undo_manager_bridge_observer.mm b/ios/chrome/browser/ui/bookmarks/undo_manager_bridge_observer.mm similarity index 85% rename from ios/chrome/browser/ui/legacy_bookmarks/legacy_undo_manager_bridge_observer.mm rename to ios/chrome/browser/ui/bookmarks/undo_manager_bridge_observer.mm index c4e5c862..b0fc63ca 100644 --- a/ios/chrome/browser/ui/legacy_bookmarks/legacy_undo_manager_bridge_observer.mm +++ b/ios/chrome/browser/ui/bookmarks/undo_manager_bridge_observer.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/legacy_bookmarks/legacy_undo_manager_bridge_observer.h" +#import "ios/chrome/browser/ui/bookmarks/undo_manager_bridge_observer.h" #import "base/check.h"
diff --git a/ios/chrome/browser/ui/legacy_bookmarks/legacy_undo_manager_wrapper.h b/ios/chrome/browser/ui/bookmarks/undo_manager_wrapper.h similarity index 85% rename from ios/chrome/browser/ui/legacy_bookmarks/legacy_undo_manager_wrapper.h rename to ios/chrome/browser/ui/bookmarks/undo_manager_wrapper.h index 953b509c..32f0409 100644 --- a/ios/chrome/browser/ui/legacy_bookmarks/legacy_undo_manager_wrapper.h +++ b/ios/chrome/browser/ui/bookmarks/undo_manager_wrapper.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_LEGACY_BOOKMARKS_LEGACY_UNDO_MANAGER_WRAPPER_H_ -#define IOS_CHROME_BROWSER_UI_LEGACY_BOOKMARKS_LEGACY_UNDO_MANAGER_WRAPPER_H_ +#ifndef IOS_CHROME_BROWSER_UI_BOOKMARKS_UNDO_MANAGER_WRAPPER_H_ +#define IOS_CHROME_BROWSER_UI_BOOKMARKS_UNDO_MANAGER_WRAPPER_H_ #import <Foundation/Foundation.h> @@ -42,4 +42,4 @@ @end -#endif // IOS_CHROME_BROWSER_UI_LEGACY_BOOKMARKS_LEGACY_UNDO_MANAGER_WRAPPER_H_ +#endif // IOS_CHROME_BROWSER_UI_BOOKMARKS_UNDO_MANAGER_WRAPPER_H_
diff --git a/ios/chrome/browser/ui/legacy_bookmarks/legacy_undo_manager_wrapper.mm b/ios/chrome/browser/ui/bookmarks/undo_manager_wrapper.mm similarity index 90% rename from ios/chrome/browser/ui/legacy_bookmarks/legacy_undo_manager_wrapper.mm rename to ios/chrome/browser/ui/bookmarks/undo_manager_wrapper.mm index 4fde54c..f2d2ee6 100644 --- a/ios/chrome/browser/ui/legacy_bookmarks/legacy_undo_manager_wrapper.mm +++ b/ios/chrome/browser/ui/bookmarks/undo_manager_wrapper.mm
@@ -2,14 +2,14 @@ // 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/legacy_bookmarks/legacy_undo_manager_wrapper.h" +#import "ios/chrome/browser/ui/bookmarks/undo_manager_wrapper.h" #import <memory> #import "components/undo/bookmark_undo_service.h" #import "components/undo/undo_manager.h" #import "ios/chrome/browser/browser_state/chrome_browser_state.h" -#import "ios/chrome/browser/ui/legacy_bookmarks/legacy_undo_manager_bridge_observer.h" +#import "ios/chrome/browser/ui/bookmarks/undo_manager_bridge_observer.h" #import "ios/chrome/browser/undo/bookmark_undo_service_factory.h" #if !defined(__has_feature) || !__has_feature(objc_arc)
diff --git a/ios/chrome/browser/ui/browser_view/BUILD.gn b/ios/chrome/browser/ui/browser_view/BUILD.gn index 0aa2a9c..9b4373e9 100644 --- a/ios/chrome/browser/ui/browser_view/BUILD.gn +++ b/ios/chrome/browser/ui/browser_view/BUILD.gn
@@ -100,6 +100,7 @@ "//ios/chrome/browser/ui/autofill/form_input_accessory", "//ios/chrome/browser/ui/autofill/manual_fill", "//ios/chrome/browser/ui/badges:badges_popup_menu", + "//ios/chrome/browser/ui/bookmarks", "//ios/chrome/browser/ui/browser_container", "//ios/chrome/browser/ui/browser_container:ui", "//ios/chrome/browser/ui/bubble", @@ -132,7 +133,6 @@ "//ios/chrome/browser/ui/infobars:public", "//ios/chrome/browser/ui/keyboard", "//ios/chrome/browser/ui/keyboard:features", - "//ios/chrome/browser/ui/legacy_bookmarks", "//ios/chrome/browser/ui/lens:coordinator", "//ios/chrome/browser/ui/main:browser_interface_provider", "//ios/chrome/browser/ui/main:default_browser_scene_agent", @@ -294,6 +294,7 @@ "//ios/chrome/browser/tabs", "//ios/chrome/browser/ui:feature_flags", "//ios/chrome/browser/ui/alert_coordinator", + "//ios/chrome/browser/ui/bookmarks", "//ios/chrome/browser/ui/browser_container:ui", "//ios/chrome/browser/ui/bubble", "//ios/chrome/browser/ui/commands", @@ -304,7 +305,6 @@ "//ios/chrome/browser/ui/incognito_reauth:incognito_reauth_scene_agent", "//ios/chrome/browser/ui/keyboard", "//ios/chrome/browser/ui/keyboard:features", - "//ios/chrome/browser/ui/legacy_bookmarks", "//ios/chrome/browser/ui/main:scene_state_header", "//ios/chrome/browser/ui/ntp:coordinator", "//ios/chrome/browser/ui/popup_menu",
diff --git a/ios/chrome/browser/ui/browser_view/browser_coordinator.mm b/ios/chrome/browser/ui/browser_view/browser_coordinator.mm index 8ebaf91..7bd9ec5 100644 --- a/ios/chrome/browser/ui/browser_view/browser_coordinator.mm +++ b/ios/chrome/browser/ui/browser_view/browser_coordinator.mm
@@ -55,6 +55,7 @@ #import "ios/chrome/browser/ui/autofill/form_input_accessory/form_input_accessory_coordinator.h" #import "ios/chrome/browser/ui/autofill/manual_fill/manual_fill_password_coordinator.h" #import "ios/chrome/browser/ui/badges/badge_popup_menu_coordinator.h" +#import "ios/chrome/browser/ui/bookmarks/bookmark_interaction_controller.h" #import "ios/chrome/browser/ui/browser_container/browser_container_coordinator.h" #import "ios/chrome/browser/ui/browser_container/browser_container_view_controller.h" #import "ios/chrome/browser/ui/browser_view/browser_coordinator+private.h" @@ -108,7 +109,6 @@ #import "ios/chrome/browser/ui/fullscreen/fullscreen_controller.h" #import "ios/chrome/browser/ui/incognito_reauth/incognito_reauth_mediator.h" #import "ios/chrome/browser/ui/incognito_reauth/incognito_reauth_scene_agent.h" -#import "ios/chrome/browser/ui/legacy_bookmarks/legacy_bookmark_interaction_controller.h" #import "ios/chrome/browser/ui/lens/lens_coordinator.h" #import "ios/chrome/browser/ui/main/browser_interface_provider.h" #import "ios/chrome/browser/ui/main/default_browser_scene_agent.h"
diff --git a/ios/chrome/browser/ui/browser_view/browser_view_controller.mm b/ios/chrome/browser/ui/browser_view/browser_view_controller.mm index d0ee741..184cd6f2 100644 --- a/ios/chrome/browser/ui/browser_view/browser_view_controller.mm +++ b/ios/chrome/browser/ui/browser_view/browser_view_controller.mm
@@ -46,6 +46,7 @@ #import "ios/chrome/browser/snapshots/snapshot_tab_helper.h" #import "ios/chrome/browser/tabs/tab_title_util.h" #import "ios/chrome/browser/ui/authentication/re_signin_infobar_delegate.h" +#import "ios/chrome/browser/ui/bookmarks/bookmark_interaction_controller.h" #import "ios/chrome/browser/ui/browser_container/browser_container_view_controller.h" #import "ios/chrome/browser/ui/bubble/bubble_presenter.h" #import "ios/chrome/browser/ui/bubble/bubble_presenter_delegate.h" @@ -71,7 +72,6 @@ #import "ios/chrome/browser/ui/incognito_reauth/incognito_reauth_commands.h" #import "ios/chrome/browser/ui/incognito_reauth/incognito_reauth_scene_agent.h" #import "ios/chrome/browser/ui/incognito_reauth/incognito_reauth_view.h" -#import "ios/chrome/browser/ui/legacy_bookmarks/legacy_bookmark_interaction_controller.h" #import "ios/chrome/browser/ui/lens/lens_coordinator.h" #import "ios/chrome/browser/ui/main/layout_guide_util.h" #import "ios/chrome/browser/ui/main/scene_state.h"
diff --git a/ios/chrome/browser/ui/browser_view/browser_view_controller_unittest.mm b/ios/chrome/browser/ui/browser_view/browser_view_controller_unittest.mm index 10d32e9..5d7751d 100644 --- a/ios/chrome/browser/ui/browser_view/browser_view_controller_unittest.mm +++ b/ios/chrome/browser/ui/browser_view/browser_view_controller_unittest.mm
@@ -28,6 +28,7 @@ #import "ios/chrome/browser/signin/authentication_service_factory.h" #import "ios/chrome/browser/signin/fake_authentication_service_delegate.h" #import "ios/chrome/browser/tabs/tab_helper_util.h" +#import "ios/chrome/browser/ui/bookmarks/bookmark_interaction_controller.h" #import "ios/chrome/browser/ui/browser_container/browser_container_view_controller.h" #import "ios/chrome/browser/ui/browser_view/key_commands_provider.h" #import "ios/chrome/browser/ui/bubble/bubble_presenter.h" @@ -42,7 +43,6 @@ #import "ios/chrome/browser/ui/commands/text_zoom_commands.h" #import "ios/chrome/browser/ui/download/download_manager_coordinator.h" #import "ios/chrome/browser/ui/fullscreen/fullscreen_controller.h" -#import "ios/chrome/browser/ui/legacy_bookmarks/legacy_bookmark_interaction_controller.h" #import "ios/chrome/browser/ui/main/scene_state.h" #import "ios/chrome/browser/ui/main/scene_state_browser_agent.h" #import "ios/chrome/browser/ui/popup_menu/popup_menu_coordinator.h"
diff --git a/ios/chrome/browser/ui/legacy_bookmarks/BUILD.gn b/ios/chrome/browser/ui/legacy_bookmarks/BUILD.gn deleted file mode 100644 index 01edb41..0000000 --- a/ios/chrome/browser/ui/legacy_bookmarks/BUILD.gn +++ /dev/null
@@ -1,206 +0,0 @@ -# Copyright 2022 The Chromium Authors -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -source_set("legacy_bookmarks") { - configs += [ "//build/config/compiler:enable_arc" ] - sources = [ - "legacy_bookmark_home_consumer.h", - "legacy_bookmark_home_mediator.h", - "legacy_bookmark_home_mediator.mm", - "legacy_bookmark_home_shared_state.h", - "legacy_bookmark_home_shared_state.mm", - "legacy_bookmark_home_view_controller.h", - "legacy_bookmark_home_view_controller.mm", - "legacy_bookmark_interaction_controller.h", - "legacy_bookmark_interaction_controller.mm", - "legacy_bookmark_interaction_controller_delegate.h", - "legacy_bookmark_navigation_controller.h", - "legacy_bookmark_navigation_controller.mm", - "legacy_bookmark_navigation_controller_delegate.h", - "legacy_bookmark_navigation_controller_delegate.mm", - "legacy_bookmark_promo_controller.h", - "legacy_bookmark_promo_controller.mm", - "legacy_bookmark_transitioning_delegate.h", - "legacy_bookmark_transitioning_delegate.mm", - "legacy_synced_bookmarks_bridge.h", - "legacy_synced_bookmarks_bridge.mm", - ] - deps = [ - ":bookmarks_ui", - ":core", - "//base", - "//components/bookmarks/browser", - "//components/bookmarks/common", - "//components/bookmarks/managed", - "//components/prefs", - "//components/prefs/ios", - "//components/signin/public/identity_manager", - "//components/signin/public/identity_manager/objc", - "//components/strings", - "//components/sync/driver", - "//ios/chrome/app:tests_hook", - "//ios/chrome/app/strings", - "//ios/chrome/browser/bookmarks", - "//ios/chrome/browser/browser_state", - "//ios/chrome/browser/drag_and_drop", - "//ios/chrome/browser/favicon", - "//ios/chrome/browser/main:public", - "//ios/chrome/browser/metrics:metrics_internal", - "//ios/chrome/browser/policy:policy_util", - "//ios/chrome/browser/signin", - "//ios/chrome/browser/sync", - "//ios/chrome/browser/tabs", - "//ios/chrome/browser/ui:feature_flags", - "//ios/chrome/browser/ui/alert_coordinator", - "//ios/chrome/browser/ui/authentication", - "//ios/chrome/browser/ui/authentication:signin_presenter", - "//ios/chrome/browser/ui/authentication/cells", - "//ios/chrome/browser/ui/authentication/enterprise:enterprise_utils", - "//ios/chrome/browser/ui/bookmarks:constants", - "//ios/chrome/browser/ui/bookmarks/cells", - "//ios/chrome/browser/ui/bookmarks/resources:bookmark_blue_check", - "//ios/chrome/browser/ui/bookmarks/resources:bookmark_blue_folder", - "//ios/chrome/browser/ui/bookmarks/resources:bookmark_blue_new_folder", - "//ios/chrome/browser/ui/bookmarks/resources:bookmark_empty", - "//ios/chrome/browser/ui/bookmarks/resources:bookmark_empty_star", - "//ios/chrome/browser/ui/commands", - "//ios/chrome/browser/ui/default_promo:utils", - "//ios/chrome/browser/ui/elements", - "//ios/chrome/browser/ui/incognito_reauth:incognito_reauth_scene_agent", - "//ios/chrome/browser/ui/keyboard", - "//ios/chrome/browser/ui/list_model", - "//ios/chrome/browser/ui/main:scene_state_header", - "//ios/chrome/browser/ui/menu", - "//ios/chrome/browser/ui/sharing", - "//ios/chrome/browser/ui/sharing/activity_services", - "//ios/chrome/browser/ui/table_view", - "//ios/chrome/browser/ui/table_view:presentation", - "//ios/chrome/browser/ui/table_view:styler", - "//ios/chrome/browser/ui/table_view:utils", - "//ios/chrome/browser/ui/table_view:views", - "//ios/chrome/browser/ui/util:url_with_title", - "//ios/chrome/browser/url_loading", - "//ios/chrome/browser/web_state_list", - "//ios/chrome/browser/window_activities", - "//ios/chrome/common/ui/colors", - "//ios/chrome/common/ui/favicon:favicon", - "//ios/chrome/common/ui/favicon:favicon_constants", - "//ios/chrome/common/ui/util", - "//ios/third_party/material_components_ios", - "//ui/base", - ] - frameworks = [ "UIKit.framework" ] -} - -source_set("core") { - configs += [ "//build/config/compiler:enable_arc" ] - sources = [ - "legacy_bookmark_mediator.h", - "legacy_bookmark_mediator.mm", - "legacy_bookmark_path_cache.h", - "legacy_bookmark_path_cache.mm", - "legacy_bookmark_utils_ios.h", - "legacy_bookmark_utils_ios.mm", - "legacy_undo_manager_bridge_observer.h", - "legacy_undo_manager_bridge_observer.mm", - "legacy_undo_manager_wrapper.h", - "legacy_undo_manager_wrapper.mm", - ] - deps = [ - "//components/bookmarks/browser", - "//components/pref_registry", - "//components/prefs", - "//components/query_parser", - "//components/strings", - "//components/undo", - "//ios/chrome/app/strings", - "//ios/chrome/browser/bookmarks", - "//ios/chrome/browser/browser_state", - "//ios/chrome/browser/flags:system_flags", - "//ios/chrome/browser/main:public", - "//ios/chrome/browser/prefs:pref_names", - "//ios/chrome/browser/ui/default_promo:utils", - "//ios/chrome/browser/ui/util", - "//ios/chrome/browser/ui/util:url_with_title", - "//ios/chrome/browser/undo", - "//ios/chrome/common/ui/colors", - "//ios/third_party/material_components_ios", - "//ui/base", - ] - frameworks = [ "UIKit.framework" ] -} - -source_set("bookmarks_ui") { - configs += [ "//build/config/compiler:enable_arc" ] - sources = [ - "legacy_bookmark_edit_view_controller.h", - "legacy_bookmark_edit_view_controller.mm", - "legacy_bookmark_folder_editor_view_controller.h", - "legacy_bookmark_folder_editor_view_controller.mm", - "legacy_bookmark_folder_view_controller.h", - "legacy_bookmark_folder_view_controller.mm", - ] - deps = [ - ":core", - "//base", - "//base:i18n", - "//components/bookmarks/browser", - "//components/strings", - "//components/url_formatter", - "//ios/chrome/app/strings", - "//ios/chrome/browser/bookmarks", - "//ios/chrome/browser/browser_state", - "//ios/chrome/browser/flags:system_flags", - "//ios/chrome/browser/main:public", - "//ios/chrome/browser/ui/alert_coordinator", - "//ios/chrome/browser/ui/bookmarks:constants", - "//ios/chrome/browser/ui/bookmarks/cells", - "//ios/chrome/browser/ui/commands", - "//ios/chrome/browser/ui/icons", - "//ios/chrome/browser/ui/image_util", - "//ios/chrome/browser/ui/keyboard", - "//ios/chrome/browser/ui/table_view", - "//ios/chrome/browser/ui/table_view:presentation", - "//ios/chrome/browser/ui/table_view:styler", - "//ios/chrome/browser/ui/table_view:utils", - "//ios/chrome/browser/ui/table_view:views", - "//ios/chrome/common/ui/util", - "//ui/base", - ] - allow_circular_includes_from = [ "//ios/chrome/browser/ui/bookmarks/cells" ] - frameworks = [ "UIKit.framework" ] -} - -source_set("unit_tests") { - configs += [ "//build/config/compiler:enable_arc" ] - testonly = true - sources = [ - "legacy_bookmark_edit_view_controller_unittest.mm", - "legacy_bookmark_home_view_controller_unittest.mm", - "legacy_bookmark_path_cache_unittest.mm", - "legacy_bookmark_utils_ios_unittest.mm", - ] - deps = [ - ":bookmarks_ui", - ":core", - ":legacy_bookmarks", - "//base", - "//base/test:test_support", - "//components/bookmarks/browser", - "//components/bookmarks/test", - "//components/sync_preferences:test_support", - "//ios/chrome/browser/bookmarks", - "//ios/chrome/browser/bookmarks:test_support", - "//ios/chrome/browser/browser_state:test_support", - "//ios/chrome/browser/flags:system_flags", - "//ios/chrome/browser/main:public", - "//ios/chrome/browser/main:test_support", - "//ios/chrome/browser/ui/bookmarks:constants", - "//ios/chrome/browser/ui/commands", - "//ios/chrome/test:test_support", - "//ios/web/public/test", - "//testing/gtest", - "//third_party/ocmock:ocmock", - ] -}
diff --git a/ios/chrome/browser/ui/legacy_bookmarks/OWNERS b/ios/chrome/browser/ui/legacy_bookmarks/OWNERS deleted file mode 100644 index 464e267..0000000 --- a/ios/chrome/browser/ui/legacy_bookmarks/OWNERS +++ /dev/null
@@ -1,3 +0,0 @@ -jlebel@chromium.org -noyau@chromium.org -sczs@chromium.org
diff --git a/ios/chrome/browser/ui/legacy_bookmarks/legacy_bookmark_navigation_controller.h b/ios/chrome/browser/ui/legacy_bookmarks/legacy_bookmark_navigation_controller.h deleted file mode 100644 index 74a16370..0000000 --- a/ios/chrome/browser/ui/legacy_bookmarks/legacy_bookmark_navigation_controller.h +++ /dev/null
@@ -1,13 +0,0 @@ -// Copyright 2014 The Chromium Authors -// 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_LEGACY_BOOKMARKS_LEGACY_BOOKMARK_NAVIGATION_CONTROLLER_H_ -#define IOS_CHROME_BROWSER_UI_LEGACY_BOOKMARKS_LEGACY_BOOKMARK_NAVIGATION_CONTROLLER_H_ - -#import <UIKit/UIKit.h> - -@interface BookmarkNavigationController : UINavigationController -@end - -#endif // IOS_CHROME_BROWSER_UI_LEGACY_BOOKMARKS_LEGACY_BOOKMARK_NAVIGATION_CONTROLLER_H_
diff --git a/ios/chrome/browser/ui/ntp/BUILD.gn b/ios/chrome/browser/ui/ntp/BUILD.gn index 0d9692f..2623545 100644 --- a/ios/chrome/browser/ui/ntp/BUILD.gn +++ b/ios/chrome/browser/ui/ntp/BUILD.gn
@@ -220,6 +220,7 @@ "//ios/chrome/browser/signin", "//ios/chrome/browser/tabs", "//ios/chrome/browser/ui:feature_flags", + "//ios/chrome/browser/ui/bookmarks", "//ios/chrome/browser/ui/bubble", "//ios/chrome/browser/ui/commands", "//ios/chrome/browser/ui/content_suggestions", @@ -232,7 +233,6 @@ "//ios/chrome/browser/ui/favicon", "//ios/chrome/browser/ui/gestures", "//ios/chrome/browser/ui/icons:symbols", - "//ios/chrome/browser/ui/legacy_bookmarks", "//ios/chrome/browser/ui/ntp/feed_top_section", "//ios/chrome/browser/ui/ntp/metrics", "//ios/chrome/browser/ui/overscroll_actions",
diff --git a/ios/chrome/browser/ui/popup_menu/BUILD.gn b/ios/chrome/browser/ui/popup_menu/BUILD.gn index cadc2d5..afb71e4 100644 --- a/ios/chrome/browser/ui/popup_menu/BUILD.gn +++ b/ios/chrome/browser/ui/popup_menu/BUILD.gn
@@ -81,6 +81,7 @@ "//ios/chrome/browser/search_engines:search_engines_util", "//ios/chrome/browser/translate", "//ios/chrome/browser/ui:feature_flags", + "//ios/chrome/browser/ui/bookmarks:core", "//ios/chrome/browser/ui/browser_container", "//ios/chrome/browser/ui/browser_container:ui", "//ios/chrome/browser/ui/bubble", @@ -89,7 +90,6 @@ "//ios/chrome/browser/ui/coordinators:chrome_coordinators", "//ios/chrome/browser/ui/default_promo:utils", "//ios/chrome/browser/ui/icons:symbols", - "//ios/chrome/browser/ui/legacy_bookmarks:core", "//ios/chrome/browser/ui/lens:lens_entrypoint", "//ios/chrome/browser/ui/list_model", "//ios/chrome/browser/ui/main:layout_guide_util",
diff --git a/ios/chrome/browser/ui/popup_menu/overflow_menu/BUILD.gn b/ios/chrome/browser/ui/popup_menu/overflow_menu/BUILD.gn index b4c787a..43cbbe5 100644 --- a/ios/chrome/browser/ui/popup_menu/overflow_menu/BUILD.gn +++ b/ios/chrome/browser/ui/popup_menu/overflow_menu/BUILD.gn
@@ -81,12 +81,12 @@ "//ios/chrome/browser/prefs:pref_names", "//ios/chrome/browser/reading_list", "//ios/chrome/browser/translate", + "//ios/chrome/browser/ui/bookmarks:core", "//ios/chrome/browser/ui/browser_container:ui", "//ios/chrome/browser/ui/commands", "//ios/chrome/browser/ui/default_promo:utils", "//ios/chrome/browser/ui/follow", "//ios/chrome/browser/ui/icons:symbols", - "//ios/chrome/browser/ui/legacy_bookmarks:core", "//ios/chrome/browser/ui/ntp/metrics", "//ios/chrome/browser/ui/popup_menu:constants", "//ios/chrome/browser/ui/popup_menu:metrics_protocols",
diff --git a/ios/chrome/browser/ui/sharing/BUILD.gn b/ios/chrome/browser/ui/sharing/BUILD.gn index d2c0f4a..3c8eb0a 100644 --- a/ios/chrome/browser/ui/sharing/BUILD.gn +++ b/ios/chrome/browser/ui/sharing/BUILD.gn
@@ -19,9 +19,9 @@ "//ios/chrome/browser/bookmarks", "//ios/chrome/browser/main:public", "//ios/chrome/browser/open_in", + "//ios/chrome/browser/ui/bookmarks:core", "//ios/chrome/browser/ui/commands", "//ios/chrome/browser/ui/coordinators:chrome_coordinators", - "//ios/chrome/browser/ui/legacy_bookmarks:core", "//ios/chrome/browser/ui/open_in:features", "//ios/chrome/browser/ui/open_in:open_in_histograms", "//ios/chrome/browser/ui/sharing/activity_services", @@ -51,8 +51,8 @@ "//ios/chrome/browser/bookmarks:test_support", "//ios/chrome/browser/browser_state", "//ios/chrome/browser/main:test_support", + "//ios/chrome/browser/ui/bookmarks:bookmarks_ui", "//ios/chrome/browser/ui/commands", - "//ios/chrome/browser/ui/legacy_bookmarks:bookmarks_ui", "//ios/chrome/browser/ui/main:scene_state_header", "//ios/chrome/browser/ui/sharing/activity_services", "//ios/chrome/browser/ui/sharing/activity_services/requirements",
diff --git a/ios/chrome/browser/ui/sharing/sharing_coordinator_unittest.mm b/ios/chrome/browser/ui/sharing/sharing_coordinator_unittest.mm index f01ff189..96e30b4 100644 --- a/ios/chrome/browser/ui/sharing/sharing_coordinator_unittest.mm +++ b/ios/chrome/browser/ui/sharing/sharing_coordinator_unittest.mm
@@ -18,13 +18,13 @@ #import "ios/chrome/browser/bookmarks/bookmark_model_factory.h" #import "ios/chrome/browser/browser_state/chrome_browser_state.h" #import "ios/chrome/browser/main/test_browser.h" +#import "ios/chrome/browser/ui/sharing/activity_services/activity_params.h" #import "ios/chrome/browser/ui/commands/bookmark_add_command.h" #import "ios/chrome/browser/ui/commands/bookmarks_commands.h" #import "ios/chrome/browser/ui/commands/command_dispatcher.h" #import "ios/chrome/browser/ui/commands/generate_qr_code_command.h" #import "ios/chrome/browser/ui/commands/qr_generation_commands.h" #import "ios/chrome/browser/ui/commands/snackbar_commands.h" -#import "ios/chrome/browser/ui/legacy_bookmarks/legacy_bookmark_edit_view_controller.h" #import "ios/chrome/browser/ui/main/scene_state.h" #import "ios/chrome/browser/ui/main/scene_state_browser_agent.h" #import "ios/chrome/browser/ui/sharing/activity_services/activity_params.h"
diff --git a/ios/chrome/browser/ui/tab_switcher/tab_grid/BUILD.gn b/ios/chrome/browser/ui/tab_switcher/tab_grid/BUILD.gn index 077d9d2..f170d3817 100644 --- a/ios/chrome/browser/ui/tab_switcher/tab_grid/BUILD.gn +++ b/ios/chrome/browser/ui/tab_switcher/tab_grid/BUILD.gn
@@ -46,6 +46,7 @@ "//ios/chrome/browser/tabs_search:tabs_search_factory", "//ios/chrome/browser/ui:feature_flags", "//ios/chrome/browser/ui/alert_coordinator", + "//ios/chrome/browser/ui/bookmarks", "//ios/chrome/browser/ui/bookmarks/editor", "//ios/chrome/browser/ui/commands", "//ios/chrome/browser/ui/commerce:price_card", @@ -55,7 +56,6 @@ "//ios/chrome/browser/ui/history", "//ios/chrome/browser/ui/history/public", "//ios/chrome/browser/ui/incognito_reauth:incognito_reauth_scene_agent", - "//ios/chrome/browser/ui/legacy_bookmarks", "//ios/chrome/browser/ui/main", "//ios/chrome/browser/ui/main:default_browser_scene_agent", "//ios/chrome/browser/ui/main:layout_guide_util",
diff --git a/ios/chrome/browser/ui/tab_switcher/tab_grid/tab_grid_coordinator.mm b/ios/chrome/browser/ui/tab_switcher/tab_grid/tab_grid_coordinator.mm index ad96a9f..6cafa00a 100644 --- a/ios/chrome/browser/ui/tab_switcher/tab_grid/tab_grid_coordinator.mm +++ b/ios/chrome/browser/ui/tab_switcher/tab_grid/tab_grid_coordinator.mm
@@ -22,6 +22,7 @@ #import "ios/chrome/browser/search_engines/template_url_service_factory.h" #import "ios/chrome/browser/sessions/ios_chrome_tab_restore_service_factory.h" #import "ios/chrome/browser/ui/alert_coordinator/action_sheet_coordinator.h" +#import "ios/chrome/browser/ui/bookmarks/bookmark_interaction_controller.h" #import "ios/chrome/browser/ui/bookmarks/editor/bookmarks_editor_coordinator.h" #import "ios/chrome/browser/ui/commands/application_commands.h" #import "ios/chrome/browser/ui/commands/bookmarks_commands.h" @@ -39,7 +40,6 @@ #import "ios/chrome/browser/ui/history/public/history_presentation_delegate.h" #import "ios/chrome/browser/ui/incognito_reauth/incognito_reauth_mediator.h" #import "ios/chrome/browser/ui/incognito_reauth/incognito_reauth_scene_agent.h" -#import "ios/chrome/browser/ui/legacy_bookmarks/legacy_bookmark_interaction_controller.h" #import "ios/chrome/browser/ui/main/bvc_container_view_controller.h" #import "ios/chrome/browser/ui/main/default_browser_scene_agent.h" #import "ios/chrome/browser/ui/main/layout_guide_util.h"
diff --git a/ios/chrome/browser/ui/toolbar/BUILD.gn b/ios/chrome/browser/ui/toolbar/BUILD.gn index 9882222..2e7a357 100644 --- a/ios/chrome/browser/ui/toolbar/BUILD.gn +++ b/ios/chrome/browser/ui/toolbar/BUILD.gn
@@ -46,13 +46,13 @@ "//ios/chrome/browser/search_engines", "//ios/chrome/browser/search_engines:search_engines_util", "//ios/chrome/browser/ui:feature_flags", + "//ios/chrome/browser/ui/bookmarks:core", "//ios/chrome/browser/ui/broadcaster", "//ios/chrome/browser/ui/commands", "//ios/chrome/browser/ui/coordinators:chrome_coordinators", "//ios/chrome/browser/ui/fullscreen", "//ios/chrome/browser/ui/gestures", "//ios/chrome/browser/ui/icons:symbols", - "//ios/chrome/browser/ui/legacy_bookmarks:core", "//ios/chrome/browser/ui/location_bar", "//ios/chrome/browser/ui/main:layout_guide_util", "//ios/chrome/browser/ui/main:scene_state_header",
diff --git a/ios/chrome/test/BUILD.gn b/ios/chrome/test/BUILD.gn index eedd8cf..48ef1a60 100644 --- a/ios/chrome/test/BUILD.gn +++ b/ios/chrome/test/BUILD.gn
@@ -280,6 +280,7 @@ "//ios/chrome/browser/ui/autofill/form_input_accessory:unit_tests", "//ios/chrome/browser/ui/autofill/manual_fill:unit_tests", "//ios/chrome/browser/ui/badges:unit_tests", + "//ios/chrome/browser/ui/bookmarks:unit_tests", "//ios/chrome/browser/ui/bookmarks/cells:unit_tests", "//ios/chrome/browser/ui/broadcaster:unit_tests", "//ios/chrome/browser/ui/browser_container:unit_tests", @@ -310,7 +311,6 @@ "//ios/chrome/browser/ui/infobars/banners:unit_tests", "//ios/chrome/browser/ui/infobars/modals/autofill_address_profile:unit_tests", "//ios/chrome/browser/ui/keyboard:unit_tests", - "//ios/chrome/browser/ui/legacy_bookmarks:unit_tests", "//ios/chrome/browser/ui/link_to_text:unit_tests", "//ios/chrome/browser/ui/list_model:unit_tests", "//ios/chrome/browser/ui/location_bar:unit_tests",
diff --git a/media/base/media_switches.cc b/media/base/media_switches.cc index b237270..b2c2e71c 100644 --- a/media/base/media_switches.cc +++ b/media/base/media_switches.cc
@@ -407,23 +407,15 @@ // playback going to a specific output device in the audio service. BASE_FEATURE(kChromeWideEchoCancellation, "ChromeWideEchoCancellation", -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) base::FEATURE_ENABLED_BY_DEFAULT); -#else - base::FEATURE_DISABLED_BY_DEFAULT); -#endif // If non-zero, audio processing is done on a dedicated processing thread which // receives audio from the audio capture thread via a fifo of a specified size. // Zero fifo size means the usage of such processing thread is disabled and // processing is done on the audio capture thread itself. const base::FeatureParam<int> kChromeWideEchoCancellationProcessingFifoSize{ - &kChromeWideEchoCancellation, "processing_fifo_size", -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) - 110 // Default value for the enabled feature. -#else - 0 -#endif + &kChromeWideEchoCancellation, "processing_fifo_size", + 110 // Default value for the enabled feature. }; // When audio processing is done in the audio process, at the renderer side IPC
diff --git a/media/gpu/v4l2/v4l2_jpeg_encode_accelerator.cc b/media/gpu/v4l2/v4l2_jpeg_encode_accelerator.cc index fbdff0a8..8a75d82c 100644 --- a/media/gpu/v4l2/v4l2_jpeg_encode_accelerator.cc +++ b/media/gpu/v4l2/v4l2_jpeg_encode_accelerator.cc
@@ -1805,16 +1805,16 @@ V4L2JpegEncodeAccelerator::V4L2JpegEncodeAccelerator( const scoped_refptr<base::SingleThreadTaskRunner>& io_task_runner) - : child_task_runner_(base::SingleThreadTaskRunner::GetCurrentDefault()), - io_task_runner_(io_task_runner), + : io_task_runner_(io_task_runner), client_(nullptr), encoder_thread_("V4L2JpegEncodeThread"), weak_factory_(this) { + DCHECK(io_task_runner_->BelongsToCurrentThread()); weak_ptr_ = weak_factory_.GetWeakPtr(); } V4L2JpegEncodeAccelerator::~V4L2JpegEncodeAccelerator() { - DCHECK(child_task_runner_->BelongsToCurrentThread()); + DCHECK(io_task_runner_->BelongsToCurrentThread()); if (encoder_thread_.IsRunning()) { encoder_task_runner_->PostTask( @@ -1841,8 +1841,8 @@ void V4L2JpegEncodeAccelerator::VideoFrameReady(int32_t task_id, size_t encoded_picture_size) { - if (!child_task_runner_->BelongsToCurrentThread()) { - child_task_runner_->PostTask( + if (!io_task_runner_->BelongsToCurrentThread()) { + io_task_runner_->PostTask( FROM_HERE, base::BindOnce(&V4L2JpegEncodeAccelerator::VideoFrameReady, weak_ptr_, task_id, encoded_picture_size)); return; @@ -1853,8 +1853,8 @@ } void V4L2JpegEncodeAccelerator::NotifyError(int32_t task_id, Status status) { - if (!child_task_runner_->BelongsToCurrentThread()) { - child_task_runner_->PostTask( + if (!io_task_runner_->BelongsToCurrentThread()) { + io_task_runner_->PostTask( FROM_HERE, base::BindOnce(&V4L2JpegEncodeAccelerator::NotifyError, weak_ptr_, task_id, status)); @@ -1867,7 +1867,7 @@ void V4L2JpegEncodeAccelerator::InitializeOnTaskRunner( chromeos_camera::JpegEncodeAccelerator::Client* client, chromeos_camera::JpegEncodeAccelerator::InitCB init_cb) { - DCHECK(child_task_runner_->BelongsToCurrentThread()); + DCHECK(io_task_runner_->BelongsToCurrentThread()); std::unique_ptr<EncodedInstanceDmaBuf> encoded_device( new EncodedInstanceDmaBuf(this)); @@ -1895,9 +1895,9 @@ void V4L2JpegEncodeAccelerator::InitializeAsync( chromeos_camera::JpegEncodeAccelerator::Client* client, chromeos_camera::JpegEncodeAccelerator::InitCB init_cb) { - DCHECK(child_task_runner_->BelongsToCurrentThread()); + DCHECK(io_task_runner_->BelongsToCurrentThread()); - child_task_runner_->PostTask( + io_task_runner_->PostTask( FROM_HERE, base::BindOnce(&V4L2JpegEncodeAccelerator::InitializeOnTaskRunner, weak_ptr_, client, BindToCurrentLoop(std::move(init_cb))));
diff --git a/media/gpu/v4l2/v4l2_jpeg_encode_accelerator.h b/media/gpu/v4l2/v4l2_jpeg_encode_accelerator.h index 9e4115f..4d2dff7c 100644 --- a/media/gpu/v4l2/v4l2_jpeg_encode_accelerator.h +++ b/media/gpu/v4l2/v4l2_jpeg_encode_accelerator.h
@@ -404,9 +404,6 @@ // TODO(wtlee): To be deprecated. (crbug.com/944705) int latest_quality_legacy_; - // ChildThread's task runner. - scoped_refptr<base::SingleThreadTaskRunner> child_task_runner_; - // GPU IO task runner. scoped_refptr<base::SingleThreadTaskRunner> io_task_runner_;
diff --git a/media/gpu/v4l2/v4l2_mjpeg_decode_accelerator.cc b/media/gpu/v4l2/v4l2_mjpeg_decode_accelerator.cc index 05f8911ef..b215268 100644 --- a/media/gpu/v4l2/v4l2_mjpeg_decode_accelerator.cc +++ b/media/gpu/v4l2/v4l2_mjpeg_decode_accelerator.cc
@@ -263,7 +263,6 @@ const scoped_refptr<base::SingleThreadTaskRunner>& io_task_runner) : output_buffer_pixelformat_(0), output_buffer_num_planes_(0), - child_task_runner_(base::SingleThreadTaskRunner::GetCurrentDefault()), io_task_runner_(io_task_runner), client_(nullptr), device_(device), @@ -272,11 +271,12 @@ input_streamon_(false), output_streamon_(false), weak_factory_(this) { + DCHECK(io_task_runner_->BelongsToCurrentThread()); weak_ptr_ = weak_factory_.GetWeakPtr(); } V4L2MjpegDecodeAccelerator::~V4L2MjpegDecodeAccelerator() { - DCHECK(child_task_runner_->BelongsToCurrentThread()); + DCHECK(io_task_runner_->BelongsToCurrentThread()); if (decoder_thread_.IsRunning()) { decoder_task_runner_->PostTask( @@ -303,18 +303,18 @@ } void V4L2MjpegDecodeAccelerator::VideoFrameReady(int32_t task_id) { - DCHECK(child_task_runner_->BelongsToCurrentThread()); + DCHECK(io_task_runner_->BelongsToCurrentThread()); client_->VideoFrameReady(task_id); } void V4L2MjpegDecodeAccelerator::NotifyError(int32_t task_id, Error error) { - DCHECK(child_task_runner_->BelongsToCurrentThread()); + DCHECK(io_task_runner_->BelongsToCurrentThread()); VLOGF(1) << "Notifying of error " << error << " for task id " << task_id; client_->NotifyError(task_id, error); } void V4L2MjpegDecodeAccelerator::PostNotifyError(int32_t task_id, Error error) { - child_task_runner_->PostTask( + io_task_runner_->PostTask( FROM_HERE, base::BindOnce(&V4L2MjpegDecodeAccelerator::NotifyError, weak_ptr_, task_id, error)); } @@ -322,7 +322,7 @@ void V4L2MjpegDecodeAccelerator::InitializeOnTaskRunner( chromeos_camera::MjpegDecodeAccelerator::Client* client, chromeos_camera::MjpegDecodeAccelerator::InitCB init_cb) { - DCHECK(child_task_runner_->BelongsToCurrentThread()); + DCHECK(io_task_runner_->BelongsToCurrentThread()); if (!device_->Open(V4L2Device::Type::kJpegDecoder, V4L2_PIX_FMT_JPEG)) { VLOGF(1) << "Failed to open device"; std::move(init_cb).Run(false); @@ -374,11 +374,11 @@ void V4L2MjpegDecodeAccelerator::InitializeAsync( chromeos_camera::MjpegDecodeAccelerator::Client* client, chromeos_camera::MjpegDecodeAccelerator::InitCB init_cb) { - DCHECK(child_task_runner_->BelongsToCurrentThread()); + DCHECK(io_task_runner_->BelongsToCurrentThread()); // To guarantee that the caller receives an asynchronous call after the // return path, we are making use of InitializeOnTaskRunner. - child_task_runner_->PostTask( + io_task_runner_->PostTask( FROM_HERE, base::BindOnce(&V4L2MjpegDecodeAccelerator::InitializeOnTaskRunner, weak_factory_.GetWeakPtr(), client, @@ -1112,7 +1112,7 @@ // prevent race condition on the buffers. const int32_t task_id = job_record->task_id(); job_record.reset(); - child_task_runner_->PostTask( + io_task_runner_->PostTask( FROM_HERE, base::BindOnce(&V4L2MjpegDecodeAccelerator::VideoFrameReady, weak_ptr_, task_id));
diff --git a/media/gpu/v4l2/v4l2_mjpeg_decode_accelerator.h b/media/gpu/v4l2/v4l2_mjpeg_decode_accelerator.h index 7bfe8b3..cd5fc1d 100644 --- a/media/gpu/v4l2/v4l2_mjpeg_decode_accelerator.h +++ b/media/gpu/v4l2/v4l2_mjpeg_decode_accelerator.h
@@ -142,9 +142,6 @@ // Strides of the output buffers. size_t output_strides_[VIDEO_MAX_PLANES]; - // ChildThread's task runner. - scoped_refptr<base::SingleThreadTaskRunner> child_task_runner_; - // GPU IO task runner. scoped_refptr<base::SingleThreadTaskRunner> io_task_runner_;
diff --git a/media/gpu/vaapi/vaapi_jpeg_encode_accelerator.cc b/media/gpu/vaapi/vaapi_jpeg_encode_accelerator.cc index ab9cbb8..d32c1184 100644 --- a/media/gpu/vaapi/vaapi_jpeg_encode_accelerator.cc +++ b/media/gpu/vaapi/vaapi_jpeg_encode_accelerator.cc
@@ -451,10 +451,10 @@ VaapiJpegEncodeAccelerator::VaapiJpegEncodeAccelerator( scoped_refptr<base::SingleThreadTaskRunner> io_task_runner) - : task_runner_(base::SingleThreadTaskRunner::GetCurrentDefault()), - io_task_runner_(std::move(io_task_runner)), + : io_task_runner_(std::move(io_task_runner)), encoder_thread_("VaapiJpegEncoderThread"), weak_this_factory_(this) { + DCHECK(io_task_runner_->BelongsToCurrentThread()); VLOGF(2); weak_this_ = weak_this_factory_.GetWeakPtr(); } @@ -466,7 +466,7 @@ } VaapiJpegEncodeAccelerator::~VaapiJpegEncodeAccelerator() { - DCHECK(task_runner_->BelongsToCurrentThread()); + DCHECK(io_task_runner_->BelongsToCurrentThread()); VLOGF(2) << "Destroying VaapiJpegEncodeAccelerator"; weak_this_factory_.InvalidateWeakPtrs(); @@ -483,7 +483,7 @@ } void VaapiJpegEncodeAccelerator::NotifyError(int32_t task_id, Status status) { - DCHECK(task_runner_->BelongsToCurrentThread()); + DCHECK(io_task_runner_->BelongsToCurrentThread()); VLOGF(1) << "task_id=" << task_id << ", status=" << status; DCHECK(client_); client_->NotifyError(task_id, status); @@ -492,7 +492,7 @@ void VaapiJpegEncodeAccelerator::VideoFrameReady(int32_t task_id, size_t encoded_picture_size) { DVLOGF(4) << "task_id=" << task_id << ", size=" << encoded_picture_size; - DCHECK(task_runner_->BelongsToCurrentThread()); + DCHECK(io_task_runner_->BelongsToCurrentThread()); ReportToVAJEAEncodeResultUMA(VAJEAEncoderResult::kSuccess); client_->VideoFrameReady(task_id, encoded_picture_size); @@ -541,10 +541,10 @@ encoder_ = std::make_unique<Encoder>( std::move(vaapi_wrapper), std::move(vpp_vaapi_wrapper), BindPostTask( - task_runner_, + io_task_runner_, base::BindRepeating(&VaapiJpegEncodeAccelerator::VideoFrameReady, weak_this_)), - BindPostTask(task_runner_, + BindPostTask(io_task_runner_, base::BindRepeating(&VaapiJpegEncodeAccelerator::NotifyError, weak_this_))); @@ -554,7 +554,7 @@ void VaapiJpegEncodeAccelerator::InitializeOnTaskRunner( chromeos_camera::JpegEncodeAccelerator::Client* client, chromeos_camera::JpegEncodeAccelerator::InitCB init_cb) { - DCHECK(task_runner_->BelongsToCurrentThread()); + DCHECK(io_task_runner_->BelongsToCurrentThread()); client_ = client; if (!encoder_thread_.Start()) { @@ -578,11 +578,11 @@ chromeos_camera::JpegEncodeAccelerator::Client* client, chromeos_camera::JpegEncodeAccelerator::InitCB init_cb) { VLOGF(2); - DCHECK(task_runner_->BelongsToCurrentThread()); + DCHECK(io_task_runner_->BelongsToCurrentThread()); // To guarantee that the caller receives an asynchronous call after the // return path, we are making use of InitializeOnTaskRunner. - task_runner_->PostTask( + io_task_runner_->PostTask( FROM_HERE, base::BindOnce(&VaapiJpegEncodeAccelerator::InitializeOnTaskRunner, weak_this_, client, @@ -607,7 +607,7 @@ // TODO(shenghao): support other YUV formats. if (video_frame->format() != VideoPixelFormat::PIXEL_FORMAT_I420) { VLOGF(1) << "Unsupported input format: " << video_frame->format(); - task_runner_->PostTask( + io_task_runner_->PostTask( FROM_HERE, base::BindOnce(&VaapiJpegEncodeAccelerator::NotifyError, weak_this_, task_id, INVALID_ARGUMENT)); return; @@ -620,14 +620,14 @@ exif_region.MapAt(exif_buffer->offset(), exif_buffer->size()); if (!exif_mapping.IsValid()) { VLOGF(1) << "Failed to map exif buffer"; - task_runner_->PostTask( + io_task_runner_->PostTask( FROM_HERE, base::BindOnce(&VaapiJpegEncodeAccelerator::NotifyError, weak_this_, task_id, PLATFORM_FAILURE)); return; } if (exif_mapping.size() > kMaxMarkerSizeAllowed) { VLOGF(1) << "Exif buffer too big: " << exif_mapping.size(); - task_runner_->PostTask( + io_task_runner_->PostTask( FROM_HERE, base::BindOnce(&VaapiJpegEncodeAccelerator::NotifyError, weak_this_, task_id, INVALID_ARGUMENT)); return; @@ -639,7 +639,7 @@ output_region.MapAt(output_buffer.offset(), output_buffer.size()); if (!output_mapping.IsValid()) { VLOGF(1) << "Failed to map output buffer"; - task_runner_->PostTask( + io_task_runner_->PostTask( FROM_HERE, base::BindOnce(&VaapiJpegEncodeAccelerator::NotifyError, weak_this_, task_id, INACCESSIBLE_OUTPUT_BUFFER)); @@ -669,14 +669,14 @@ // TODO(wtlee): Supports other formats. if (input_frame->format() != VideoPixelFormat::PIXEL_FORMAT_NV12) { VLOGF(1) << "Unsupported input format: " << input_frame->format(); - task_runner_->PostTask( + io_task_runner_->PostTask( FROM_HERE, base::BindOnce(&VaapiJpegEncodeAccelerator::NotifyError, weak_this_, task_id, INVALID_ARGUMENT)); return; } if (output_frame->format() != VideoPixelFormat::PIXEL_FORMAT_MJPEG) { VLOGF(1) << "Unsupported output format: " << output_frame->format(); - task_runner_->PostTask( + io_task_runner_->PostTask( FROM_HERE, base::BindOnce(&VaapiJpegEncodeAccelerator::NotifyError, weak_this_, task_id, INVALID_ARGUMENT)); return; @@ -689,14 +689,14 @@ exif_region.MapAt(exif_buffer->offset(), exif_buffer->size()); if (!exif_mapping.IsValid()) { LOG(ERROR) << "Failed to map exif buffer"; - task_runner_->PostTask( + io_task_runner_->PostTask( FROM_HERE, base::BindOnce(&VaapiJpegEncodeAccelerator::NotifyError, weak_this_, task_id, PLATFORM_FAILURE)); return; } if (exif_mapping.size() > kMaxMarkerSizeAllowed) { LOG(ERROR) << "Exif buffer too big: " << exif_mapping.size(); - task_runner_->PostTask( + io_task_runner_->PostTask( FROM_HERE, base::BindOnce(&VaapiJpegEncodeAccelerator::NotifyError, weak_this_, task_id, INVALID_ARGUMENT)); return;
diff --git a/media/gpu/vaapi/vaapi_jpeg_encode_accelerator.h b/media/gpu/vaapi/vaapi_jpeg_encode_accelerator.h index 42777b8..5d095ef4 100644 --- a/media/gpu/vaapi/vaapi_jpeg_encode_accelerator.h +++ b/media/gpu/vaapi/vaapi_jpeg_encode_accelerator.h
@@ -97,9 +97,6 @@ void VideoFrameReady(int32_t task_id, size_t encoded_picture_size); - // ChildThread's task runner. - scoped_refptr<base::SingleThreadTaskRunner> task_runner_; - // GPU IO task runner. scoped_refptr<base::SingleThreadTaskRunner> io_task_runner_;
diff --git a/media/gpu/vaapi/vaapi_mjpeg_decode_accelerator.cc b/media/gpu/vaapi/vaapi_mjpeg_decode_accelerator.cc index 138fa237..b139689 100644 --- a/media/gpu/vaapi/vaapi_mjpeg_decode_accelerator.cc +++ b/media/gpu/vaapi/vaapi_mjpeg_decode_accelerator.cc
@@ -89,8 +89,8 @@ } // namespace void VaapiMjpegDecodeAccelerator::NotifyError(int32_t task_id, Error error) { - if (!task_runner_->BelongsToCurrentThread()) { - task_runner_->PostTask( + if (!io_task_runner_->BelongsToCurrentThread()) { + io_task_runner_->PostTask( FROM_HERE, base::BindOnce(&VaapiMjpegDecodeAccelerator::NotifyError, weak_this_factory_.GetWeakPtr(), task_id, error)); @@ -106,7 +106,7 @@ } void VaapiMjpegDecodeAccelerator::VideoFrameReady(int32_t task_id) { - DCHECK(task_runner_->BelongsToCurrentThread()); + DCHECK(io_task_runner_->BelongsToCurrentThread()); ReportToVAJDAResponseToClientUMA( chromeos_camera::MjpegDecodeAccelerator::Error::NO_ERRORS); client_->VideoFrameReady(task_id); @@ -114,11 +114,12 @@ VaapiMjpegDecodeAccelerator::VaapiMjpegDecodeAccelerator( const scoped_refptr<base::SingleThreadTaskRunner>& io_task_runner) - : task_runner_(base::SingleThreadTaskRunner::GetCurrentDefault()), - io_task_runner_(io_task_runner), + : io_task_runner_(io_task_runner), client_(nullptr), decoder_thread_("VaapiMjpegDecoderThread"), - weak_this_factory_(this) {} + weak_this_factory_(this) { + DCHECK(io_task_runner_->BelongsToCurrentThread()); +} // Some members expect to be destroyed on the |decoder_thread_|. void VaapiMjpegDecodeAccelerator::CleanUpOnDecoderThread() { @@ -130,7 +131,7 @@ } VaapiMjpegDecodeAccelerator::~VaapiMjpegDecodeAccelerator() { - DCHECK(task_runner_->BelongsToCurrentThread()); + DCHECK(io_task_runner_->BelongsToCurrentThread()); VLOGF(2) << "Destroying VaapiMjpegDecodeAccelerator"; weak_this_factory_.InvalidateWeakPtrs(); @@ -182,7 +183,7 @@ void VaapiMjpegDecodeAccelerator::InitializeOnTaskRunner( chromeos_camera::MjpegDecodeAccelerator::Client* client, chromeos_camera::MjpegDecodeAccelerator::InitCB init_cb) { - DCHECK(task_runner_->BelongsToCurrentThread()); + DCHECK(io_task_runner_->BelongsToCurrentThread()); client_ = client; if (!decoder_thread_.Start()) { @@ -205,11 +206,11 @@ chromeos_camera::MjpegDecodeAccelerator::Client* client, chromeos_camera::MjpegDecodeAccelerator::InitCB init_cb) { VLOGF(2); - DCHECK(task_runner_->BelongsToCurrentThread()); + DCHECK(io_task_runner_->BelongsToCurrentThread()); // To guarantee that the caller receives an asynchronous call after the // return path, we are making use of InitializeOnTaskRunner. - task_runner_->PostTask( + io_task_runner_->PostTask( FROM_HERE, base::BindOnce(&VaapiMjpegDecodeAccelerator::InitializeOnTaskRunner, weak_this_factory_.GetWeakPtr(), client, @@ -328,7 +329,7 @@ base::OnceClosure cb, scoped_refptr<VideoFrame> frame) { runner->PostTask(FROM_HERE, std::move(cb)); }, - task_runner_, + io_task_runner_, base::BindOnce(&VaapiMjpegDecodeAccelerator::VideoFrameReady, weak_this_factory_.GetWeakPtr(), task_id))); return true; @@ -395,7 +396,7 @@ return false; } - task_runner_->PostTask( + io_task_runner_->PostTask( FROM_HERE, base::BindOnce(&VaapiMjpegDecodeAccelerator::VideoFrameReady, weak_this_factory_.GetWeakPtr(), task_id));
diff --git a/media/gpu/vaapi/vaapi_mjpeg_decode_accelerator.h b/media/gpu/vaapi/vaapi_mjpeg_decode_accelerator.h index d16821d..48122c0 100644 --- a/media/gpu/vaapi/vaapi_mjpeg_decode_accelerator.h +++ b/media/gpu/vaapi/vaapi_mjpeg_decode_accelerator.h
@@ -119,9 +119,6 @@ void CleanUpOnDecoderThread(); - // ChildThread's task runner. - const scoped_refptr<base::SingleThreadTaskRunner> task_runner_; - // GPU IO task runner. const scoped_refptr<base::SingleThreadTaskRunner> io_task_runner_;
diff --git a/media/gpu/vaapi/vaapi_picture_native_pixmap_angle.cc b/media/gpu/vaapi/vaapi_picture_native_pixmap_angle.cc index 1b19000..8920b92fc 100644 --- a/media/gpu/vaapi/vaapi_picture_native_pixmap_angle.cc +++ b/media/gpu/vaapi/vaapi_picture_native_pixmap_angle.cc
@@ -76,7 +76,7 @@ VaapiPictureNativePixmapAngle::~VaapiPictureNativePixmapAngle() { DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); if (gl_image_ && make_context_current_cb_.Run()) { - gl_image_->ReleaseTexImage(texture_target_); + gl_image_->ReleaseEGLImage(); DCHECK_EQ(glGetError(), static_cast<GLenum>(GL_NO_ERROR)); } @@ -145,7 +145,7 @@ // GL needs to re-bind the texture after the pixmap content is updated so that // the compositor sees the updated contents (we found this out experimentally) - gl_image_->ReleaseTexImage(texture_target_); + gl_image_->ReleaseEGLImage(); DCHECK(gfx::Rect(va_surface->size()).Contains(gfx::Rect(visible_size_))); if (!vaapi_wrapper_->PutSurfaceIntoPixmap(va_surface->id(), x_pixmap_,
diff --git a/media/gpu/vaapi/vaapi_picture_native_pixmap_angle.h b/media/gpu/vaapi/vaapi_picture_native_pixmap_angle.h index b7e95db..d885bb0 100644 --- a/media/gpu/vaapi/vaapi_picture_native_pixmap_angle.h +++ b/media/gpu/vaapi/vaapi_picture_native_pixmap_angle.h
@@ -16,7 +16,7 @@ #include "ui/gl/gl_bindings.h" namespace gl { -class GLImage; +class GLImageEGLPixmap; } namespace media { @@ -57,7 +57,7 @@ x11::Pixmap x_pixmap_ = x11::Pixmap::None; // GLImage bound to the GL textures used by the VDA client. - scoped_refptr<gl::GLImage> gl_image_; + scoped_refptr<gl::GLImageEGLPixmap> gl_image_; }; } // namespace media
diff --git a/media/gpu/vaapi/vaapi_picture_native_pixmap_egl.cc b/media/gpu/vaapi/vaapi_picture_native_pixmap_egl.cc index 4098b3a..91845f5 100644 --- a/media/gpu/vaapi/vaapi_picture_native_pixmap_egl.cc +++ b/media/gpu/vaapi/vaapi_picture_native_pixmap_egl.cc
@@ -44,7 +44,6 @@ VaapiPictureNativePixmapEgl::~VaapiPictureNativePixmapEgl() { DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); if (gl_image_ && make_context_current_cb_.Run()) { - gl_image_->ReleaseTexImage(texture_target_); DCHECK_EQ(glGetError(), static_cast<GLenum>(GL_NO_ERROR)); }
diff --git a/media/gpu/vaapi/vaapi_picture_native_pixmap_egl.h b/media/gpu/vaapi/vaapi_picture_native_pixmap_egl.h index 7f2385f3..7942cd8 100644 --- a/media/gpu/vaapi/vaapi_picture_native_pixmap_egl.h +++ b/media/gpu/vaapi/vaapi_picture_native_pixmap_egl.h
@@ -18,7 +18,7 @@ } // namespace gfx namespace gl { -class GLImage; +class GLImageNativePixmap; } namespace media { @@ -56,7 +56,7 @@ VaapiStatus Initialize(scoped_refptr<gfx::NativePixmap> pixmap); // GLImage bound to the GL textures used by the VDA client. - scoped_refptr<gl::GLImage> gl_image_; + scoped_refptr<gl::GLImageNativePixmap> gl_image_; }; } // namespace media
diff --git a/media/gpu/vaapi/vaapi_picture_native_pixmap_ozone.cc b/media/gpu/vaapi/vaapi_picture_native_pixmap_ozone.cc index 0b646a87f5..afd222d 100644 --- a/media/gpu/vaapi/vaapi_picture_native_pixmap_ozone.cc +++ b/media/gpu/vaapi/vaapi_picture_native_pixmap_ozone.cc
@@ -50,7 +50,6 @@ VaapiPictureNativePixmapOzone::~VaapiPictureNativePixmapOzone() { DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); if (gl_image_ && make_context_current_cb_.Run()) { - gl_image_->ReleaseTexImage(texture_target_); DCHECK_EQ(glGetError(), static_cast<GLenum>(GL_NO_ERROR)); }
diff --git a/media/gpu/vaapi/vaapi_picture_native_pixmap_ozone.h b/media/gpu/vaapi/vaapi_picture_native_pixmap_ozone.h index a2c1d2e..101728f3 100644 --- a/media/gpu/vaapi/vaapi_picture_native_pixmap_ozone.h +++ b/media/gpu/vaapi/vaapi_picture_native_pixmap_ozone.h
@@ -18,7 +18,7 @@ } // namespace gfx namespace gl { -class GLImage; +class GLImageNativePixmap; } namespace media { @@ -55,7 +55,7 @@ VaapiStatus Initialize(scoped_refptr<gfx::NativePixmap> pixmap); // GLImage bound to the GL textures used by the VDA client. - scoped_refptr<gl::GLImage> gl_image_; + scoped_refptr<gl::GLImageNativePixmap> gl_image_; }; } // namespace media
diff --git a/media/gpu/windows/gl_image_egl_stream.cc b/media/gpu/windows/gl_image_egl_stream.cc index 3189fcf..4bd2c33 100644 --- a/media/gpu/windows/gl_image_egl_stream.cc +++ b/media/gpu/windows/gl_image_egl_stream.cc
@@ -42,8 +42,6 @@ uint64_t process_tracing_id, const std::string& dump_name) {} -void GLImageEGLStream::ReleaseTexImage(unsigned target) {} - void GLImageEGLStream::SetTexture( const Microsoft::WRL::ComPtr<ID3D11Texture2D>& texture, size_t level) {
diff --git a/media/gpu/windows/gl_image_egl_stream.h b/media/gpu/windows/gl_image_egl_stream.h index c74ce2d..675cd13 100644 --- a/media/gpu/windows/gl_image_egl_stream.h +++ b/media/gpu/windows/gl_image_egl_stream.h
@@ -28,7 +28,6 @@ void OnMemoryDump(base::trace_event::ProcessMemoryDump* pmd, uint64_t process_tracing_id, const std::string& dump_name) override; - void ReleaseTexImage(unsigned target) override; Microsoft::WRL::ComPtr<ID3D11Texture2D> texture() { return texture_; } size_t level() const { return level_; }
diff --git a/media/gpu/windows/gl_image_pbuffer.cc b/media/gpu/windows/gl_image_pbuffer.cc index 3253261..72768b7 100644 --- a/media/gpu/windows/gl_image_pbuffer.cc +++ b/media/gpu/windows/gl_image_pbuffer.cc
@@ -30,7 +30,6 @@ bool GLImagePbuffer::BindTexImage(unsigned target) { return true; } -void ReleaseTexImage(unsigned target) {} void SetColorSpace(const gfx::ColorSpace& color_space) {} void OnMemoryDump(base::trace_event::ProcessMemoryDump* pmd, uint64_t process_tracing_id,
diff --git a/media/gpu/windows/gl_image_pbuffer.h b/media/gpu/windows/gl_image_pbuffer.h index 994d0b0..f2f6bbe 100644 --- a/media/gpu/windows/gl_image_pbuffer.h +++ b/media/gpu/windows/gl_image_pbuffer.h
@@ -25,7 +25,6 @@ unsigned GetDataType() override; gl::GLImage::Type GetType() const override; bool BindTexImage(unsigned target) override; - void ReleaseTexImage(unsigned target) override {} void OnMemoryDump(base::trace_event::ProcessMemoryDump* pmd, uint64_t process_tracing_id, const std::string& dump_name) override {}
diff --git a/mojo/public/cpp/base/read_only_file_mojom_traits.cc b/mojo/public/cpp/base/read_only_file_mojom_traits.cc index 7b3e3b18..5fb4fbc 100644 --- a/mojo/public/cpp/base/read_only_file_mojom_traits.cc +++ b/mojo/public/cpp/base/read_only_file_mojom_traits.cc
@@ -79,7 +79,7 @@ mojo::PlatformHandle StructTraits<mojo_base::mojom::ReadOnlyFileDataView, base::File>::fd(base::File& file) { - DCHECK(file.IsValid()); + CHECK(file.IsValid()); // For now we require real files as on some platforms it is too difficult to // be sure that more general handles cannot be written or made writable. This // could be relaxed if an interface needs readonly pipes. This check may block
diff --git a/services/tracing/public/cpp/stack_sampling/tracing_sampler_profiler.cc b/services/tracing/public/cpp/stack_sampling/tracing_sampler_profiler.cc index 1cc3da1..e61c258 100644 --- a/services/tracing/public/cpp/stack_sampling/tracing_sampler_profiler.cc +++ b/services/tracing/public/cpp/stack_sampling/tracing_sampler_profiler.cc
@@ -373,8 +373,9 @@ #endif }; -#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) && defined(_WIN64) || \ - ANDROID_ARM64_UNWINDING_SUPPORTED || ANDROID_CFI_UNWINDING_SUPPORTED +#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) && defined(_WIN64) || \ + ANDROID_ARM64_UNWINDING_SUPPORTED || ANDROID_CFI_UNWINDING_SUPPORTED || \ + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) // Returns whether stack sampling is supported on the current platform. bool IsStackSamplingSupported() { return base::StackSamplingProfiler::IsSupportedForCurrentPlatform(); @@ -801,8 +802,9 @@ // static bool TracingSamplerProfiler::IsStackUnwindingSupportedForTesting() { -#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) && defined(_WIN64) || \ - ANDROID_ARM64_UNWINDING_SUPPORTED || ANDROID_CFI_UNWINDING_SUPPORTED +#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) && defined(_WIN64) || \ + ANDROID_ARM64_UNWINDING_SUPPORTED || ANDROID_CFI_UNWINDING_SUPPORTED || \ + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) return IsStackSamplingSupported(); #else return false;
diff --git a/testing/buildbot/chromium.chromiumos.json b/testing/buildbot/chromium.chromiumos.json index 6ce9bda..e6a6304 100644 --- a/testing/buildbot/chromium.chromiumos.json +++ b/testing/buildbot/chromium.chromiumos.json
@@ -5838,9 +5838,9 @@ { "args": [ "--test-launcher-filter-file=../../testing/buildbot/filters/linux-lacros.interactive_ui_tests.filter;../../testing/buildbot/filters/linux-lacros.interactive_ui_tests.skew.filter", - "--ash-chrome-path-override=../../lacros_version_skew_tests_v111.0.5533.0/test_ash_chrome" + "--ash-chrome-path-override=../../lacros_version_skew_tests_v111.0.5534.0/test_ash_chrome" ], - "description": "Run with ash-chrome version 111.0.5533.0", + "description": "Run with ash-chrome version 111.0.5534.0", "isolate_profile_data": true, "merge": { "args": [], @@ -5852,8 +5852,8 @@ "cipd_packages": [ { "cipd_package": "chromium/testing/linux-ash-chromium/x86_64/ash.zip", - "location": "lacros_version_skew_tests_v111.0.5533.0", - "revision": "version:111.0.5533.0" + "location": "lacros_version_skew_tests_v111.0.5534.0", + "revision": "version:111.0.5534.0" } ], "dimension_sets": [ @@ -6009,9 +6009,9 @@ { "args": [ "--test-launcher-filter-file=../../testing/buildbot/filters/linux-lacros.lacros_chrome_browsertests.skew.filter", - "--ash-chrome-path-override=../../lacros_version_skew_tests_v111.0.5533.0/test_ash_chrome" + "--ash-chrome-path-override=../../lacros_version_skew_tests_v111.0.5534.0/test_ash_chrome" ], - "description": "Run with ash-chrome version 111.0.5533.0", + "description": "Run with ash-chrome version 111.0.5534.0", "isolate_profile_data": true, "merge": { "args": [], @@ -6023,8 +6023,8 @@ "cipd_packages": [ { "cipd_package": "chromium/testing/linux-ash-chromium/x86_64/ash.zip", - "location": "lacros_version_skew_tests_v111.0.5533.0", - "revision": "version:111.0.5533.0" + "location": "lacros_version_skew_tests_v111.0.5534.0", + "revision": "version:111.0.5534.0" } ], "dimension_sets": [ @@ -6161,9 +6161,9 @@ { "args": [ "--test-launcher-filter-file=../../testing/buildbot/filters/linux-lacros.lacros_chrome_browsertests.skew.filter", - "--ash-chrome-path-override=../../lacros_version_skew_tests_v111.0.5533.0/test_ash_chrome" + "--ash-chrome-path-override=../../lacros_version_skew_tests_v111.0.5534.0/test_ash_chrome" ], - "description": "Run with ash-chrome version 111.0.5533.0", + "description": "Run with ash-chrome version 111.0.5534.0", "isolate_profile_data": true, "merge": { "args": [], @@ -6175,8 +6175,8 @@ "cipd_packages": [ { "cipd_package": "chromium/testing/linux-ash-chromium/x86_64/ash.zip", - "location": "lacros_version_skew_tests_v111.0.5533.0", - "revision": "version:111.0.5533.0" + "location": "lacros_version_skew_tests_v111.0.5534.0", + "revision": "version:111.0.5534.0" } ], "dimension_sets": [
diff --git a/testing/buildbot/chromium.clang.json b/testing/buildbot/chromium.clang.json index cbca2ab..f81d9c0 100644 --- a/testing/buildbot/chromium.clang.json +++ b/testing/buildbot/chromium.clang.json
@@ -6954,8 +6954,7 @@ { "args": [ "--gs-results-bucket=chromium-result-details", - "--recover-devices", - "--test-launcher-filter-file=../../testing/buildbot/filters/android.pie_tot.services_unittests.filter" + "--recover-devices" ], "merge": { "args": [
diff --git a/testing/buildbot/chromium.fyi.json b/testing/buildbot/chromium.fyi.json index 66bc064a..94d27d4 100644 --- a/testing/buildbot/chromium.fyi.json +++ b/testing/buildbot/chromium.fyi.json
@@ -83291,9 +83291,9 @@ { "args": [ "--test-launcher-filter-file=../../testing/buildbot/filters/linux-lacros.interactive_ui_tests.filter;../../testing/buildbot/filters/linux-lacros.interactive_ui_tests.skew.filter", - "--ash-chrome-path-override=../../lacros_version_skew_tests_v111.0.5533.0/test_ash_chrome" + "--ash-chrome-path-override=../../lacros_version_skew_tests_v111.0.5534.0/test_ash_chrome" ], - "description": "Run with ash-chrome version 111.0.5533.0", + "description": "Run with ash-chrome version 111.0.5534.0", "isolate_profile_data": true, "merge": { "args": [], @@ -83305,8 +83305,8 @@ "cipd_packages": [ { "cipd_package": "chromium/testing/linux-ash-chromium/x86_64/ash.zip", - "location": "lacros_version_skew_tests_v111.0.5533.0", - "revision": "version:111.0.5533.0" + "location": "lacros_version_skew_tests_v111.0.5534.0", + "revision": "version:111.0.5534.0" } ], "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com", @@ -83432,9 +83432,9 @@ { "args": [ "--test-launcher-filter-file=../../testing/buildbot/filters/linux-lacros.lacros_chrome_browsertests.skew.filter", - "--ash-chrome-path-override=../../lacros_version_skew_tests_v111.0.5533.0/test_ash_chrome" + "--ash-chrome-path-override=../../lacros_version_skew_tests_v111.0.5534.0/test_ash_chrome" ], - "description": "Run with ash-chrome version 111.0.5533.0", + "description": "Run with ash-chrome version 111.0.5534.0", "isolate_profile_data": true, "merge": { "args": [], @@ -83446,8 +83446,8 @@ "cipd_packages": [ { "cipd_package": "chromium/testing/linux-ash-chromium/x86_64/ash.zip", - "location": "lacros_version_skew_tests_v111.0.5533.0", - "revision": "version:111.0.5533.0" + "location": "lacros_version_skew_tests_v111.0.5534.0", + "revision": "version:111.0.5534.0" } ], "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" @@ -83559,9 +83559,9 @@ { "args": [ "--test-launcher-filter-file=../../testing/buildbot/filters/linux-lacros.lacros_chrome_browsertests.skew.filter", - "--ash-chrome-path-override=../../lacros_version_skew_tests_v111.0.5533.0/test_ash_chrome" + "--ash-chrome-path-override=../../lacros_version_skew_tests_v111.0.5534.0/test_ash_chrome" ], - "description": "Run with ash-chrome version 111.0.5533.0", + "description": "Run with ash-chrome version 111.0.5534.0", "isolate_profile_data": true, "merge": { "args": [], @@ -83573,8 +83573,8 @@ "cipd_packages": [ { "cipd_package": "chromium/testing/linux-ash-chromium/x86_64/ash.zip", - "location": "lacros_version_skew_tests_v111.0.5533.0", - "revision": "version:111.0.5533.0" + "location": "lacros_version_skew_tests_v111.0.5534.0", + "revision": "version:111.0.5534.0" } ], "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com", @@ -84907,9 +84907,9 @@ { "args": [ "--test-launcher-filter-file=../../testing/buildbot/filters/linux-lacros.interactive_ui_tests.filter;../../testing/buildbot/filters/linux-lacros.interactive_ui_tests.skew.filter", - "--ash-chrome-path-override=../../lacros_version_skew_tests_v111.0.5533.0/test_ash_chrome" + "--ash-chrome-path-override=../../lacros_version_skew_tests_v111.0.5534.0/test_ash_chrome" ], - "description": "Run with ash-chrome version 111.0.5533.0", + "description": "Run with ash-chrome version 111.0.5534.0", "merge": { "args": [], "script": "//testing/merge_scripts/standard_gtest_merge.py" @@ -84920,8 +84920,8 @@ "cipd_packages": [ { "cipd_package": "chromium/testing/linux-ash-chromium/x86_64/ash.zip", - "location": "lacros_version_skew_tests_v111.0.5533.0", - "revision": "version:111.0.5533.0" + "location": "lacros_version_skew_tests_v111.0.5534.0", + "revision": "version:111.0.5534.0" } ], "dimension_sets": [ @@ -85078,9 +85078,9 @@ { "args": [ "--test-launcher-filter-file=../../testing/buildbot/filters/linux-lacros.lacros_chrome_browsertests.skew.filter", - "--ash-chrome-path-override=../../lacros_version_skew_tests_v111.0.5533.0/test_ash_chrome" + "--ash-chrome-path-override=../../lacros_version_skew_tests_v111.0.5534.0/test_ash_chrome" ], - "description": "Run with ash-chrome version 111.0.5533.0", + "description": "Run with ash-chrome version 111.0.5534.0", "merge": { "args": [], "script": "//testing/merge_scripts/standard_gtest_merge.py" @@ -85091,8 +85091,8 @@ "cipd_packages": [ { "cipd_package": "chromium/testing/linux-ash-chromium/x86_64/ash.zip", - "location": "lacros_version_skew_tests_v111.0.5533.0", - "revision": "version:111.0.5533.0" + "location": "lacros_version_skew_tests_v111.0.5534.0", + "revision": "version:111.0.5534.0" } ], "dimension_sets": [ @@ -85230,9 +85230,9 @@ { "args": [ "--test-launcher-filter-file=../../testing/buildbot/filters/linux-lacros.lacros_chrome_browsertests.skew.filter", - "--ash-chrome-path-override=../../lacros_version_skew_tests_v111.0.5533.0/test_ash_chrome" + "--ash-chrome-path-override=../../lacros_version_skew_tests_v111.0.5534.0/test_ash_chrome" ], - "description": "Run with ash-chrome version 111.0.5533.0", + "description": "Run with ash-chrome version 111.0.5534.0", "merge": { "args": [], "script": "//testing/merge_scripts/standard_gtest_merge.py" @@ -85243,8 +85243,8 @@ "cipd_packages": [ { "cipd_package": "chromium/testing/linux-ash-chromium/x86_64/ash.zip", - "location": "lacros_version_skew_tests_v111.0.5533.0", - "revision": "version:111.0.5533.0" + "location": "lacros_version_skew_tests_v111.0.5534.0", + "revision": "version:111.0.5534.0" } ], "dimension_sets": [ @@ -86768,9 +86768,9 @@ { "args": [ "--test-launcher-filter-file=../../testing/buildbot/filters/linux-lacros.interactive_ui_tests.filter;../../testing/buildbot/filters/linux-lacros.interactive_ui_tests.skew.filter", - "--ash-chrome-path-override=../../lacros_version_skew_tests_v111.0.5533.0/test_ash_chrome" + "--ash-chrome-path-override=../../lacros_version_skew_tests_v111.0.5534.0/test_ash_chrome" ], - "description": "Run with ash-chrome version 111.0.5533.0", + "description": "Run with ash-chrome version 111.0.5534.0", "merge": { "args": [], "script": "//testing/merge_scripts/standard_gtest_merge.py" @@ -86781,8 +86781,8 @@ "cipd_packages": [ { "cipd_package": "chromium/testing/linux-ash-chromium/x86_64/ash.zip", - "location": "lacros_version_skew_tests_v111.0.5533.0", - "revision": "version:111.0.5533.0" + "location": "lacros_version_skew_tests_v111.0.5534.0", + "revision": "version:111.0.5534.0" } ], "dimension_sets": [ @@ -86939,9 +86939,9 @@ { "args": [ "--test-launcher-filter-file=../../testing/buildbot/filters/linux-lacros.lacros_chrome_browsertests.skew.filter", - "--ash-chrome-path-override=../../lacros_version_skew_tests_v111.0.5533.0/test_ash_chrome" + "--ash-chrome-path-override=../../lacros_version_skew_tests_v111.0.5534.0/test_ash_chrome" ], - "description": "Run with ash-chrome version 111.0.5533.0", + "description": "Run with ash-chrome version 111.0.5534.0", "merge": { "args": [], "script": "//testing/merge_scripts/standard_gtest_merge.py" @@ -86952,8 +86952,8 @@ "cipd_packages": [ { "cipd_package": "chromium/testing/linux-ash-chromium/x86_64/ash.zip", - "location": "lacros_version_skew_tests_v111.0.5533.0", - "revision": "version:111.0.5533.0" + "location": "lacros_version_skew_tests_v111.0.5534.0", + "revision": "version:111.0.5534.0" } ], "dimension_sets": [ @@ -87091,9 +87091,9 @@ { "args": [ "--test-launcher-filter-file=../../testing/buildbot/filters/linux-lacros.lacros_chrome_browsertests.skew.filter", - "--ash-chrome-path-override=../../lacros_version_skew_tests_v111.0.5533.0/test_ash_chrome" + "--ash-chrome-path-override=../../lacros_version_skew_tests_v111.0.5534.0/test_ash_chrome" ], - "description": "Run with ash-chrome version 111.0.5533.0", + "description": "Run with ash-chrome version 111.0.5534.0", "merge": { "args": [], "script": "//testing/merge_scripts/standard_gtest_merge.py" @@ -87104,8 +87104,8 @@ "cipd_packages": [ { "cipd_package": "chromium/testing/linux-ash-chromium/x86_64/ash.zip", - "location": "lacros_version_skew_tests_v111.0.5533.0", - "revision": "version:111.0.5533.0" + "location": "lacros_version_skew_tests_v111.0.5534.0", + "revision": "version:111.0.5534.0" } ], "dimension_sets": [ @@ -87877,9 +87877,9 @@ { "args": [ "--test-launcher-filter-file=../../testing/buildbot/filters/linux-lacros.interactive_ui_tests.filter;../../testing/buildbot/filters/linux-lacros.interactive_ui_tests.skew.filter", - "--ash-chrome-path-override=../../lacros_version_skew_tests_v111.0.5533.0/test_ash_chrome" + "--ash-chrome-path-override=../../lacros_version_skew_tests_v111.0.5534.0/test_ash_chrome" ], - "description": "Run with ash-chrome version 111.0.5533.0", + "description": "Run with ash-chrome version 111.0.5534.0", "merge": { "args": [], "script": "//testing/merge_scripts/standard_gtest_merge.py" @@ -87890,8 +87890,8 @@ "cipd_packages": [ { "cipd_package": "chromium/testing/linux-ash-chromium/x86_64/ash.zip", - "location": "lacros_version_skew_tests_v111.0.5533.0", - "revision": "version:111.0.5533.0" + "location": "lacros_version_skew_tests_v111.0.5534.0", + "revision": "version:111.0.5534.0" } ], "dimension_sets": [
diff --git a/testing/buildbot/chromium.memory.json b/testing/buildbot/chromium.memory.json index d2c37e0..8efc406 100644 --- a/testing/buildbot/chromium.memory.json +++ b/testing/buildbot/chromium.memory.json
@@ -18653,12 +18653,12 @@ { "args": [ "--test-launcher-filter-file=../../testing/buildbot/filters/linux-lacros.interactive_ui_tests.filter;../../testing/buildbot/filters/linux-lacros.interactive_ui_tests.skew.filter", - "--ash-chrome-path-override=../../lacros_version_skew_tests_v111.0.5533.0/test_ash_chrome", + "--ash-chrome-path-override=../../lacros_version_skew_tests_v111.0.5534.0/test_ash_chrome", "--test-launcher-print-test-stdio=always", "--combine-ash-logs-on-bots", "--asan-symbolize-output" ], - "description": "Run with ash-chrome version 111.0.5533.0", + "description": "Run with ash-chrome version 111.0.5534.0", "isolate_profile_data": true, "merge": { "args": [], @@ -18670,8 +18670,8 @@ "cipd_packages": [ { "cipd_package": "chromium/testing/linux-ash-chromium/x86_64/ash.zip", - "location": "lacros_version_skew_tests_v111.0.5533.0", - "revision": "version:111.0.5533.0" + "location": "lacros_version_skew_tests_v111.0.5534.0", + "revision": "version:111.0.5534.0" } ], "dimension_sets": [ @@ -18844,12 +18844,12 @@ { "args": [ "--test-launcher-filter-file=../../testing/buildbot/filters/linux-lacros.lacros_chrome_browsertests.skew.filter", - "--ash-chrome-path-override=../../lacros_version_skew_tests_v111.0.5533.0/test_ash_chrome", + "--ash-chrome-path-override=../../lacros_version_skew_tests_v111.0.5534.0/test_ash_chrome", "--test-launcher-print-test-stdio=always", "--combine-ash-logs-on-bots", "--asan-symbolize-output" ], - "description": "Run with ash-chrome version 111.0.5533.0", + "description": "Run with ash-chrome version 111.0.5534.0", "isolate_profile_data": true, "merge": { "args": [], @@ -18861,8 +18861,8 @@ "cipd_packages": [ { "cipd_package": "chromium/testing/linux-ash-chromium/x86_64/ash.zip", - "location": "lacros_version_skew_tests_v111.0.5533.0", - "revision": "version:111.0.5533.0" + "location": "lacros_version_skew_tests_v111.0.5534.0", + "revision": "version:111.0.5534.0" } ], "dimension_sets": [ @@ -19011,12 +19011,12 @@ { "args": [ "--test-launcher-filter-file=../../testing/buildbot/filters/linux-lacros.lacros_chrome_browsertests.skew.filter", - "--ash-chrome-path-override=../../lacros_version_skew_tests_v111.0.5533.0/test_ash_chrome", + "--ash-chrome-path-override=../../lacros_version_skew_tests_v111.0.5534.0/test_ash_chrome", "--test-launcher-print-test-stdio=always", "--combine-ash-logs-on-bots", "--asan-symbolize-output" ], - "description": "Run with ash-chrome version 111.0.5533.0", + "description": "Run with ash-chrome version 111.0.5534.0", "isolate_profile_data": true, "merge": { "args": [], @@ -19028,8 +19028,8 @@ "cipd_packages": [ { "cipd_package": "chromium/testing/linux-ash-chromium/x86_64/ash.zip", - "location": "lacros_version_skew_tests_v111.0.5533.0", - "revision": "version:111.0.5533.0" + "location": "lacros_version_skew_tests_v111.0.5534.0", + "revision": "version:111.0.5534.0" } ], "dimension_sets": [
diff --git a/testing/buildbot/filters/BUILD.gn b/testing/buildbot/filters/BUILD.gn index 9c09bd2..912c37c 100644 --- a/testing/buildbot/filters/BUILD.gn +++ b/testing/buildbot/filters/BUILD.gn
@@ -219,7 +219,6 @@ testonly = true data = [ - "//testing/buildbot/filters/android.pie_tot.services_unittests.filter", "//testing/buildbot/filters/fuchsia.services_unittests.filter", "//testing/buildbot/filters/fuchsia.lsan.services_unittests.filter", ]
diff --git a/testing/buildbot/filters/android.pie_tot.services_unittests.filter b/testing/buildbot/filters/android.pie_tot.services_unittests.filter deleted file mode 100644 index 64ec493f..0000000 --- a/testing/buildbot/filters/android.pie_tot.services_unittests.filter +++ /dev/null
@@ -1,4 +0,0 @@ -# crbug.com/1384180 --TracingSampleProfilerTest.JoinRunningTracing --TracingSampleProfilerTest.OnSampleCompleted --TracingSampleProfilerTest.SamplingChildThread
diff --git a/testing/buildbot/filters/linux.linux-rel-cft.interactive_ui_tests.filter b/testing/buildbot/filters/linux.linux-rel-cft.interactive_ui_tests.filter index bab70e7..b60d36d 100644 --- a/testing/buildbot/filters/linux.linux-rel-cft.interactive_ui_tests.filter +++ b/testing/buildbot/filters/linux.linux-rel-cft.interactive_ui_tests.filter
@@ -18,3 +18,4 @@ -SadTabViewInteractiveUITest.SadTabKeyboardAccessibility -SitePerProcessInteractiveBrowserTest.FullscreenElementInABAAndExitViaEscapeKey -SitePerProcessInteractiveBrowserTest.FullscreenElementInSubframe +-WebContentsInteractionTestUtilInteractiveUiTest.NavigateMenuAndBringUpDownloadsPageThenOpenMoreActionsMenu
diff --git a/testing/buildbot/filters/mac.mac12-arm64-rel.browser_tests.filter b/testing/buildbot/filters/mac.mac12-arm64-rel.browser_tests.filter index 6eb553c2..49b75bc4 100644 --- a/testing/buildbot/filters/mac.mac12-arm64-rel.browser_tests.filter +++ b/testing/buildbot/filters/mac.mac12-arm64-rel.browser_tests.filter
@@ -180,13 +180,7 @@ -ProfileWindowBrowserTest.GuestIsOffTheRecord -ReaderModeIconViewBrowserTest.NonSecurePagesNotDistillable -RealboxSearchPreloadBrowserTest.SearchPreloadSuccess --RegionCaptureBrowserCropTestInstantiation/RegionCaptureBrowserCropTest.CanCropTo/8 --RegionCaptureBrowserCropTestInstantiation/RegionCaptureBrowserCropTest.CanCropTo/9 --RegionCaptureBrowserCropTestInstantiation/RegionCaptureBrowserCropTest.CanCropTo/10 --RegionCaptureBrowserCropTestInstantiation/RegionCaptureBrowserCropTest.CanCropTo/11 --RegionCaptureClonesBrowserTest.CannotUncropClone -RegionCaptureClonesBrowserTest.CannotUncropTrackThatHasClone --RegionCaptureBrowserTest.CropToAllowedIfEmbeddedFrameCropsToElementInEmbedded -RestoreOnStartupPolicyTestInstance/RestoreOnStartupPolicyTest.RunTest/3 -SaveAsMhtml/SavePageOriginalVsSavedComparisonTest.NestedFrames/0 -SavePageOriginalVsSavedComparisonTest.AboutBlank/0 @@ -227,9 +221,3 @@ -V4SafeBrowsingServiceTest.CheckDownloadUrlRedirects -VariationsSafeModeEndToEndBrowserTest.ExtendedNullSeedEndToEnd -VariationsSafeModeEndToEndBrowserTest.ExtendedSafeSeedEndToEnd --_/RegionCaptureMultiCaptureBrowserTest.CannotSelfCaptureAgainIfCropped/1 --_/RegionCaptureMultiCaptureBrowserTest.CannotSelfCaptureAgainIfCropped/0 --_/RegionCaptureMultiCaptureBrowserTest.CannotSelfCaptureAgainIfCroppedAndUncropped/0 --_/RegionCaptureMultiCaptureBrowserTest.CannotSelfCaptureAgainIfCroppedAndUncropped/1 --_/RegionCaptureMultiCaptureBrowserTest.CanSelfCaptureAgainIfCroppedSessionStopped/0 --_/RegionCaptureMultiCaptureBrowserTest.CanSelfCaptureAgainIfCroppedSessionStopped/1
diff --git a/testing/buildbot/filters/win.win-rel-cft.browser_tests.filter b/testing/buildbot/filters/win.win-rel-cft.browser_tests.filter index d773b0b4..2c4bd701 100644 --- a/testing/buildbot/filters/win.win-rel-cft.browser_tests.filter +++ b/testing/buildbot/filters/win.win-rel-cft.browser_tests.filter
@@ -42,8 +42,6 @@ -MultipleTabSharingUIViewsBrowserTest.CloseTabs -MultipleTabSharingUIViewsBrowserTest.StopSharing -MultipleTabSharingUIViewsBrowserTest.VerifyUi --PostInstallAnnouncementTest.FromInstaller --PostInstallAnnouncementTestBase.NormalLaunch -SaveCardBubbleViewsFullFormBrowserTest.AlertAccessibleEvent -SessionRestoreTest.RestoredTabsHaveCorrectInitialSize -TabSharingUIViewsPreferCurrentTabBrowserTest.VerifyUiWhenCapturingAnotherTab
diff --git a/testing/buildbot/filters/win.win-rel-cft.interactive_ui_tests.filter b/testing/buildbot/filters/win.win-rel-cft.interactive_ui_tests.filter index 2f40c5d..4c2107e 100644 --- a/testing/buildbot/filters/win.win-rel-cft.interactive_ui_tests.filter +++ b/testing/buildbot/filters/win.win-rel-cft.interactive_ui_tests.filter
@@ -16,6 +16,8 @@ -BrowserFocusTest.PopupLocationBar -ChromeMimeHandlerViewInteractiveUITest.Fullscreen -PopupBlockerBrowserTest.WindowFeatures +-PostInstallAnnouncementTest.FromInstaller +-PostInstallAnnouncementTestBase.NormalLaunch -SadTabViewInteractiveUITest.SadTabKeyboardAccessibility -SitePerProcessInteractiveBrowserTest.FullscreenElementInABAAndExitViaEscapeKey -SitePerProcessInteractiveBrowserTest.FullscreenElementInSubframe
diff --git a/testing/buildbot/test_suite_exceptions.pyl b/testing/buildbot/test_suite_exceptions.pyl index 375158e..4943122e 100644 --- a/testing/buildbot/test_suite_exceptions.pyl +++ b/testing/buildbot/test_suite_exceptions.pyl
@@ -3194,11 +3194,6 @@ 'quickrun_shards': 2, }, }, - 'ToTAndroid': { - 'args': [ - '--test-launcher-filter-file=../../testing/buildbot/filters/android.pie_tot.services_unittests.filter', - ] - }, 'android-11-x86-rel': { 'args': [ # TODO(crbug.com/1264654): Fix the failed tests
diff --git a/testing/buildbot/variants.pyl b/testing/buildbot/variants.pyl index 884049a..cdfe011 100644 --- a/testing/buildbot/variants.pyl +++ b/testing/buildbot/variants.pyl
@@ -22,16 +22,16 @@ }, 'LACROS_VERSION_SKEW_CANARY': { 'args': [ - '--ash-chrome-path-override=../../lacros_version_skew_tests_v111.0.5533.0/test_ash_chrome', + '--ash-chrome-path-override=../../lacros_version_skew_tests_v111.0.5534.0/test_ash_chrome', ], - 'description': 'Run with ash-chrome version 111.0.5533.0', + 'description': 'Run with ash-chrome version 111.0.5534.0', 'identifier': 'Lacros version skew testing ash canary', 'swarming': { 'cipd_packages': [ { 'cipd_package': 'chromium/testing/linux-ash-chromium/x86_64/ash.zip', - 'location': 'lacros_version_skew_tests_v111.0.5533.0', - 'revision': 'version:111.0.5533.0', + 'location': 'lacros_version_skew_tests_v111.0.5534.0', + 'revision': 'version:111.0.5534.0', }, ], },
diff --git a/testing/variations/fieldtrial_testing_config.json b/testing/variations/fieldtrial_testing_config.json index 0f66e78f..1347000 100644 --- a/testing/variations/fieldtrial_testing_config.json +++ b/testing/variations/fieldtrial_testing_config.json
@@ -1136,27 +1136,6 @@ ] } ], - "AutofillIgnoreInvalidCountryOnImport": [ - { - "platforms": [ - "android", - "chromeos", - "chromeos_lacros", - "ios", - "linux", - "mac", - "windows" - ], - "experiments": [ - { - "name": "Enabled", - "enable_features": [ - "AutofillIgnoreInvalidCountryOnImport" - ] - } - ] - } - ], "AutofillImprovedLabelForInference": [ { "platforms": [
diff --git a/third_party/blink/public/devtools_protocol/browser_protocol.pdl b/third_party/blink/public/devtools_protocol/browser_protocol.pdl index fb16ee07..1f630460 100644 --- a/third_party/blink/public/devtools_protocol/browser_protocol.pdl +++ b/third_party/blink/public/devtools_protocol/browser_protocol.pdl
@@ -744,6 +744,7 @@ enum CrossOriginPortalPostMessageError FormLabelForNameError + FormDuplicateIdForInputError # Depending on the concrete errorType, different properties are set. type GenericIssueDetails extends object
diff --git a/third_party/blink/public/mojom/devtools/inspector_issue.mojom b/third_party/blink/public/mojom/devtools/inspector_issue.mojom index 3ecb58c..89bdc162 100644 --- a/third_party/blink/public/mojom/devtools/inspector_issue.mojom +++ b/third_party/blink/public/mojom/devtools/inspector_issue.mojom
@@ -222,6 +222,7 @@ enum GenericIssueErrorType { kCrossOriginPortalPostMessageError, kFormLabelForNameError, + kFormDuplicateIdForInputError, }; struct GenericIssueDetails {
diff --git a/third_party/blink/public/mojom/direct_sockets/direct_sockets.mojom b/third_party/blink/public/mojom/direct_sockets/direct_sockets.mojom index 563fb76..0ac8d27 100644 --- a/third_party/blink/public/mojom/direct_sockets/direct_sockets.mojom +++ b/third_party/blink/public/mojom/direct_sockets/direct_sockets.mojom
@@ -91,7 +91,4 @@ // |result| is net::OK. On failure, |result| is a network error code. Send(mojo_base.mojom.ReadOnlyBuffer data) => (int32 result); - - // Closes the socket. - Close(); };
diff --git a/third_party/blink/renderer/bindings/core/v8/script_controller.cc b/third_party/blink/renderer/bindings/core/v8/script_controller.cc index 66feef8..cc6c7697 100644 --- a/third_party/blink/renderer/bindings/core/v8/script_controller.cc +++ b/third_party/blink/renderer/bindings/core/v8/script_controller.cc
@@ -70,14 +70,33 @@ namespace { bool IsTrivialScript(const String& script) { - if (script.length() > 20) + if (script.length() > 25) { return false; + } - DEFINE_STATIC_LOCAL( - Vector<String>, trivial_scripts, - ({"void(0)", "void0", "void(false)", "void(null)", "void(-1)", "false", - "true", "''", "\"\"", "undefined", "0", "1", "'1'", "print()", - "window.print()", "close()", "window.close()"})); + DEFINE_STATIC_LOCAL(Vector<String>, trivial_scripts, + ({"void(0)", + "void0", + "void(false)", + "void(null)", + "void(-1)", + "false", + "true", + "", + "''", + "\"\"", + "undefined", + "0", + "1", + "'1'", + "print()", + "window.print()", + "close()", + "window.close()", + "history.back()", + "window.history.back()", + "history.go(-1)", + "window.history.go(-1)"})); String processed_script = script.StripWhiteSpace().Replace(";", ""); return trivial_scripts.Contains(processed_script); }
diff --git a/third_party/blink/renderer/core/editing/ime/stylus_writing_gesture.cc b/third_party/blink/renderer/core/editing/ime/stylus_writing_gesture.cc index ab4f0fba..40884d0f 100644 --- a/third_party/blink/renderer/core/editing/ime/stylus_writing_gesture.cc +++ b/third_party/blink/renderer/core/editing/ime/stylus_writing_gesture.cc
@@ -177,6 +177,27 @@ return PlainTextRange(space_start + gesture_range.Start(), space_end + gesture_range.Start()); } + +PlainTextRange ExpandWithWordGranularity( + EphemeralRange ephemeral_range, + Element* const root_editable_element, + InputMethodController& input_method_controller) { + SelectionInDOMTree expanded_selection = ExpandWithGranularity( + SelectionInDOMTree::Builder().SetBaseAndExtent(ephemeral_range).Build(), + TextGranularity::kWord, WordInclusion::kMiddle); + PlainTextRange expanded_range = PlainTextRange::Create( + *root_editable_element, expanded_selection.ComputeRange()); + String input_text = input_method_controller.TextInputInfo().value; + if (expanded_range.length() > 2 && + IsHTMLSpace(input_text[expanded_range.Start()]) && + IsHTMLSpace(input_text[expanded_range.End() - 1])) { + // Special case, we don't want to delete spaces both sides of the + // selection as that will join words together. + return PlainTextRange(expanded_range.Start() + 1, expanded_range.End()); + } + return expanded_range; +} + } // namespace // static @@ -253,21 +274,13 @@ return absl::nullopt; } switch (granularity) { - case mojom::blink::StylusWritingGestureGranularity::CHARACTER: { + case mojom::blink::StylusWritingGestureGranularity::CHARACTER: return gesture_range; - } - case mojom::blink::StylusWritingGestureGranularity::WORD: { - SelectionInDOMTree expanded_selection = - ExpandWithGranularity(SelectionInDOMTree::Builder() - .SetBaseAndExtent(ephemeral_range) - .Build(), - TextGranularity::kWord); - return PlainTextRange::Create(*root_editable_element, - expanded_selection.ComputeRange()); - } - default: { + case mojom::blink::StylusWritingGestureGranularity::WORD: + return ExpandWithWordGranularity(ephemeral_range, root_editable_element, + local_frame->GetInputMethodController()); + default: return absl::nullopt; - } } }
diff --git a/third_party/blink/renderer/core/editing/ime/stylus_writing_gesture_test.cc b/third_party/blink/renderer/core/editing/ime/stylus_writing_gesture_test.cc index 5ed10b5..93d1c7d 100644 --- a/third_party/blink/renderer/core/editing/ime/stylus_writing_gesture_test.cc +++ b/third_party/blink/renderer/core/editing/ime/stylus_writing_gesture_test.cc
@@ -129,22 +129,22 @@ // Re-enable once https://crbug.com/1404969 is fixed and the middle of word // logic is implemented in stylus_writing_gesture.cc. -TEST_F(StylusWritingGestureTest, - DISABLED_TestGestureDeleteWithWordGranularity) { +TEST_F(StylusWritingGestureTest, TestGestureDeleteWithWordGranularity) { auto* input = SetUpSingleInput(); std::vector<TestCase> test_cases{ // Crossing out the first word and half of the second should delete both - // words. There should also be no space left at the beginning of the text. - TestCase(0, 30, "A BC DEF", "DEF"), + // words. Because the selection doesn't include the space between BC and + // DEF, it remains after the deletion. + TestCase(0, 30, "A BC DEF", " DEF"), // Deleting a word and its trailing space in between two other words // should leave the words either side with a single space between them. TestCase(28, 52, "A BC DEF", "A DEF"), - // Same as above but with the preceding space instead. + // Same as above but with the spaces on both sides. TestCase(12, 48, "A BC DEF", "A DEF"), // Removing the last word is an edge case as there's no word past it to // check. - TestCase(32, 72, "ABCDE FGH", "ABCDE "), + TestCase(32, 72, "ABCDE FGH", "ABCDE"), // Crossing out inside a word without crossing over the middle should not // affect the word. TestCase(0, 24, "ABCDEFG", "ABCDEFG"),
diff --git a/third_party/blink/renderer/core/editing/selection_adjuster.cc b/third_party/blink/renderer/core/editing/selection_adjuster.cc index 33a2c93b..e6fe07e2 100644 --- a/third_party/blink/renderer/core/editing/selection_adjuster.cc +++ b/third_party/blink/renderer/core/editing/selection_adjuster.cc
@@ -103,7 +103,8 @@ template <typename Strategy> static PositionTemplate<Strategy> ComputeStartRespectingGranularityAlgorithm( const PositionWithAffinityTemplate<Strategy>& passed_start, - TextGranularity granularity) { + TextGranularity granularity, + WordInclusion inclusion = WordInclusion::kDefault) { DCHECK(passed_start.IsNotNull()); switch (granularity) { @@ -124,6 +125,16 @@ CreateVisiblePosition(passed_start); const PositionTemplate<Strategy> word_start = StartOfWordPosition( passed_start.GetPosition(), ChooseWordSide(visible_start)); + if (inclusion == WordInclusion::kMiddle) { + // Check if the middle of the word is within the passed selection. + const PositionTemplate<Strategy> word_end = EndOfWordPosition( + passed_start.GetPosition(), ChooseWordSide(visible_start)); + const PositionTemplate<Strategy> word_middle = + MiddleOfWordPosition(word_start, word_end); + if (passed_start.GetPosition() > word_middle) { + return word_end; + } + } return CreateVisiblePosition(word_start).DeepEquivalent(); } case TextGranularity::kSentence: @@ -160,7 +171,8 @@ static PositionTemplate<Strategy> ComputeEndRespectingGranularityAlgorithm( const PositionTemplate<Strategy>& start, const PositionWithAffinityTemplate<Strategy>& passed_end, - TextGranularity granularity) { + TextGranularity granularity, + WordInclusion inclusion = WordInclusion::kDefault) { DCHECK(passed_end.IsNotNull()); switch (granularity) { @@ -188,6 +200,15 @@ ? original_end : CreateVisiblePosition(EndOfWordPosition( passed_end.GetPosition(), ChooseWordSide(original_end))); + if (inclusion == WordInclusion::kMiddle) { + const PositionTemplate<Strategy> word_start = StartOfWordPosition( + passed_end.GetPosition(), ChooseWordSide(original_end)); + const PositionTemplate<Strategy> word_middle = + MiddleOfWordPosition(word_start, word_end.DeepEquivalent()); + if (word_middle > passed_end.GetPosition()) { + return word_start; + } + } if (!is_end_of_paragraph) return word_end.DeepEquivalent(); if (IsEmptyTableCell(start.AnchorNode())) @@ -285,7 +306,8 @@ template <typename Strategy> static SelectionTemplate<Strategy> AdjustSelection( const SelectionTemplate<Strategy>& canonicalized_selection, - TextGranularity granularity) { + TextGranularity granularity, + const WordInclusion inclusion) { const TextAffinity affinity = canonicalized_selection.Affinity(); const PositionTemplate<Strategy> start = @@ -293,7 +315,7 @@ const PositionTemplate<Strategy> new_start = ComputeStartRespectingGranularityAlgorithm( PositionWithAffinityTemplate<Strategy>(start, affinity), - granularity); + granularity, inclusion); const PositionTemplate<Strategy> expanded_start = new_start.IsNotNull() ? new_start : start; @@ -302,7 +324,8 @@ const PositionTemplate<Strategy> new_end = ComputeEndRespectingGranularityAlgorithm( expanded_start, - PositionWithAffinityTemplate<Strategy>(end, affinity), granularity); + PositionWithAffinityTemplate<Strategy>(end, affinity), granularity, + inclusion); const PositionTemplate<Strategy> expanded_end = new_end.IsNotNull() ? new_end : end; @@ -356,14 +379,18 @@ SelectionInDOMTree SelectionAdjuster::AdjustSelectionRespectingGranularity( const SelectionInDOMTree& selection, - TextGranularity granularity) { - return GranularityAdjuster::AdjustSelection(selection, granularity); + TextGranularity granularity, + const WordInclusion inclusion = WordInclusion::kDefault) { + return GranularityAdjuster::AdjustSelection(selection, granularity, + inclusion); } SelectionInFlatTree SelectionAdjuster::AdjustSelectionRespectingGranularity( const SelectionInFlatTree& selection, - TextGranularity granularity) { - return GranularityAdjuster::AdjustSelection(selection, granularity); + TextGranularity granularity, + const WordInclusion inclusion = WordInclusion::kDefault) { + return GranularityAdjuster::AdjustSelection(selection, granularity, + inclusion); } class ShadowBoundaryAdjuster final {
diff --git a/third_party/blink/renderer/core/editing/selection_adjuster.h b/third_party/blink/renderer/core/editing/selection_adjuster.h index 174b542..87b8df0 100644 --- a/third_party/blink/renderer/core/editing/selection_adjuster.h +++ b/third_party/blink/renderer/core/editing/selection_adjuster.h
@@ -12,6 +12,14 @@ namespace blink { +enum class WordInclusion { + // Default behaviour. Include a word if selection is touching it. + kDefault, + // Only include a word in the adjusted selection if the middle of the word + // is within the selection. + kMiddle +}; + // |SelectionAdjuster| adjusts positions in |VisibleSelection| directly without // calling |validate()|. Users of |SelectionAdjuster| should keep invariant of // |VisibleSelection|, e.g. all positions are canonicalized. @@ -21,10 +29,12 @@ public: static SelectionInDOMTree AdjustSelectionRespectingGranularity( const SelectionInDOMTree&, - TextGranularity); + TextGranularity, + const WordInclusion); static SelectionInFlatTree AdjustSelectionRespectingGranularity( const SelectionInFlatTree&, - TextGranularity); + TextGranularity, + const WordInclusion); static SelectionInDOMTree AdjustSelectionToAvoidCrossingShadowBoundaries( const SelectionInDOMTree&); static SelectionInFlatTree AdjustSelectionToAvoidCrossingShadowBoundaries(
diff --git a/third_party/blink/renderer/core/editing/visible_selection.cc b/third_party/blink/renderer/core/editing/visible_selection.cc index 5b3094f77..83e01ba 100644 --- a/third_party/blink/renderer/core/editing/visible_selection.cc +++ b/third_party/blink/renderer/core/editing/visible_selection.cc
@@ -68,7 +68,8 @@ static SelectionTemplate<Strategy> ComputeVisibleSelection( const SelectionTemplate<Strategy>& passed_selection, - TextGranularity granularity) { + TextGranularity granularity, + const WordInclusion& inclusion = WordInclusion::kDefault) { DCHECK(!NeedsLayoutTreeUpdate(passed_selection.Base())); DCHECK(!NeedsLayoutTreeUpdate(passed_selection.Extent())); @@ -80,7 +81,7 @@ const SelectionTemplate<Strategy>& granularity_adjusted_selection = SelectionAdjuster::AdjustSelectionRespectingGranularity( - canonicalized_selection, granularity); + canonicalized_selection, granularity, inclusion); const SelectionTemplate<Strategy>& shadow_adjusted_selection = SelectionAdjuster::AdjustSelectionToAvoidCrossingShadowBoundaries( granularity_adjusted_selection); @@ -109,15 +110,17 @@ } SelectionInDOMTree ExpandWithGranularity(const SelectionInDOMTree& selection, - TextGranularity granularity) { - return VisibleSelection::Creator::ComputeVisibleSelection(selection, - granularity); + TextGranularity granularity, + const WordInclusion& inclusion) { + return VisibleSelection::Creator::ComputeVisibleSelection( + selection, granularity, inclusion); } SelectionInFlatTree ExpandWithGranularity(const SelectionInFlatTree& selection, - TextGranularity granularity) { + TextGranularity granularity, + const WordInclusion& inclusion) { return VisibleSelectionInFlatTree::Creator::ComputeVisibleSelection( - selection, granularity); + selection, granularity, inclusion); } template <typename Strategy>
diff --git a/third_party/blink/renderer/core/editing/visible_selection.h b/third_party/blink/renderer/core/editing/visible_selection.h index 2e41ed45..fd82b81 100644 --- a/third_party/blink/renderer/core/editing/visible_selection.h +++ b/third_party/blink/renderer/core/editing/visible_selection.h
@@ -31,6 +31,7 @@ #include "third_party/blink/renderer/core/editing/editing_strategy.h" #include "third_party/blink/renderer/core/editing/forward.h" #include "third_party/blink/renderer/core/editing/position.h" +#include "third_party/blink/renderer/core/editing/selection_adjuster.h" #include "third_party/blink/renderer/core/editing/text_affinity.h" #include "third_party/blink/renderer/core/editing/text_granularity.h" #include "third_party/blink/renderer/core/editing/visible_units.h" @@ -126,11 +127,15 @@ CORE_EXPORT VisibleSelectionInFlatTree CreateVisibleSelection(const SelectionInFlatTree&); -CORE_EXPORT SelectionInDOMTree ExpandWithGranularity(const SelectionInDOMTree&, - TextGranularity); +CORE_EXPORT SelectionInDOMTree +ExpandWithGranularity(const SelectionInDOMTree&, + TextGranularity, + const WordInclusion& = WordInclusion::kDefault); CORE_EXPORT SelectionInFlatTree -ExpandWithGranularity(const SelectionInFlatTree&, TextGranularity); +ExpandWithGranularity(const SelectionInFlatTree&, + TextGranularity, + const WordInclusion& = WordInclusion::kDefault); // We don't yet support multi-range selections, so we only ever have one range // to return.
diff --git a/third_party/blink/renderer/core/editing/visible_units.h b/third_party/blink/renderer/core/editing/visible_units.h index 8e9ccbb..b3824852 100644 --- a/third_party/blink/renderer/core/editing/visible_units.h +++ b/third_party/blink/renderer/core/editing/visible_units.h
@@ -135,6 +135,9 @@ CORE_EXPORT PositionInFlatTree StartOfWordPosition(const PositionInFlatTree&, WordSide = kNextWordIfOnBoundary); +CORE_EXPORT Position MiddleOfWordPosition(const Position&, const Position&); +CORE_EXPORT PositionInFlatTree MiddleOfWordPosition(const PositionInFlatTree&, + const PositionInFlatTree&); CORE_EXPORT Position EndOfWordPosition(const Position&, WordSide = kNextWordIfOnBoundary); CORE_EXPORT PositionInFlatTree
diff --git a/third_party/blink/renderer/core/editing/visible_units_word.cc b/third_party/blink/renderer/core/editing/visible_units_word.cc index f15b7bfd..999a3b3 100644 --- a/third_party/blink/renderer/core/editing/visible_units_word.cc +++ b/third_party/blink/renderer/core/editing/visible_units_word.cc
@@ -32,8 +32,10 @@ #include "third_party/blink/renderer/core/editing/editing_utilities.h" #include "third_party/blink/renderer/core/editing/ephemeral_range.h" +#include "third_party/blink/renderer/core/editing/text_offset_mapping.h" #include "third_party/blink/renderer/core/editing/text_segments.h" #include "third_party/blink/renderer/core/editing/visible_position.h" +#include "third_party/blink/renderer/core/editing/iterators/text_iterator.h" #include "third_party/blink/renderer/core/layout/layout_block_flow.h" #include "third_party/blink/renderer/platform/instrumentation/tracing/trace_event.h" #include "third_party/blink/renderer/platform/text/character.h" @@ -338,6 +340,29 @@ StartOfWordPosition(ToPositionInFlatTree(position), side)); } +PositionInFlatTree MiddleOfWordPosition(const PositionInFlatTree& word_start, + const PositionInFlatTree& word_end) { + unsigned middle = TextIteratorAlgorithm<EditingInFlatTreeStrategy>::RangeLength(word_start, word_end) / 2; + TextOffsetMapping::ForwardRange range = TextOffsetMapping::ForwardRangeOf(word_start); + middle += TextOffsetMapping(*range.begin()).ComputeTextOffset(word_start); + for (auto inline_contents : range) { + const TextOffsetMapping mapping(inline_contents); + unsigned length = mapping.GetText().length(); + if (middle < length) { + return mapping.GetPositionBefore(middle); + } + middle -= length; + } + NOTREACHED(); + return PositionInFlatTree(nullptr, -1); +} + +Position MiddleOfWordPosition(const Position& word_start, + const Position& word_end) { + return ToPositionInDOMTree(MiddleOfWordPosition( + ToPositionInFlatTree(word_start), ToPositionInFlatTree(word_end))); +} + bool IsWordBreak(UChar ch) { return (WTF::unicode::IsPrintableChar(ch) && !IsWhitespace(ch)) || U16_IS_SURROGATE(ch) || IsLineBreak(ch) || ch == kLowLineCharacter;
diff --git a/third_party/blink/renderer/core/editing/visible_units_word_test.cc b/third_party/blink/renderer/core/editing/visible_units_word_test.cc index 8fa0ba4..e9bd582 100644 --- a/third_party/blink/renderer/core/editing/visible_units_word_test.cc +++ b/third_party/blink/renderer/core/editing/visible_units_word_test.cc
@@ -56,6 +56,12 @@ return GetCaretTextFromBody(result); } + std::string DoMiddleOfWord(const std::string& selection_text) { + SelectionInDOMTree selection = SetSelectionTextToBody(selection_text); + return GetCaretTextFromBody( + MiddleOfWordPosition(selection.Base(), selection.Extent())); + } + // To avoid name conflict in jumbo build, following functions should be here. static VisiblePosition CreateVisiblePositionInDOMTree( Node& anchor, @@ -807,4 +813,28 @@ DoPreviousWord("foo<input value=\"bla\">bar|")); } +TEST_P(ParameterizedVisibleUnitsWordTest, MiddleOfWord) { + // Default case with one element. + EXPECT_EQ("<p>This is a test sent|ence</p>", + DoMiddleOfWord("<p>This is a test s^entenc|e</p>")); + // Positions in different elements. + EXPECT_EQ("<p>This is a <span>te|st</span> sentence.</p>", + DoMiddleOfWord("<p>This is a <span>^test</span>| sentence.</p>")); + // Middle is first character after element. + EXPECT_EQ("<p>This is a <span>test</span>| sentence.</p>", + DoMiddleOfWord("<p>This is a <span>^test</span> sen|tence.</p>")); + // Middle is first character in element. + EXPECT_EQ("<p>This is a t</p><span>|esting sentence</span>", + DoMiddleOfWord("<p>This i^s a t</p><span>esti|ng sentence</span>")); + // Middle is last character in element. + EXPECT_EQ("<p>This is a <span>tes|t</span> sentence.</p>", + DoMiddleOfWord("<p>This is ^a <span>test</span> sen|tence.</p>")); + // Positions and middle are all in outer element. + EXPECT_EQ("<p>This is a <span>test</span> |sentence.</p>", + DoMiddleOfWord("<p>This is ^a <span>test</span> sentenc|e.</p>")); + // Positions and middle all in inner element. + EXPECT_EQ("<p>This is a <span>tes|ting</span> sentence.</p>", + DoMiddleOfWord("<p>This is a <span>^testin|g</span> sentence.</p>")); +} + } // namespace blink
diff --git a/third_party/blink/renderer/core/fetch/bytes_uploader.h b/third_party/blink/renderer/core/fetch/bytes_uploader.h index 75866ad1..fb68056f 100644 --- a/third_party/blink/renderer/core/fetch/bytes_uploader.h +++ b/third_party/blink/renderer/core/fetch/bytes_uploader.h
@@ -16,6 +16,7 @@ #include "third_party/blink/renderer/platform/heap/member.h" #include "third_party/blink/renderer/platform/heap/prefinalizer.h" #include "third_party/blink/renderer/platform/loader/fetch/bytes_consumer.h" +#include "third_party/blink/renderer/platform/wtf/gc_plugin_ignore.h" namespace base { class SingleThreadTaskRunner; @@ -74,6 +75,7 @@ Member<BytesConsumer> consumer_; Member<Client> client_; + GC_PLUGIN_IGNORE("https://crbug.com/1381979") mojo::Receiver<network::mojom::blink::ChunkedDataPipeGetter> receiver_; mojo::ScopedDataPipeProducerHandle upload_pipe_; mojo::SimpleWatcher upload_pipe_watcher_;
diff --git a/third_party/blink/renderer/core/frame/attribution_src_loader.cc b/third_party/blink/renderer/core/frame/attribution_src_loader.cc index df74a53..6ab2f06 100644 --- a/third_party/blink/renderer/core/frame/attribution_src_loader.cc +++ b/third_party/blink/renderer/core/frame/attribution_src_loader.cc
@@ -58,6 +58,7 @@ #include "third_party/blink/renderer/platform/network/http_names.h" #include "third_party/blink/renderer/platform/weborigin/kurl.h" #include "third_party/blink/renderer/platform/weborigin/security_origin.h" +#include "third_party/blink/renderer/platform/wtf/gc_plugin_ignore.h" #include "third_party/blink/renderer/platform/wtf/text/atomic_string.h" #include "third_party/blink/renderer/platform/wtf/text/string_utf8_adaptor.h" #include "third_party/blink/renderer/platform/wtf/text/wtf_string.h" @@ -229,6 +230,7 @@ absl::optional<AttributionSrcToken> attribution_src_token_; // Remote used for registering responses with the browser-process. + GC_PLUGIN_IGNORE("https://crbug.com/1381979") mojo::Remote<mojom::blink::AttributionDataHost> data_host_; SelfKeepAlive<ResourceClient> keep_alive_{this};
diff --git a/third_party/blink/renderer/core/frame/dom_window.h b/third_party/blink/renderer/core/frame/dom_window.h index 4ea0aea..e0e3b7e5 100644 --- a/third_party/blink/renderer/core/frame/dom_window.h +++ b/third_party/blink/renderer/core/frame/dom_window.h
@@ -18,6 +18,7 @@ #include "third_party/blink/renderer/platform/heap/garbage_collected.h" #include "third_party/blink/renderer/platform/wtf/assertions.h" #include "third_party/blink/renderer/platform/wtf/forward.h" +#include "third_party/blink/renderer/platform/wtf/gc_plugin_ignore.h" #include "third_party/blink/renderer/platform/wtf/vector.h" namespace blink { @@ -219,6 +220,7 @@ bool endpoint_defined; WTF::String reported_window_url; }; + GC_PLUGIN_IGNORE("https://crbug.com/1381979") WTF::Vector<CoopAccessMonitor> coop_access_monitor_; };
diff --git a/third_party/blink/renderer/core/frame/find_in_page.h b/third_party/blink/renderer/core/frame/find_in_page.h index 9d1f90d..8f7794a6 100644 --- a/third_party/blink/renderer/core/frame/find_in_page.h +++ b/third_party/blink/renderer/core/frame/find_in_page.h
@@ -20,6 +20,7 @@ #include "third_party/blink/renderer/core/execution_context/execution_context_lifecycle_observer.h" #include "third_party/blink/renderer/platform/heap/garbage_collected.h" #include "third_party/blink/renderer/platform/heap/persistent.h" +#include "third_party/blink/renderer/platform/wtf/gc_plugin_ignore.h" namespace blink { @@ -108,6 +109,7 @@ const Member<WebLocalFrameImpl> frame_; + GC_PLUGIN_IGNORE("https://crbug.com/1381979") mojo::Remote<mojom::blink::FindInPageClient> client_; mojo::AssociatedReceiver<mojom::blink::FindInPage> receiver_{this};
diff --git a/third_party/blink/renderer/core/html/forms/color_chooser_ui_controller.h b/third_party/blink/renderer/core/html/forms/color_chooser_ui_controller.h index 41e60970..16e62bb6 100644 --- a/third_party/blink/renderer/core/html/forms/color_chooser_ui_controller.h +++ b/third_party/blink/renderer/core/html/forms/color_chooser_ui_controller.h
@@ -35,6 +35,7 @@ #include "third_party/blink/renderer/platform/mojo/heap_mojo_receiver.h" #include "third_party/blink/renderer/platform/mojo/heap_mojo_wrapper_mode.h" #include "third_party/blink/renderer/platform/text/platform_locale.h" +#include "third_party/blink/renderer/platform/wtf/gc_plugin_ignore.h" namespace blink { @@ -66,12 +67,14 @@ #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_MAC) void OpenColorChooser(); #endif // BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_MAC) + GC_PLUGIN_IGNORE("https://crbug.com/1381979") mojo::Remote<mojom::blink::ColorChooser> chooser_; Member<blink::ColorChooserClient> client_; Member<LocalFrame> frame_; private: + GC_PLUGIN_IGNORE("https://crbug.com/1381979") mojo::Remote<mojom::blink::ColorChooserFactory> color_chooser_factory_; HeapMojoReceiver<mojom::blink::ColorChooserClient, ColorChooserUIController> receiver_;
diff --git a/third_party/blink/renderer/core/html/html_element.cc b/third_party/blink/renderer/core/html/html_element.cc index c6d92de..708f9ad 100644 --- a/third_party/blink/renderer/core/html/html_element.cc +++ b/third_party/blink/renderer/core/html/html_element.cc
@@ -1425,7 +1425,6 @@ // to `:open` matching, so that transitions can start on the change to // top layer. document.UpdateStyleAndLayoutTreeForNode(this); - EnsureComputedStyle(); // Make the popover match `:open`: GetPopoverData()->setVisibilityState(PopoverVisibilityState::kShowing);
diff --git a/third_party/blink/renderer/core/html/media/video_wake_lock.h b/third_party/blink/renderer/core/html/media/video_wake_lock.h index 4118c874..c8cd092d 100644 --- a/third_party/blink/renderer/core/html/media/video_wake_lock.h +++ b/third_party/blink/renderer/core/html/media/video_wake_lock.h
@@ -14,6 +14,7 @@ #include "third_party/blink/renderer/core/intersection_observer/intersection_observer.h" #include "third_party/blink/renderer/core/page/page_visibility_observer.h" #include "third_party/blink/renderer/platform/heap/collection_support/heap_vector.h" +#include "third_party/blink/renderer/platform/wtf/gc_plugin_ignore.h" namespace blink { @@ -90,6 +91,7 @@ // `video_element_` owns |this|. Member<HTMLVideoElement> video_element_; + GC_PLUGIN_IGNORE("https://crbug.com/1381979") mojo::Remote<device::mojom::blink::WakeLock> wake_lock_service_; bool playing_ = false;
diff --git a/third_party/blink/renderer/core/html/parser/html_parser_metrics_test.cc b/third_party/blink/renderer/core/html/parser/html_parser_metrics_test.cc index 8fc9075..87d6f4d 100644 --- a/third_party/blink/renderer/core/html/parser/html_parser_metrics_test.cc +++ b/third_party/blink/renderer/core/html/parser/html_parser_metrics_test.cc
@@ -109,9 +109,11 @@ 19, 1); } -#if (BUILDFLAG(IS_MAC) && defined(ARCH_CPU_ARM64)) || \ - (BUILDFLAG(IS_ANDROID) && defined(ARCH_CPU_X86)) +#if (BUILDFLAG(IS_MAC) && defined(ARCH_CPU_ARM64)) || \ + (BUILDFLAG(IS_ANDROID) && defined(ARCH_CPU_X86)) || \ + (BUILDFLAG(IS_WIN) && defined(ADDRESS_SANITIZER)) // https://crbug.com/1222653 +// https://crbug.com/1406813 #define MAYBE_HistogramReportsTwoChunks DISABLED_HistogramReportsTwoChunks #else #define MAYBE_HistogramReportsTwoChunks HistogramReportsTwoChunks
diff --git a/third_party/blink/renderer/core/inspector/inspector_audits_issue.cc b/third_party/blink/renderer/core/inspector/inspector_audits_issue.cc index f8cff38..654ab0a2 100644 --- a/third_party/blink/renderer/core/inspector/inspector_audits_issue.cc +++ b/third_party/blink/renderer/core/inspector/inspector_audits_issue.cc
@@ -86,6 +86,9 @@ CrossOriginPortalPostMessageError; case mojom::blink::GenericIssueErrorType::kFormLabelForNameError: return protocol::Audits::GenericIssueErrorTypeEnum::FormLabelForNameError; + case mojom::blink::GenericIssueErrorType::kFormDuplicateIdForInputError: + return protocol::Audits::GenericIssueErrorTypeEnum:: + FormDuplicateIdForInputError; } }
diff --git a/third_party/blink/renderer/core/layout/ng/inline/ng_inline_child_layout_context.h b/third_party/blink/renderer/core/layout/ng/inline/ng_inline_child_layout_context.h index 4cb4e48..acc7368 100644 --- a/third_party/blink/renderer/core/layout/ng/inline/ng_inline_child_layout_context.h +++ b/third_party/blink/renderer/core/layout/ng/inline/ng_inline_child_layout_context.h
@@ -31,11 +31,6 @@ NGFragmentItemsBuilder* ItemsBuilder() { return &items_builder_; } - // Returns an instance of |NGLogicalLineItems|. This is reused when laying out - // the next line. - // TODO(crbug.com/1402001): Deprecated, remove once all usages are gone. - NGLogicalLineItems* LogicalLineItems() { return &logical_line_items_; } - // Acquire/release temporary |NGLogicalLineItems|, used for a short period of // time, but needed multiple times in a context. NGLogicalLineItems& AcquireTempLogicalLineItems();
diff --git a/third_party/blink/renderer/core/layout/ng/inline/ng_inline_layout_algorithm.cc b/third_party/blink/renderer/core/layout/ng/inline/ng_inline_layout_algorithm.cc index a0f8d75..e0a62a0 100644 --- a/third_party/blink/renderer/core/layout/ng/inline/ng_inline_layout_algorithm.cc +++ b/third_party/blink/renderer/core/layout/ng/inline/ng_inline_layout_algorithm.cc
@@ -1207,17 +1207,16 @@ is_pushed_by_floats = true; } - // For initial letter, we should clear previous block's initial letter[1] + // For initial letter, we should clear previous block's initial letter[1][2] // if: // - new formatting context // - starts with an initial letter // - `clear` in start direction of initial letter containing block. // // [1] https://drafts.csswg.org/css-inline/#short-para-initial-letter - // TODO(crbug.com/1402001): `LogicalLineItems()` is unused, and thus is always - // empty. Replace it with the correct condition, then remove - // `LogicalLineItems()`. - if (context_->LogicalLineItems()->IsEmpty()) { + // [2] + // https://wpt.live/css/css-inline/initial-letter/initial-letter-short-para-initial-letter-clears.html + if (!context_->ItemsBuilder()->Size()) { const EClear clear_type = UNLIKELY(Node().HasInitialLetterBox()) ? EClear::kBoth
diff --git a/third_party/blink/renderer/core/layout/ng/ng_block_node.cc b/third_party/blink/renderer/core/layout/ng/ng_block_node.cc index b44f309..121ce520e 100644 --- a/third_party/blink/renderer/core/layout/ng/ng_block_node.cc +++ b/third_party/blink/renderer/core/layout/ng/ng_block_node.cc
@@ -741,14 +741,12 @@ wtf_size_t index = FragmentIndex(break_token); const auto& fragment = To<NGPhysicalBoxFragment>(result->PhysicalFragment()); - // Unless it's the very last fragment to be generated, we need to create a - // special "repeat" break token, which will be the incoming break token when - // generating the next fragment. This is needed in order to get the sequence - // numbers right, which is important when adding the result to the LayoutBox, - // and it's also needed by pre-paint / paint. - const NGBlockBreakToken* outgoing_break_token = nullptr; - if (constraint_space.ShouldRepeat()) - outgoing_break_token = NGBlockBreakToken::CreateRepeated(*this, index); + // We need to create a special "repeat" break token, which will be the + // incoming break token when generating the next fragment. This is needed in + // order to get the sequence numbers right, which is important when adding the + // result to the LayoutBox, and it's also needed by pre-paint / paint. + const NGBlockBreakToken* outgoing_break_token = + NGBlockBreakToken::CreateRepeated(*this, index); auto mutator = fragment.GetMutableForCloning(); mutator.SetBreakToken(outgoing_break_token); if (!is_first) { @@ -762,27 +760,42 @@ } if (!constraint_space.ShouldRepeat()) { - // This is the last fragment. It won't be repeated again. We have already - // created fragments for the repeated nodes, but the cloning was shallow. - // We're now ready to deep-clone the entire subtree for each repeated - // fragment, and update the layout result vector in the LayoutBox, including - // setting correct break tokens with sequence numbers. - wtf_size_t fragment_count = box_->PhysicalFragmentCount(); - DCHECK_GE(fragment_count, 1u); - box_->ClearNeedsLayout(); - for (wtf_size_t i = 1; i < fragment_count; i++) { - const NGPhysicalBoxFragment& physical_fragment = - *box_->GetPhysicalFragment(i); - is_first = i == 1; - bool is_last = i + 1 == fragment_count; - NGFragmentRepeater repeater(is_first, is_last); - repeater.CloneChildFragments(physical_fragment); - } + FinishRepeatableRoot(); } return result; } +void NGBlockNode::FinishRepeatableRoot() const { + DCHECK(!NGDisableSideEffectsScope::IsDisabled()); + + // This is the last fragment. It won't be repeated again. We have already + // created fragments for the repeated nodes, but the cloning was shallow. + // We're now ready to deep-clone the entire subtree for each repeated + // fragment, and update the layout result vector in the LayoutBox, including + // setting correct break tokens with sequence numbers. + + // First remove the outgoing break token from the last fragment, that was set + // in LayoutRepeatableRoot(). + const NGPhysicalBoxFragment& last_fragment = box_->PhysicalFragments().back(); + auto mutator = last_fragment.GetMutableForCloning(); + mutator.SetBreakToken(nullptr); + + box_->FinalizeLayoutResults(); + + wtf_size_t fragment_count = box_->PhysicalFragmentCount(); + DCHECK_GE(fragment_count, 1u); + box_->ClearNeedsLayout(); + for (wtf_size_t i = 1; i < fragment_count; i++) { + const NGPhysicalBoxFragment& physical_fragment = + *box_->GetPhysicalFragment(i); + bool is_first = i == 1; + bool is_last = i + 1 == fragment_count; + NGFragmentRepeater repeater(is_first, is_last); + repeater.CloneChildFragments(physical_fragment); + } +} + const NGLayoutResult* NGBlockNode::CachedLayoutResultForOutOfFlowPositioned( LogicalSize container_content_size) const { DCHECK(IsOutOfFlowPositioned());
diff --git a/third_party/blink/renderer/core/layout/ng/ng_block_node.h b/third_party/blink/renderer/core/layout/ng/ng_block_node.h index 0347038..37ad52c6 100644 --- a/third_party/blink/renderer/core/layout/ng/ng_block_node.h +++ b/third_party/blink/renderer/core/layout/ng/ng_block_node.h
@@ -56,18 +56,18 @@ // // NGConstraintSpace::ShouldRepeat() will tell whether the node is // (potentially [1]) going to repeat again (in which case an outgoing "repeat" - // break token will be created, or if this is the last time (no outgoing break - // token will be created). + // break token will be created, or if this is the last time. + // FinishRepeatableRoot() will be invoked if it's the last time. It is allowed + // to call this function with NGConstraintSpace::ShouldRepeat() set to true + // every time, but then the calling code needs to call FinishRepeatableRoot() + // when it realizes that we're done. // // [1] Depending on the type of content, and depending on the way we implement // it, we may or may not be able to tell up-front whether it's going to repeat // again. // // Note that we only actually lay it out once - when at the first container - // fragment. Any subsequent call will just clone the previous result. When - // we're done repeating, when at the last fragment, we'll finalize the cloned - // results, by deep-cloning and setting the correct break token sequence - // numbers. + // fragment. Any subsequent call will just clone the previous result. // // Ideally, there should only be one fragment subtree generated from a // repeated element (which could simply be inserted inside every relevant @@ -78,6 +78,13 @@ const NGLayoutResult* LayoutRepeatableRoot(const NGConstraintSpace&, const NGBlockBreakToken*) const; + // Finalize the cloned layout results of a repeatable root. This will + // deep-clone and set the correct break token sequence numbers, and make sure + // that the final fragment has no outgoing break token. + // + // To be called when we're done repeating a node, when at the last fragment. + void FinishRepeatableRoot() const; + // This method is just for use within the |NGOutOfFlowLayoutPart|. // // As OOF-positioned objects have their position, and size computed
diff --git a/third_party/blink/renderer/core/layout/ng/ng_out_of_flow_layout_part.cc b/third_party/blink/renderer/core/layout/ng/ng_out_of_flow_layout_part.cc index a17a19b6b..10bc2a4 100644 --- a/third_party/blink/renderer/core/layout/ng/ng_out_of_flow_layout_part.cc +++ b/third_party/blink/renderer/core/layout/ng/ng_out_of_flow_layout_part.cc
@@ -1222,6 +1222,21 @@ HeapVector<HeapVector<NodeToLayout>> descendants_to_layout; ClearCollectionScope<HeapVector<HeapVector<NodeToLayout>>> descendants_to_layout_scope(&descendants_to_layout); + + // List of repeated fixed-positioned elements. Elements will be added as they + // are discovered (which might not happen in the first iteration, if they are + // nested inside another OOFs). + HeapVector<NodeToLayout> repeated_fixedpos_descendants; + ClearCollectionScope<HeapVector<NodeToLayout>> + repeated_fixedpos_descendants_scope(&repeated_fixedpos_descendants); + + // The fragmentainer index at which we have to resume repetition of + // fixed-positioned elements, if additional fragmentainers are added. We'll + // add repeated elements to every fragmentainer that exists, but if there's a + // nested OOF that triggers creation of additional fragmentainers, we'll need + // to add the fixed-positioned elements to those as well. + wtf_size_t previous_repeaded_fixedpos_resume_idx = WTF::kNotFound; + while (descendants->size() > 0) { ComputeInlineContainingBlocksForFragmentainer(*descendants); @@ -1323,6 +1338,10 @@ auto& children = FragmentationContextChildren(); wtf_size_t num_children = children.size(); + // Set to true if an OOF inside a fragmentainer breaks. This does not + // include repeated fixed-positioned elements. + bool last_fragmentainer_has_break_inside = false; + // Layout the OOF descendants in order of fragmentainer index. for (wtf_size_t index = 0; index < descendants_to_layout.size(); index++) { @@ -1336,12 +1355,26 @@ if (!fragment || fragment->IsFragmentainerBox()) { HeapVector<NodeToLayout>& pending_descendants = descendants_to_layout[index]; - bool is_last_fragmentainer_with_oof_descendants = - index + 1 == descendants_to_layout.size(); - LayoutOOFsInFragmentainer(pending_descendants, index, - fragmentainer_progression, - is_last_fragmentainer_with_oof_descendants, - &fragmented_descendants); + + if (!repeated_fixedpos_descendants.empty() && + index == previous_repeaded_fixedpos_resume_idx) { + // This is a new fragmentainer, and we had previously added repeated + // fixed-positioned elements to all preceding fragmentainers (in a + // previous iteration; this may happen when there are nested OOFs). + // We now need to make sure that we add the repeated + // fixed-positioned elements to all new fragmentainers as well. + fragmented_descendants.PrependVector(repeated_fixedpos_descendants); + // We need to clear the vector, since we'll find and re-add all the + // repeated elements (both these, and any new ones discovered) in + // fragmented_descendants when we're done with the current loop. + repeated_fixedpos_descendants.clear(); + } + + last_fragmentainer_has_break_inside = false; + LayoutOOFsInFragmentainer( + pending_descendants, index, fragmentainer_progression, + &last_fragmentainer_has_break_inside, &fragmented_descendants); + // Retrieve the updated or newly added fragmentainer, and add its // block contribution to the consumed block size. Skip this if we are // column balancing, though, since this is only needed when adding @@ -1358,10 +1391,33 @@ // Extend |descendants_to_layout| if an OOF element fragments into a // fragmentainer at an index that does not yet exist in - // |descendants_to_layout|. + // |descendants_to_layout|. At the same time we need to make sure that + // repeated fixed-positioned elements don't trigger creation of + // additional fragmentainers (since they'd just repeat forever). if (index == descendants_to_layout.size() - 1 && - !fragmented_descendants.empty()) + (last_fragmentainer_has_break_inside || + (!fragmented_descendants.empty() && + index + 1 < FragmentationContextChildren().size()))) { descendants_to_layout.resize(index + 2); + } + } + + if (!fragmented_descendants.empty()) { + // We have repeated fixed-positioned elements. If we add more + // fragmentainers in the next iteration (because of nested OOFs), we + // need to resume those when a new fragmentainer is added. + DCHECK(container_builder_->Node().IsPaginatedRoot()); + DCHECK(previous_repeaded_fixedpos_resume_idx == WTF::kNotFound || + previous_repeaded_fixedpos_resume_idx <= + descendants_to_layout.size()); + previous_repeaded_fixedpos_resume_idx = descendants_to_layout.size(); + + // Add all repeated fixed-positioned elements to a list that we'll + // consume if we add more fragmentainers in a subsequent iteration + // (because of nested OOFs), so that we keep on generating fragments for + // the repeated fixed-positioned elements in the new fragmentainers as + // well. + repeated_fixedpos_descendants.AppendVector(fragmented_descendants); } descendants_to_layout.Shrink(0); @@ -1388,6 +1444,17 @@ if (!column_balancing_info_) container_builder_->SwapOutOfFlowFragmentainerDescendants(descendants); } + + if (container_builder_->Node().IsPaginatedRoot()) { + // Finish repeated fixed-positioned elements. + for (const NodeToLayout& node_to_layout : repeated_fixedpos_descendants) { + const NGBlockNode& node = node_to_layout.node_info.node; + DCHECK_EQ(node.Style().GetPosition(), EPosition::kFixed); + node.FinishRepeatableRoot(); + } + } else { + DCHECK(repeated_fixedpos_descendants.empty()); + } } NGOutOfFlowLayoutPart::NodeInfo NGOutOfFlowLayoutPart::SetupNodeInfo( @@ -1494,8 +1561,7 @@ NodeToLayout& oof_node_to_layout, const LayoutBox* only_layout, const NGConstraintSpace* fragmentainer_constraint_space, - bool is_last_fragmentainer_so_far, - bool is_known_to_be_very_last_fragmentainer) { + bool is_last_fragmentainer_so_far) { const NodeInfo& node_info = oof_node_to_layout.node_info; OffsetInfo& offset_info = oof_node_to_layout.offset_info; if (offset_info.has_cached_layout_result) { @@ -1505,9 +1571,9 @@ NGBoxStrut scrollbars_before = ComputeScrollbarsForNonAnonymous(node_info.node); - const NGLayoutResult* layout_result = Layout( - oof_node_to_layout, fragmentainer_constraint_space, - is_last_fragmentainer_so_far, is_known_to_be_very_last_fragmentainer); + const NGLayoutResult* layout_result = + Layout(oof_node_to_layout, fragmentainer_constraint_space, + is_last_fragmentainer_so_far); // Since out-of-flow positioning sets up a constraint space with fixed // inline-size, the regular layout code (|NGBlockNode::Layout()|) cannot @@ -1572,8 +1638,7 @@ } layout_result = Layout(oof_node_to_layout, fragmentainer_constraint_space, - is_last_fragmentainer_so_far, - is_known_to_be_very_last_fragmentainer); + is_last_fragmentainer_so_far); scrollbars_after = ComputeScrollbarsForNonAnonymous(node_info.node); DCHECK(!freeze_horizontal || !freeze_vertical || @@ -1805,8 +1870,7 @@ const NGLayoutResult* NGOutOfFlowLayoutPart::Layout( const NodeToLayout& oof_node_to_layout, const NGConstraintSpace* fragmentainer_constraint_space, - bool is_last_fragmentainer_so_far, - bool is_known_to_be_very_last_fragmentainer) { + bool is_last_fragmentainer_so_far) { const NodeInfo& node_info = oof_node_to_layout.node_info; const WritingDirectionMode candidate_writing_direction = node_info.node.Style().GetWritingDirection(); @@ -1835,27 +1899,13 @@ if (fragmentainer_constraint_space && offset_info.initial_layout_result) should_use_fixed_block_size = false; - RepeatMode repeat_mode = kNotRepeated; - if (container_builder_->Node().IsPaginatedRoot() && - node_info.node.Style().GetPosition() == EPosition::kFixed && - !oof_node_to_layout.containing_block_fragment) { - // Fixed-positioned elements are repeated when paginated, if contained by - // the initial containing block (i.e. when not contained by a transformed - // element or similar). - if (is_known_to_be_very_last_fragmentainer) { - repeat_mode = kRepeatedLast; - } else { - repeat_mode = kMayRepeatAgain; - } - } - layout_result = GenerateFragment( oof_node_to_layout, container_content_size_in_candidate_writing_mode, offset_info.block_estimate, offset_info.node_dimensions, offset.block_offset, oof_node_to_layout.break_token, fragmentainer_constraint_space, should_use_fixed_block_size, node_info.requires_content_before_breaking, - is_last_fragmentainer_so_far, repeat_mode); + is_last_fragmentainer_so_far); } if (layout_result->Status() != NGLayoutResult::kSuccess) { @@ -1922,8 +1972,7 @@ const NGConstraintSpace* fragmentainer_constraint_space, bool should_use_fixed_block_size, bool requires_content_before_breaking, - bool is_last_fragmentainer_so_far, - RepeatMode repeat_mode) { + bool is_last_fragmentainer_so_far) { const NodeInfo& node_info = oof_node_to_layout.node_info; const NGBlockNode& node = node_info.node; const auto& style = node.Style(); @@ -1951,12 +2000,15 @@ if (should_use_fixed_block_size) builder.SetIsFixedBlockSize(true); if (fragmentainer_constraint_space) { - if (repeat_mode != kNotRepeated) { - // Paginated fixed-positioned elements are repeated on every page, and may - // therefore not fragment. + if (container_builder_->Node().IsPaginatedRoot() && + style.GetPosition() == EPosition::kFixed && + !oof_node_to_layout.containing_block_fragment) { + // Paginated fixed-positioned elements are repeated on every page, if + // contained by the initial containing block (i.e. when not contained by a + // transformed element or similar) and may therefore not fragment. DCHECK(container_builder_->Node().IsPaginatedRoot()); DCHECK_EQ(node.Style().GetPosition(), EPosition::kFixed); - builder.SetShouldRepeat(repeat_mode != kRepeatedLast); + builder.SetShouldRepeat(true); builder.SetIsInsideRepeatableContent(true); is_repeatable = true; } else { @@ -1999,14 +2051,12 @@ HeapVector<NodeToLayout>& pending_descendants, wtf_size_t index, LogicalOffset fragmentainer_progression, - bool is_last_fragmentainer_with_oof_descendants, + bool* has_actual_break_inside, HeapVector<NodeToLayout>* fragmented_descendants) { auto& children = FragmentationContextChildren(); wtf_size_t num_children = children.size(); bool is_new_fragment = index >= num_children; bool is_last_fragmentainer_so_far = index + 1 == num_children; - bool is_known_to_have_more_fragmentainers = - index + 1 < num_children || !is_last_fragmentainer_with_oof_descendants; DCHECK(fragmented_descendants); HeapVector<NodeToLayout> descendants_continued; @@ -2055,61 +2105,29 @@ previous_break_token, /* early_break */ nullptr); - bool is_known_to_be_very_last_fragmentainer = false; + // |algorithm| corresponds to the "mutable copy" of our original + // fragmentainer. As long as this "copy" hasn't been laid out via + // NGSimplifiedOOFLayoutAlgorithm::Layout, we can append new items to it. + NGSimplifiedOOFLayoutAlgorithm algorithm(params, *fragment, is_new_fragment); + // Layout any OOF elements that are a continuation of layout first. + for (auto& descendant : descendants_continued) { + AddOOFToFragmentainer(descendant, &space, fragmentainer_offset, index, + is_last_fragmentainer_so_far, has_actual_break_inside, + &algorithm, fragmented_descendants); + } + // Once we've laid out the OOF elements that are a continuation of layout, + // we can layout the OOF elements that start layout in the current + // fragmentainer. + for (auto& descendant : pending_descendants) { + AddOOFToFragmentainer(descendant, &space, fragmentainer_offset, index, + is_last_fragmentainer_so_far, has_actual_break_inside, + &algorithm, fragmented_descendants); + } - do { - // |algorithm| corresponds to the "mutable copy" of our original - // fragmentainer. As long as this "copy" hasn't been laid out via - // NGSimplifiedOOFLayoutAlgorithm::Layout, we can append new items to it. - NGSimplifiedOOFLayoutAlgorithm algorithm(params, *fragment, - is_new_fragment); - // Layout any OOF elements that are a continuation of layout first. - for (auto& descendant : descendants_continued) { - AddOOFToFragmentainer(descendant, &space, fragmentainer_offset, index, - is_last_fragmentainer_so_far, - is_known_to_be_very_last_fragmentainer, &algorithm, - fragmented_descendants); - } - // Once we've laid out the OOF elements that are a continuation of layout, - // we can layout the OOF elements that start layout in the current - // fragmentainer. - for (auto& descendant : pending_descendants) { - AddOOFToFragmentainer(descendant, &space, fragmentainer_offset, index, - is_last_fragmentainer_so_far, - is_known_to_be_very_last_fragmentainer, &algorithm, - fragmented_descendants); - } - - if (container_builder_->Node().IsPaginatedRoot() && - !is_known_to_have_more_fragmentainers && - !fragmented_descendants->empty()) { - // This will be the last fragmentainer, unless we have regular - // (i.e. non-repeated) out-of-flow positioned elements that fragmented. - bool has_descendant_with_break = false; - for (const auto& descendant : *fragmented_descendants) { - DCHECK(descendant.break_token); - if (!descendant.break_token->IsRepeated()) { - has_descendant_with_break = true; - break; - } - } - if (!has_descendant_with_break) { - // This turned out to be the last fragmentainer. We didn't know that - // up-front, so that all repeated fixed positioned fragments created a - // repeat break token. But they are not going to repeat any further, so - // we now need a re-layout with that in mind (so that they don't get - // outgoing break tokens). - is_known_to_be_very_last_fragmentainer = true; - fragmented_descendants->clear(); - continue; - } - } - // Finalize layout on the cloned fragmentainer and replace all existing - // references to the old result. - ReplaceFragmentainer(index, fragmentainer_offset, is_new_fragment, - &algorithm); - break; - } while (true); + // Finalize layout on the cloned fragmentainer and replace all existing + // references to the old result. + ReplaceFragmentainer(index, fragmentainer_offset, is_new_fragment, + &algorithm); } void NGOutOfFlowLayoutPart::AddOOFToFragmentainer( @@ -2118,12 +2136,12 @@ LogicalOffset fragmentainer_offset, wtf_size_t index, bool is_last_fragmentainer_so_far, - bool is_known_to_be_very_last_fragmentainer, + bool* has_actual_break_inside, NGSimplifiedOOFLayoutAlgorithm* algorithm, HeapVector<NodeToLayout>* fragmented_descendants) { - const NGLayoutResult* result = LayoutOOFNode( - descendant, /* only_layout */ nullptr, fragmentainer_space, - is_last_fragmentainer_so_far, is_known_to_be_very_last_fragmentainer); + const NGLayoutResult* result = + LayoutOOFNode(descendant, /* only_layout */ nullptr, fragmentainer_space, + is_last_fragmentainer_so_far); if (result->Status() != NGLayoutResult::kSuccess) { DCHECK_EQ(result->Status(), NGLayoutResult::kOutOfFragmentainerSpace); @@ -2131,6 +2149,7 @@ NodeToLayout fragmented_descendant = descendant; fragmented_descendant.offset_info.offset.block_offset = LayoutUnit(); fragmented_descendants->emplace_back(fragmented_descendant); + *has_actual_break_inside = true; return; } @@ -2187,13 +2206,14 @@ To<NGPhysicalBoxFragment>(result->PhysicalFragment()); const NGBlockBreakToken* break_token = physical_fragment.BreakToken(); if (break_token) { - DCHECK(!is_known_to_be_very_last_fragmentainer); // We must continue layout in the next fragmentainer. Update any information // in NodeToLayout, and add the node to |fragmented_descendants|. NodeToLayout fragmented_descendant = descendant; fragmented_descendant.break_token = break_token; - if (!break_token->IsRepeated()) + if (!break_token->IsRepeated()) { fragmented_descendant.offset_info.offset.block_offset = LayoutUnit(); + *has_actual_break_inside = true; + } fragmented_descendants->emplace_back(fragmented_descendant); }
diff --git a/third_party/blink/renderer/core/layout/ng/ng_out_of_flow_layout_part.h b/third_party/blink/renderer/core/layout/ng/ng_out_of_flow_layout_part.h index 19df813..088bb527 100644 --- a/third_party/blink/renderer/core/layout/ng/ng_out_of_flow_layout_part.h +++ b/third_party/blink/renderer/core/layout/ng/ng_out_of_flow_layout_part.h
@@ -263,8 +263,6 @@ NGBlockNode container); private: - enum RepeatMode { kNotRepeated, kMayRepeatAgain, kRepeatedLast }; - bool SweepLegacyCandidates( const HeapHashSet<Member<const LayoutObject>>& placed_objects); @@ -322,8 +320,7 @@ NodeToLayout& oof_node_to_layout, const LayoutBox* only_layout, const NGConstraintSpace* fragmentainer_constraint_space = nullptr, - bool is_last_fragmentainer_so_far = false, - bool is_known_to_be_very_last_fragmentainer = false); + bool is_last_fragmentainer_so_far = false); // TODO(almaher): We are calculating more than just the offset. Consider // changing this to a more accurate name. @@ -347,8 +344,7 @@ const NGLayoutResult* Layout( const NodeToLayout& oof_node_to_layout, const NGConstraintSpace* fragmentainer_constraint_space, - bool is_last_fragmentainer_so_far, - bool is_known_to_be_very_last_fragmentainer); + bool is_last_fragmentainer_so_far); bool IsContainingBlockForCandidate(const NGLogicalOutOfFlowPositionedNode&); @@ -362,8 +358,7 @@ const NGConstraintSpace* fragmentainer_constraint_space, bool should_use_fixed_block_size, bool requires_content_before_breaking, - bool is_last_fragmentainer_so_far, - RepeatMode repeat_mode); + bool is_last_fragmentainer_so_far); // Performs layout on the OOFs stored in |pending_descendants| and // |fragmented_descendants|, adding them as children in the fragmentainer @@ -374,18 +369,20 @@ // |fragmented_descendants| is also an output variable in that any OOF that // has not finished layout in the current pass will be added back to // |fragmented_descendants| to continue layout in the next fragmentainer. + // |has_actual_break_inside| will be set to true if any of the OOFs laid out + // broke (this does not include repeated fixed-positioned elements). void LayoutOOFsInFragmentainer( HeapVector<NodeToLayout>& pending_descendants, wtf_size_t index, LogicalOffset fragmentainer_progression, - bool is_last_fragmentainer_with_oof_descendants, + bool* has_actual_break_inside, HeapVector<NodeToLayout>* fragmented_descendants); void AddOOFToFragmentainer(NodeToLayout& descendant, const NGConstraintSpace* fragmentainer_space, LogicalOffset fragmentainer_offset, wtf_size_t index, bool is_last_fragmentainer_so_far, - bool is_known_to_be_very_last_fragmentainer, + bool* has_actual_break_inside, NGSimplifiedOOFLayoutAlgorithm* algorithm, HeapVector<NodeToLayout>* fragmented_descendants); void ReplaceFragmentainer(wtf_size_t index,
diff --git a/third_party/blink/renderer/core/layout/svg/transform_helper.cc b/third_party/blink/renderer/core/layout/svg/transform_helper.cc index cb47235..54fed35 100644 --- a/third_party/blink/renderer/core/layout/svg/transform_helper.cc +++ b/third_party/blink/renderer/core/layout/svg/transform_helper.cc
@@ -50,9 +50,7 @@ DCHECK_EQ(style.TransformBox(), ETransformBox::kViewBox); SVGLengthContext length_context( DynamicTo<SVGElement>(layout_object.GetNode())); - gfx::SizeF viewport_size; - length_context.DetermineViewport(viewport_size); - reference_box.set_size(viewport_size); + reference_box.set_size(length_context.ResolveViewport()); } const float zoom = style.EffectiveZoom(); if (zoom != 1)
diff --git a/third_party/blink/renderer/core/loader/document_loader.h b/third_party/blink/renderer/core/loader/document_loader.h index 3dc94d5..cee043a 100644 --- a/third_party/blink/renderer/core/loader/document_loader.h +++ b/third_party/blink/renderer/core/loader/document_loader.h
@@ -85,6 +85,7 @@ #include "third_party/blink/renderer/platform/loader/fetch/resource_response.h" #include "third_party/blink/renderer/platform/storage/blink_storage_key.h" #include "third_party/blink/renderer/platform/weborigin/referrer.h" +#include "third_party/blink/renderer/platform/wtf/gc_plugin_ignore.h" #include "third_party/blink/renderer/platform/wtf/hash_set.h" #include "third_party/blink/renderer/platform/wtf/shared_buffer.h" @@ -650,6 +651,7 @@ bool data_received_; const bool is_error_page_for_failed_navigation_; + GC_PLUGIN_IGNORE("https://crbug.com/1381979") mojo::Remote<mojom::blink::ContentSecurityNotifier> content_security_notifier_;
diff --git a/third_party/blink/renderer/core/svg/graphics/filters/svg_fe_image.cc b/third_party/blink/renderer/core/svg/graphics/filters/svg_fe_image.cc index b577fd4..99e378a 100644 --- a/third_party/blink/renderer/core/svg/graphics/filters/svg_fe_image.cc +++ b/third_party/blink/renderer/core/svg/graphics/filters/svg_fe_image.cc
@@ -88,10 +88,10 @@ // subregion. // TODO(crbug/260709): This fixes relative lengths but breaks non-relative // ones. - SVGLengthContext length_context(element); - gfx::SizeF viewport_size; - if (!length_context.DetermineViewport(viewport_size)) + gfx::SizeF viewport_size = SVGLengthContext(element).ResolveViewport(); + if (viewport_size.IsEmpty()) { return absl::nullopt; + } return MakeMapBetweenRects(gfx::RectF(viewport_size), target_rect); }
diff --git a/third_party/blink/renderer/core/svg/svg_length_context.cc b/third_party/blink/renderer/core/svg/svg_length_context.cc index b569709..b1b9b45 100644 --- a/third_party/blink/renderer/core/svg/svg_length_context.cc +++ b/third_party/blink/renderer/core/svg/svg_length_context.cc
@@ -43,25 +43,6 @@ namespace { -inline float DimensionForLengthMode(SVGLengthMode mode, - const gfx::SizeF& viewport_size) { - switch (mode) { - case SVGLengthMode::kWidth: - return viewport_size.width(); - case SVGLengthMode::kHeight: - return viewport_size.height(); - case SVGLengthMode::kOther: - // Returns the normalized diagonal length of the viewport, as defined in - // https://www.w3.org/TR/SVG2/coords.html#Units. - return ClampTo<float>(std::sqrt( - gfx::Vector2dF(viewport_size.width(), viewport_size.height()) - .LengthSquared() / - 2)); - } - NOTREACHED(); - return 0; -} - const ComputedStyle* ComputedStyleForLengthResolving( const SVGElement* context) { if (!context) { @@ -366,7 +347,7 @@ gfx::SizeF viewport_size_for_resolve; if (size.Width().IsPercentOrCalc() || size.Height().IsPercentOrCalc() || point.X().IsPercentOrCalc() || point.Y().IsPercentOrCalc()) { - SVGLengthContext(context).DetermineViewport(viewport_size_for_resolve); + viewport_size_for_resolve = SVGLengthContext(context).ResolveViewport(); } // Resolve the Lengths to user units. resolved_rect = @@ -397,7 +378,7 @@ const ComputedStyle& style) const { gfx::SizeF viewport_size; if (x_length.IsPercentOrCalc() || y_length.IsPercentOrCalc()) { - DetermineViewport(viewport_size); + viewport_size = ResolveViewport(); // If either |x_length| or |y_length| is 'auto', set that viewport dimension // to zero so that the corresponding Length resolves to zero. This matches // the behavior of ValueForLength() below. @@ -460,13 +441,9 @@ float SVGLengthContext::ValueForLength(const Length& length, float zoom, SVGLengthMode mode) const { - float dimension = 0; - if (length.IsPercentOrCalc()) { - gfx::SizeF viewport_size; - DetermineViewport(viewport_size); - // The viewport will be unaffected by zoom. - dimension = DimensionForLengthMode(mode, viewport_size); - } + // The viewport will be unaffected by zoom. + const float dimension = + length.IsPercentOrCalc() ? ViewportDimension(mode) : 0; return ValueForLength(length, zoom, dimension); } @@ -499,14 +476,9 @@ case CSSPrimitiveValue::UnitType::kUserUnits: user_units = value; break; - case CSSPrimitiveValue::UnitType::kPercentage: { - gfx::SizeF viewport_size; - if (!DetermineViewport(viewport_size)) { - return 0; - } - user_units = value * DimensionForLengthMode(mode, viewport_size) / 100; + case CSSPrimitiveValue::UnitType::kPercentage: + user_units = value * ViewportDimension(mode) / 100; break; - } case CSSPrimitiveValue::UnitType::kEms: user_units = ConvertValueFromEMSToUserUnits( ComputedStyleForLengthResolving(context_), value); @@ -601,11 +573,7 @@ case CSSPrimitiveValue::UnitType::kUserUnits: return value; case CSSPrimitiveValue::UnitType::kPercentage: { - gfx::SizeF viewport_size; - if (!DetermineViewport(viewport_size)) { - return 0; - } - float dimension = DimensionForLengthMode(mode, viewport_size); + const float dimension = ViewportDimension(mode); if (!dimension) { return 0; } @@ -671,30 +639,44 @@ return 0; } -bool SVGLengthContext::DetermineViewport(gfx::SizeF& viewport_size) const { +gfx::SizeF SVGLengthContext::ResolveViewport() const { if (!context_) { - return false; + return gfx::SizeF(); } - // Root <svg> element lengths are resolved against the top level viewport. if (context_->IsOutermostSVGSVGElement()) { - viewport_size = To<SVGSVGElement>(context_)->CurrentViewportSize(); - return true; + return To<SVGSVGElement>(context_)->CurrentViewportSize(); } - // Take size from nearest viewport element. SVGElement* viewport_element = context_->viewportElement(); const auto* svg = DynamicTo<SVGSVGElement>(viewport_element); if (!svg) { - return false; + return gfx::SizeF(); } - - viewport_size = svg->CurrentViewBoxRect().size(); + gfx::SizeF viewport_size = svg->CurrentViewBoxRect().size(); if (viewport_size.IsEmpty()) { viewport_size = svg->CurrentViewportSize(); } + return viewport_size; +} - return true; +float SVGLengthContext::ViewportDimension(SVGLengthMode mode) const { + gfx::SizeF viewport_size = ResolveViewport(); + switch (mode) { + case SVGLengthMode::kWidth: + return viewport_size.width(); + case SVGLengthMode::kHeight: + return viewport_size.height(); + case SVGLengthMode::kOther: + // Returns the normalized diagonal length of the viewport, as defined in + // https://www.w3.org/TR/SVG2/coords.html#Units. + return ClampTo<float>(std::sqrt( + gfx::Vector2dF(viewport_size.width(), viewport_size.height()) + .LengthSquared() / + 2)); + } + NOTREACHED(); + return 0; } } // namespace blink
diff --git a/third_party/blink/renderer/core/svg/svg_length_context.h b/third_party/blink/renderer/core/svg/svg_length_context.h index 5f8ff15..44a4aab1 100644 --- a/third_party/blink/renderer/core/svg/svg_length_context.h +++ b/third_party/blink/renderer/core/svg/svg_length_context.h
@@ -92,10 +92,11 @@ const ComputedStyle&, float dimension); - bool DetermineViewport(gfx::SizeF&) const; + gfx::SizeF ResolveViewport() const; float ResolveValue(const CSSPrimitiveValue&, SVGLengthMode) const; private: + float ViewportDimension(SVGLengthMode) const; float ValueForLength(const Length&, float zoom, SVGLengthMode) const; static float ValueForLength(const Length&, float zoom, float dimension);
diff --git a/third_party/blink/renderer/core/timing/performance.cc b/third_party/blink/renderer/core/timing/performance.cc index f3cf725..337d5de 100644 --- a/third_party/blink/renderer/core/timing/performance.cc +++ b/third_party/blink/renderer/core/timing/performance.cc
@@ -644,8 +644,6 @@ } result->cache_state = info.CacheState(); - result->encoded_body_size = final_response.EncodedBodyLength(); - result->decoded_body_size = final_response.DecodedBodyLength(); result->did_reuse_connection = final_response.ConnectionReused(); // Use SecurityOrigin::Create to handle cases like blob:https://. result->is_secure_transport = base::Contains( @@ -666,12 +664,25 @@ info.RenderBlockingStatus() == RenderBlockingStatusType::kBlocking; result->content_type = g_empty_string; - if (PassesCORSConditions(final_response, destination_origin, - info.RequestMode(), redirect_chain)) { + + bool passes_cors = PassesCORSConditions(final_response, destination_origin, + info.RequestMode(), redirect_chain); + + if (passes_cors) { result->response_status = final_response.HttpStatusCode(); result->content_type = final_response.HttpContentType(); } + bool expose_body_sizes = + RuntimeEnabledFeatures::ResourceTimingUseCORSForBodySizesEnabled() + ? passes_cors + : result->allow_timing_details; + + result->encoded_body_size = + expose_body_sizes ? final_response.EncodedBodyLength() : 0; + result->decoded_body_size = + expose_body_sizes ? final_response.DecodedBodyLength() : 0; + return result; }
diff --git a/third_party/blink/renderer/core/timing/performance_resource_timing.cc b/third_party/blink/renderer/core/timing/performance_resource_timing.cc index c78886a..351d37c 100644 --- a/third_party/blink/renderer/core/timing/performance_resource_timing.cc +++ b/third_party/blink/renderer/core/timing/performance_resource_timing.cc
@@ -449,22 +449,13 @@ } return GetTransferSize(Info()->EncodedBodySize(), Info()->CacheState()); - ; } uint64_t PerformanceResourceTiming::encodedBodySize() const { - if (!Info()->AllowTimingDetails()) { - return 0; - } - return Info()->EncodedBodySize(); } uint64_t PerformanceResourceTiming::decodedBodySize() const { - if (!Info()->AllowTimingDetails()) { - return 0; - } - return Info()->DecodedBodySize(); }
diff --git a/third_party/blink/renderer/core/workers/worker_global_scope.h b/third_party/blink/renderer/core/workers/worker_global_scope.h index 351e21d..1bdcef95 100644 --- a/third_party/blink/renderer/core/workers/worker_global_scope.h +++ b/third_party/blink/renderer/core/workers/worker_global_scope.h
@@ -52,6 +52,7 @@ #include "third_party/blink/renderer/platform/loader/fetch/code_cache_host.h" #include "third_party/blink/renderer/platform/loader/fetch/url_loader/cached_metadata_handler.h" #include "third_party/blink/renderer/platform/wtf/casting.h" +#include "third_party/blink/renderer/platform/wtf/gc_plugin_ignore.h" #include "v8/include/v8-inspector.h" namespace blink { @@ -327,6 +328,7 @@ // attempts (both successful and not successful) by the worker. std::unique_ptr<FontMatchingMetrics> font_matching_metrics_; + GC_PLUGIN_IGNORE("https://crbug.com/1381979") blink::BrowserInterfaceBrokerProxy browser_interface_broker_proxy_; // State transition about worker top-level script evaluation.
diff --git a/third_party/blink/renderer/modules/accessibility/ax_object_cache_impl.h b/third_party/blink/renderer/modules/accessibility/ax_object_cache_impl.h index cce4627..5639fe7 100644 --- a/third_party/blink/renderer/modules/accessibility/ax_object_cache_impl.h +++ b/third_party/blink/renderer/modules/accessibility/ax_object_cache_impl.h
@@ -56,6 +56,7 @@ #include "third_party/blink/renderer/platform/heap/garbage_collected.h" #include "third_party/blink/renderer/platform/mojo/heap_mojo_receiver.h" #include "third_party/blink/renderer/platform/mojo/heap_mojo_remote.h" +#include "third_party/blink/renderer/platform/wtf/gc_plugin_ignore.h" #include "third_party/blink/renderer/platform/wtf/hash_map.h" #include "third_party/blink/renderer/platform/wtf/hash_set.h" #include "third_party/blink/renderer/platform/wtf/vector.h" @@ -902,6 +903,7 @@ // instead. static bool use_ax_menu_list_; + GC_PLUGIN_IGNORE("https://crbug.com/1381979") mojo::Remote<mojom::blink::RenderAccessibilityHost> render_accessibility_host_;
diff --git a/third_party/blink/renderer/modules/background_fetch/background_fetch_registration.h b/third_party/blink/renderer/modules/background_fetch/background_fetch_registration.h index aab55f5..e064ad57 100644 --- a/third_party/blink/renderer/modules/background_fetch/background_fetch_registration.h +++ b/third_party/blink/renderer/modules/background_fetch/background_fetch_registration.h
@@ -15,6 +15,7 @@ #include "third_party/blink/renderer/platform/heap/garbage_collected.h" #include "third_party/blink/renderer/platform/mojo/heap_mojo_receiver.h" #include "third_party/blink/renderer/platform/mojo/heap_mojo_wrapper_mode.h" +#include "third_party/blink/renderer/platform/wtf/gc_plugin_ignore.h" #include "third_party/blink/renderer/platform/wtf/text/wtf_string.h" namespace blink { @@ -132,6 +133,7 @@ mojom::BackgroundFetchFailureReason failure_reason_; HeapVector<Member<BackgroundFetchRecord>> observers_; + GC_PLUGIN_IGNORE("https://crbug.com/1381979") mojo::Remote<mojom::blink::BackgroundFetchRegistrationService> registration_service_;
diff --git a/third_party/blink/renderer/modules/buckets/storage_bucket.h b/third_party/blink/renderer/modules/buckets/storage_bucket.h index 36d84788..ee0c3dc 100644 --- a/third_party/blink/renderer/modules/buckets/storage_bucket.h +++ b/third_party/blink/renderer/modules/buckets/storage_bucket.h
@@ -17,6 +17,7 @@ #include "third_party/blink/renderer/core/execution_context/execution_context_lifecycle_observer.h" #include "third_party/blink/renderer/core/execution_context/navigator_base.h" #include "third_party/blink/renderer/platform/bindings/script_wrappable.h" +#include "third_party/blink/renderer/platform/wtf/gc_plugin_ignore.h" namespace blink { @@ -77,6 +78,7 @@ void ContextDestroyed() override; // BucketHost in the browser process. + GC_PLUGIN_IGNORE("https://crbug.com/1381979") mojo::Remote<mojom::blink::BucketHost> remote_; Member<IDBFactory> idb_factory_;
diff --git a/third_party/blink/renderer/modules/cache_storage/inspector_cache_storage_agent.h b/third_party/blink/renderer/modules/cache_storage/inspector_cache_storage_agent.h index 65050025..0ad5729b 100644 --- a/third_party/blink/renderer/modules/cache_storage/inspector_cache_storage_agent.h +++ b/third_party/blink/renderer/modules/cache_storage/inspector_cache_storage_agent.h
@@ -12,6 +12,7 @@ #include "third_party/blink/renderer/core/inspector/inspector_base_agent.h" #include "third_party/blink/renderer/core/inspector/protocol/cache_storage.h" #include "third_party/blink/renderer/modules/modules_export.h" +#include "third_party/blink/renderer/platform/wtf/gc_plugin_ignore.h" #include "third_party/blink/renderer/platform/wtf/text/wtf_string.h" namespace blink { @@ -55,6 +56,7 @@ private: Member<InspectedFrames> frames_; + GC_PLUGIN_IGNORE("https://crbug.com/1381979") CachesMap caches_; };
diff --git a/third_party/blink/renderer/modules/cookie_store/cookie_store.h b/third_party/blink/renderer/modules/cookie_store/cookie_store.h index 33ff55b..e71630a 100644 --- a/third_party/blink/renderer/modules/cookie_store/cookie_store.h +++ b/third_party/blink/renderer/modules/cookie_store/cookie_store.h
@@ -17,6 +17,7 @@ #include "third_party/blink/renderer/platform/bindings/script_wrappable.h" #include "third_party/blink/renderer/platform/heap/garbage_collected.h" #include "third_party/blink/renderer/platform/mojo/heap_mojo_receiver.h" +#include "third_party/blink/renderer/platform/wtf/gc_plugin_ignore.h" #include "third_party/blink/renderer/platform/wtf/text/wtf_string.h" #include "third_party/blink/renderer/platform/wtf/vector.h" @@ -129,6 +130,7 @@ void StopObserving(); // Wraps an always-on Mojo pipe for sending requests to the Network Service. + GC_PLUGIN_IGNORE("https://crbug.com/1381979") mojo::Remote<network::mojom::blink::RestrictedCookieManager> backend_; // Wraps a Mojo pipe used to receive cookie change notifications.
diff --git a/third_party/blink/renderer/modules/direct_sockets/BUILD.gn b/third_party/blink/renderer/modules/direct_sockets/BUILD.gn index ee650d0..963222e 100644 --- a/third_party/blink/renderer/modules/direct_sockets/BUILD.gn +++ b/third_party/blink/renderer/modules/direct_sockets/BUILD.gn
@@ -50,6 +50,7 @@ "//base/test:test_support", "//testing/gmock", "//testing/gtest", + "//third_party/blink/public/mojom:mojom_platform_blink_headers", "//third_party/blink/renderer/controller:blink_bindings_test_sources", "//third_party/blink/renderer/modules", "//third_party/blink/renderer/platform",
diff --git a/third_party/blink/renderer/modules/direct_sockets/udp_readable_stream_wrapper_unittest.cc b/third_party/blink/renderer/modules/direct_sockets/udp_readable_stream_wrapper_unittest.cc index 87923cb17..fe5a1dd 100644 --- a/third_party/blink/renderer/modules/direct_sockets/udp_readable_stream_wrapper_unittest.cc +++ b/third_party/blink/renderer/modules/direct_sockets/udp_readable_stream_wrapper_unittest.cc
@@ -26,6 +26,7 @@ #include "third_party/blink/renderer/platform/heap/garbage_collected.h" #include "third_party/blink/renderer/platform/mojo/heap_mojo_remote.h" #include "third_party/blink/renderer/platform/testing/unit_test_helpers.h" +#include "third_party/blink/renderer/platform/wtf/gc_plugin_ignore.h" #include "third_party/blink/renderer/platform/wtf/text/wtf_uchar.h" #include "third_party/blink/renderer/platform/wtf/wtf_size_t.h" @@ -42,8 +43,6 @@ num_requested_datagrams += num_additional_datagrams; } - void Close() override { NOTIMPLEMENTED(); } - void ProvideRequestedDatagrams() { DCHECK(remote_.is_bound()); while (num_requested_datagrams > 0) { @@ -95,6 +94,7 @@ FakeDirectUDPSocket& fake_udp_socket() { return fake_udp_socket_; } private: + GC_PLUGIN_IGNORE("https://crbug.com/1381979") mojo::Receiver<blink::mojom::blink::DirectUDPSocket> receiver_; FakeDirectUDPSocket fake_udp_socket_;
diff --git a/third_party/blink/renderer/modules/direct_sockets/udp_socket_mojo_remote.cc b/third_party/blink/renderer/modules/direct_sockets/udp_socket_mojo_remote.cc index fd24e07..cf5fb9a 100644 --- a/third_party/blink/renderer/modules/direct_sockets/udp_socket_mojo_remote.cc +++ b/third_party/blink/renderer/modules/direct_sockets/udp_socket_mojo_remote.cc
@@ -15,9 +15,6 @@ UDPSocketMojoRemote::~UDPSocketMojoRemote() = default; void UDPSocketMojoRemote::Close() { - if (udp_socket_.is_bound()) { - udp_socket_->Close(); - } udp_socket_.reset(); }
diff --git a/third_party/blink/renderer/modules/direct_sockets/udp_writable_stream_wrapper_unittest.cc b/third_party/blink/renderer/modules/direct_sockets/udp_writable_stream_wrapper_unittest.cc index 69ea081..b8c5f4c7 100644 --- a/third_party/blink/renderer/modules/direct_sockets/udp_writable_stream_wrapper_unittest.cc +++ b/third_party/blink/renderer/modules/direct_sockets/udp_writable_stream_wrapper_unittest.cc
@@ -29,6 +29,7 @@ #include "third_party/blink/renderer/platform/heap/persistent.h" #include "third_party/blink/renderer/platform/testing/unit_test_helpers.h" #include "third_party/blink/renderer/platform/wtf/allocator/allocator.h" +#include "third_party/blink/renderer/platform/wtf/gc_plugin_ignore.h" #include "third_party/googletest/src/googlemock/include/gmock/gmock-matchers.h" namespace blink { @@ -44,8 +45,6 @@ void ReceiveMore(uint32_t num_additional_datagrams) override { NOTREACHED(); } - void Close() override { NOTREACHED(); } - const Vector<uint8_t>& GetReceivedData() const { return data_; } private: @@ -97,6 +96,7 @@ absl::optional<bool> close_called_with_; std::unique_ptr<FakeDirectUDPSocket> fake_udp_socket_; + GC_PLUGIN_IGNORE("https://crbug.com/1381979") mojo::Receiver<blink::mojom::blink::DirectUDPSocket> receiver_; Member<UDPWritableStreamWrapper> stream_wrapper_; };
diff --git a/third_party/blink/renderer/modules/font_access/font_access.h b/third_party/blink/renderer/modules/font_access/font_access.h index d1db64ab..036c0d1f 100644 --- a/third_party/blink/renderer/modules/font_access/font_access.h +++ b/third_party/blink/renderer/modules/font_access/font_access.h
@@ -13,6 +13,7 @@ #include "third_party/blink/renderer/platform/bindings/exception_state.h" #include "third_party/blink/renderer/platform/bindings/script_wrappable.h" #include "third_party/blink/renderer/platform/supplementable.h" +#include "third_party/blink/renderer/platform/wtf/gc_plugin_ignore.h" namespace blink { @@ -61,6 +62,7 @@ void OnDisconnect(); + GC_PLUGIN_IGNORE("https://crbug.com/1381979") mojo::Remote<mojom::blink::FontAccessManager> remote_; };
diff --git a/third_party/blink/renderer/modules/indexeddb/idb_factory.h b/third_party/blink/renderer/modules/indexeddb/idb_factory.h index 0e8ddcb..41124d5 100644 --- a/third_party/blink/renderer/modules/indexeddb/idb_factory.h +++ b/third_party/blink/renderer/modules/indexeddb/idb_factory.h
@@ -42,6 +42,7 @@ #include "third_party/blink/renderer/modules/indexeddb/idb_open_db_request.h" #include "third_party/blink/renderer/modules/modules_export.h" #include "third_party/blink/renderer/platform/bindings/script_wrappable.h" +#include "third_party/blink/renderer/platform/wtf/gc_plugin_ignore.h" #include "third_party/blink/renderer/platform/wtf/text/wtf_string.h" namespace blink { @@ -134,7 +135,9 @@ std::unique_ptr<WebIDBCallbacks> callbacks); mojo::PendingRemote<mojom::blink::ObservedFeature> GetObservedFeature(); + GC_PLUGIN_IGNORE("https://crbug.com/1381979") mojo::Remote<mojom::blink::IDBFactory> factory_; + GC_PLUGIN_IGNORE("https://crbug.com/1381979") mojo::Remote<mojom::blink::FeatureObserver> feature_observer_; scoped_refptr<base::SingleThreadTaskRunner> task_runner_; };
diff --git a/third_party/blink/renderer/modules/mediasession/media_session.h b/third_party/blink/renderer/modules/mediasession/media_session.h index 5579914..d5005d0 100644 --- a/third_party/blink/renderer/modules/mediasession/media_session.h +++ b/third_party/blink/renderer/modules/mediasession/media_session.h
@@ -14,6 +14,7 @@ #include "third_party/blink/renderer/platform/mojo/heap_mojo_receiver.h" #include "third_party/blink/renderer/platform/mojo/heap_mojo_wrapper_mode.h" #include "third_party/blink/renderer/platform/supplementable.h" +#include "third_party/blink/renderer/platform/wtf/gc_plugin_ignore.h" #include "third_party/blink/renderer/platform/wtf/text/wtf_string.h" namespace base { @@ -90,6 +91,7 @@ double declared_playback_rate_ = 0.0; Member<MediaMetadata> metadata_; HeapHashMap<String, Member<V8MediaSessionActionHandler>> action_handlers_; + GC_PLUGIN_IGNORE("https://crbug.com/1381979") mojo::Remote<mojom::blink::MediaSessionService> service_; HeapMojoReceiver<blink::mojom::blink::MediaSessionClient, MediaSession> client_receiver_;
diff --git a/third_party/blink/renderer/modules/mediastream/user_media_client_test.cc b/third_party/blink/renderer/modules/mediastream/user_media_client_test.cc index f227803..0bd5f70 100644 --- a/third_party/blink/renderer/modules/mediastream/user_media_client_test.cc +++ b/third_party/blink/renderer/modules/mediastream/user_media_client_test.cc
@@ -50,6 +50,7 @@ #include "third_party/blink/renderer/platform/mediastream/media_stream_track_platform.h" #include "third_party/blink/renderer/platform/testing/io_task_runner_testing_platform_support.h" #include "third_party/blink/renderer/platform/wtf/functional.h" +#include "third_party/blink/renderer/platform/wtf/gc_plugin_ignore.h" #include "third_party/blink/renderer/platform/wtf/text/wtf_string.h" #include "ui/display/screen_info.h" @@ -520,6 +521,7 @@ } std::unique_ptr<WebMediaStreamDeviceObserver> media_stream_device_observer_; + GC_PLUGIN_IGNORE("https://crbug.com/1381979") mojo::Remote<blink::mojom::blink::MediaDevicesDispatcherHost> media_devices_dispatcher_; MockMediaStreamVideoCapturerSource* video_source_ = nullptr;
diff --git a/third_party/blink/renderer/modules/nfc/nfc_proxy.h b/third_party/blink/renderer/modules/nfc/nfc_proxy.h index 25cc73a..6756a2e 100644 --- a/third_party/blink/renderer/modules/nfc/nfc_proxy.h +++ b/third_party/blink/renderer/modules/nfc/nfc_proxy.h
@@ -14,6 +14,7 @@ #include "third_party/blink/renderer/platform/mojo/heap_mojo_receiver.h" #include "third_party/blink/renderer/platform/mojo/heap_mojo_wrapper_mode.h" #include "third_party/blink/renderer/platform/supplementable.h" +#include "third_party/blink/renderer/platform/wtf/gc_plugin_ignore.h" namespace blink { @@ -79,6 +80,7 @@ using WriterSet = HeapHashSet<WeakMember<NDEFReader>>; WriterSet writers_; + GC_PLUGIN_IGNORE("https://crbug.com/1381979") mojo::Remote<device::mojom::blink::NFC> nfc_remote_; HeapMojoReceiver<device::mojom::blink::NFCClient, NFCProxy> client_receiver_; };
diff --git a/third_party/blink/renderer/modules/payments/goods/digital_goods_service.h b/third_party/blink/renderer/modules/payments/goods/digital_goods_service.h index a5a1620..9585b7d 100644 --- a/third_party/blink/renderer/modules/payments/goods/digital_goods_service.h +++ b/third_party/blink/renderer/modules/payments/goods/digital_goods_service.h
@@ -11,6 +11,7 @@ #include "third_party/blink/renderer/bindings/core/v8/script_promise.h" #include "third_party/blink/renderer/platform/bindings/script_wrappable.h" #include "third_party/blink/renderer/platform/heap/forward.h" +#include "third_party/blink/renderer/platform/wtf/gc_plugin_ignore.h" #include "third_party/blink/renderer/platform/wtf/text/wtf_string.h" #include "third_party/blink/renderer/platform/wtf/vector.h" @@ -35,6 +36,7 @@ void Trace(Visitor* visitor) const override; private: + GC_PLUGIN_IGNORE("https://crbug.com/1381979") mojo::Remote<payments::mojom::blink::DigitalGoods> mojo_service_; };
diff --git a/third_party/blink/renderer/modules/payments/goods/dom_window_digital_goods.h b/third_party/blink/renderer/modules/payments/goods/dom_window_digital_goods.h index 5433db4..07e0cf7 100644 --- a/third_party/blink/renderer/modules/payments/goods/dom_window_digital_goods.h +++ b/third_party/blink/renderer/modules/payments/goods/dom_window_digital_goods.h
@@ -10,6 +10,7 @@ #include "third_party/blink/renderer/bindings/core/v8/script_promise.h" #include "third_party/blink/renderer/platform/heap/visitor.h" #include "third_party/blink/renderer/platform/supplementable.h" +#include "third_party/blink/renderer/platform/wtf/gc_plugin_ignore.h" namespace blink { @@ -37,6 +38,7 @@ void Trace(Visitor* visitor) const override; private: + GC_PLUGIN_IGNORE("https://crbug.com/1381979") mojo::Remote<payments::mojom::blink::DigitalGoodsFactory> mojo_service_; static DOMWindowDigitalGoods* FromState(LocalDOMWindow*);
diff --git a/third_party/blink/renderer/modules/peerconnection/peer_connection_dependency_factory.h b/third_party/blink/renderer/modules/peerconnection/peer_connection_dependency_factory.h index 99ee86ca..0381449 100644 --- a/third_party/blink/renderer/modules/peerconnection/peer_connection_dependency_factory.h +++ b/third_party/blink/renderer/modules/peerconnection/peer_connection_dependency_factory.h
@@ -18,6 +18,7 @@ #include "third_party/blink/renderer/platform/heap/prefinalizer.h" #include "third_party/blink/renderer/platform/mojo/mojo_binding_context.h" #include "third_party/blink/renderer/platform/supplementable.h" +#include "third_party/blink/renderer/platform/wtf/gc_plugin_ignore.h" #include "third_party/blink/renderer/platform/wtf/text/wtf_string.h" #include "third_party/blink/renderer/platform/wtf/vector.h" #include "third_party/webrtc/api/peer_connection_interface.h" @@ -199,6 +200,7 @@ media::GpuVideoAcceleratorFactories* gpu_factories_; + GC_PLUGIN_IGNORE("https://crbug.com/1381979") WebrtcVideoPerfReporter webrtc_video_perf_reporter_; THREAD_CHECKER(thread_checker_);
diff --git a/third_party/blink/renderer/modules/peerconnection/peer_connection_tracker.h b/third_party/blink/renderer/modules/peerconnection/peer_connection_tracker.h index 83b092b..dd91c3b 100644 --- a/third_party/blink/renderer/modules/peerconnection/peer_connection_tracker.h +++ b/third_party/blink/renderer/modules/peerconnection/peer_connection_tracker.h
@@ -21,6 +21,7 @@ #include "third_party/blink/renderer/platform/peerconnection/rtc_rtp_transceiver_platform.h" #include "third_party/blink/renderer/platform/peerconnection/rtc_session_description_platform.h" #include "third_party/blink/renderer/platform/supplementable.h" +#include "third_party/blink/renderer/platform/wtf/gc_plugin_ignore.h" #include "third_party/blink/renderer/platform/wtf/hash_map.h" #include "third_party/blink/renderer/platform/wtf/text/wtf_string.h" #include "third_party/webrtc/api/peer_connection_interface.h" @@ -307,6 +308,7 @@ int32_t current_speed_limit_ = mojom::blink::kSpeedLimitMax; THREAD_CHECKER(main_thread_); + GC_PLUGIN_IGNORE("https://crbug.com/1381979") mojo::Remote<blink::mojom::blink::PeerConnectionTrackerHost> peer_connection_tracker_host_; HeapMojoReceiver<blink::mojom::blink::PeerConnectionManager,
diff --git a/third_party/blink/renderer/modules/peerconnection/rtc_peer_connection.cc b/third_party/blink/renderer/modules/peerconnection/rtc_peer_connection.cc index db62875..ed870d3 100644 --- a/third_party/blink/renderer/modules/peerconnection/rtc_peer_connection.cc +++ b/third_party/blink/renderer/modules/peerconnection/rtc_peer_connection.cc
@@ -667,10 +667,11 @@ } void RTCPeerConnection::Dispose() { - // Promptly clears the handler's pointer to |this| + // Promptly clears the handler // so that content/ doesn't access it in a lazy sweeping phase. + // Other references to the handler use a weak pointer, preventing access. if (peer_handler_) { - peer_handler_->CloseAndUnregister(); + peer_handler_.reset(); } }
diff --git a/third_party/blink/renderer/modules/peerconnection/rtc_peer_connection_handler.cc b/third_party/blink/renderer/modules/peerconnection/rtc_peer_connection_handler.cc index e5b6ca8..80d4a03 100644 --- a/third_party/blink/renderer/modules/peerconnection/rtc_peer_connection_handler.cc +++ b/third_party/blink/renderer/modules/peerconnection/rtc_peer_connection_handler.cc
@@ -707,6 +707,8 @@ if (handler_) { handler_->OnModifySctpTransport(std::move(states.sctp_transport_state)); } + // Since OnSessionDescriptionsUpdated can fire events, it may cause + // garbage collection. Ensure that handler_ is still valid. if (handler_) { handler_->OnModifyTransceivers( states.signaling_state, std::move(states.transceiver_states), @@ -1062,6 +1064,8 @@ CHECK(!initialize_called_); initialize_called_ = true; + // Prevent garbage collection of client_ during processing. + auto* client_on_stack = client_; peer_connection_tracker_ = PeerConnectionTracker::From(*frame); configuration_ = server_configuration; @@ -1103,8 +1107,8 @@ peer_connection_tracker_->RegisterPeerConnection(this, configuration_, frame_); } - - return true; + // Gratuitous usage of client_on_stack to prevent compiler errors. + return !!client_on_stack; } bool RTCPeerConnectionHandler::InitializeForTest( @@ -2066,9 +2070,11 @@ pending_remote_description, std::unique_ptr<webrtc::SessionDescriptionInterface> current_remote_description) { + // Prevent garbage collection of client_ during processing. + auto* client_on_stack = client_; if (!client_ || is_closed_) return; - client_->DidChangeSessionDescriptions( + client_on_stack->DidChangeSessionDescriptions( pending_local_description ? CreateWebKitSessionDescription(pending_local_description.get()) : nullptr, @@ -2259,8 +2265,12 @@ int sdp_mline_index, int component, int address_family) { + // In order to ensure that the RTCPeerConnection is not garbage collected + // from under the function, we keep a pointer to it on the stack. + auto* client_on_stack = client_; DCHECK(task_runner_->RunsTasksInCurrentSequence()); TRACE_EVENT0("webrtc", "RTCPeerConnectionHandler::OnIceCandidateImpl"); + // This line can cause garbage collection. auto* platform_candidate = MakeGarbageCollected<RTCIceCandidatePlatform>( sdp, sdp_mid, sdp_mline_index); if (peer_connection_tracker_) { @@ -2269,7 +2279,7 @@ } if (!is_closed_) - client_->DidGenerateICECandidate(platform_candidate); + client_on_stack->DidGenerateICECandidate(platform_candidate); } void RTCPeerConnectionHandler::OnIceCandidateError( @@ -2281,7 +2291,6 @@ const String& error_text) { DCHECK(task_runner_->RunsTasksInCurrentSequence()); TRACE_EVENT0("webrtc", "RTCPeerConnectionHandler::OnIceCandidateError"); - if (peer_connection_tracker_) { peer_connection_tracker_->TrackIceCandidateError( this, address, port, host_candidate, url, error_code, error_text);
diff --git a/third_party/blink/renderer/modules/presentation/presentation_controller.h b/third_party/blink/renderer/modules/presentation/presentation_controller.h index 709e930e6..46b1d4b 100644 --- a/third_party/blink/renderer/modules/presentation/presentation_controller.h +++ b/third_party/blink/renderer/modules/presentation/presentation_controller.h
@@ -18,6 +18,7 @@ #include "third_party/blink/renderer/platform/mojo/heap_mojo_receiver.h" #include "third_party/blink/renderer/platform/supplementable.h" #include "third_party/blink/renderer/platform/weborigin/kurl.h" +#include "third_party/blink/renderer/platform/wtf/gc_plugin_ignore.h" namespace blink { @@ -104,6 +105,7 @@ HeapHashSet<WeakMember<ControllerPresentationConnection>> connections_; // Holder of the Mojo connection to the PresentationService remote. + GC_PLUGIN_IGNORE("https://crbug.com/1381979") mojo::Remote<mojom::blink::PresentationService> presentation_service_remote_; // Lazily-initialized binding for mojom::blink::PresentationController. Sent
diff --git a/third_party/blink/renderer/modules/service_worker/fetch_respond_with_observer.cc b/third_party/blink/renderer/modules/service_worker/fetch_respond_with_observer.cc index a9ba6e00..0b451bf 100644 --- a/third_party/blink/renderer/modules/service_worker/fetch_respond_with_observer.cc +++ b/third_party/blink/renderer/modules/service_worker/fetch_respond_with_observer.cc
@@ -32,6 +32,7 @@ #include "third_party/blink/renderer/platform/bindings/exception_state.h" #include "third_party/blink/renderer/platform/heap/garbage_collected.h" #include "third_party/blink/renderer/platform/loader/fetch/bytes_consumer.h" +#include "third_party/blink/renderer/platform/wtf/gc_plugin_ignore.h" #include "v8/include/v8.h" using blink::mojom::ServiceWorkerResponseError; @@ -189,6 +190,7 @@ mojo::PendingReceiver<mojom::blink::ServiceWorkerStreamCallback> callback_receiver_; + GC_PLUGIN_IGNORE("https://crbug.com/1381979") mojo::Remote<mojom::blink::ServiceWorkerStreamCallback> callback_; std::unique_ptr<ServiceWorkerEventQueue::StayAwakeToken> token_; };
diff --git a/third_party/blink/renderer/modules/websockets/websocket_channel_impl.h b/third_party/blink/renderer/modules/websockets/websocket_channel_impl.h index c62a353..a12e234 100644 --- a/third_party/blink/renderer/modules/websockets/websocket_channel_impl.h +++ b/third_party/blink/renderer/modules/websockets/websocket_channel_impl.h
@@ -58,6 +58,7 @@ #include "third_party/blink/renderer/platform/scheduler/public/frame_scheduler.h" #include "third_party/blink/renderer/platform/weborigin/kurl.h" #include "third_party/blink/renderer/platform/wtf/deque.h" +#include "third_party/blink/renderer/platform/wtf/gc_plugin_ignore.h" #include "third_party/blink/renderer/platform/wtf/text/wtf_string.h" #include "third_party/blink/renderer/platform/wtf/vector.h" #include "third_party/blink/renderer/platform/wtf/wtf_size_t.h" @@ -370,6 +371,7 @@ uint64_t identifier_; Member<BlobLoader> blob_loader_; WTF::Deque<Message> messages_; + GC_PLUGIN_IGNORE("https://crbug.com/1381979") WebSocketMessageChunkAccumulator message_chunks_; const Member<ExecutionContext> execution_context_;
diff --git a/third_party/blink/renderer/platform/loader/fetch/url_loader/worker_main_script_loader.h b/third_party/blink/renderer/platform/loader/fetch/url_loader/worker_main_script_loader.h index b95560c..5bd0801 100644 --- a/third_party/blink/renderer/platform/loader/fetch/url_loader/worker_main_script_loader.h +++ b/third_party/blink/renderer/platform/loader/fetch/url_loader/worker_main_script_loader.h
@@ -24,6 +24,7 @@ #include "third_party/blink/renderer/platform/loader/fetch/response_body_loader_client.h" #include "third_party/blink/renderer/platform/platform_export.h" #include "third_party/blink/renderer/platform/weborigin/kurl.h" +#include "third_party/blink/renderer/platform/wtf/gc_plugin_ignore.h" #include "third_party/blink/renderer/platform/wtf/shared_buffer.h" #include "third_party/blink/renderer/platform/wtf/text/text_encoding.h" @@ -117,7 +118,9 @@ // Whether we need to cancel the loading of the main script. bool has_cancelled_ = false; + GC_PLUGIN_IGNORE("https://crbug.com/1381979") mojo::Remote<network::mojom::URLLoader> url_loader_remote_; + GC_PLUGIN_IGNORE("https://crbug.com/1381979") mojo::Receiver<network::mojom::URLLoaderClient> receiver_{this}; // Used to notify the loading stats of main script when PlzDedicatedWorker.
diff --git a/third_party/blink/renderer/platform/mojo/mojo_binding_context.h b/third_party/blink/renderer/platform/mojo/mojo_binding_context.h index 6df79f64..5e7fdd4 100644 --- a/third_party/blink/renderer/platform/mojo/mojo_binding_context.h +++ b/third_party/blink/renderer/platform/mojo/mojo_binding_context.h
@@ -12,6 +12,7 @@ #include "third_party/blink/renderer/platform/context_lifecycle_notifier.h" #include "third_party/blink/renderer/platform/platform_export.h" #include "third_party/blink/renderer/platform/supplementable.h" +#include "third_party/blink/renderer/platform/wtf/gc_plugin_ignore.h" namespace base { class SingleThreadTaskRunner; @@ -55,6 +56,7 @@ private: bool use_mojo_js_interface_broker_; + GC_PLUGIN_IGNORE("https://crbug.com/1381979") BrowserInterfaceBrokerProxy mojo_js_interface_broker_; };
diff --git a/third_party/blink/renderer/platform/peerconnection/rtc_stats_test.cc b/third_party/blink/renderer/platform/peerconnection/rtc_stats_test.cc index 6a284db..93732bc 100644 --- a/third_party/blink/renderer/platform/peerconnection/rtc_stats_test.cc +++ b/third_party/blink/renderer/platform/peerconnection/rtc_stats_test.cc
@@ -45,7 +45,7 @@ &hw_stat) TestStats::TestStats(const std::string& id, int64_t timestamp_us) - : RTCStats(id, timestamp_us), + : RTCStats(id, webrtc::Timestamp::Micros(timestamp_us)), standardized("standardized"), non_standardized("non_standardized", {webrtc::NonStandardGroupId::kGroupIdForTesting}),
diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5 b/third_party/blink/renderer/platform/runtime_enabled_features.json5 index 50b99c5..1ba17cc3a 100644 --- a/third_party/blink/renderer/platform/runtime_enabled_features.json5 +++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5
@@ -2366,6 +2366,10 @@ status: "stable", }, { + name: "ResourceTimingUseCORSForBodySizes", + status: "test" + }, + { name: "RestrictGamepadAccess", public: true, status: "experimental",
diff --git a/third_party/blink/renderer/platform/scheduler/main_thread/agent_group_scheduler_impl.h b/third_party/blink/renderer/platform/scheduler/main_thread/agent_group_scheduler_impl.h index c57693f..9de12b1 100644 --- a/third_party/blink/renderer/platform/scheduler/main_thread/agent_group_scheduler_impl.h +++ b/third_party/blink/renderer/platform/scheduler/main_thread/agent_group_scheduler_impl.h
@@ -14,6 +14,7 @@ #include "third_party/blink/renderer/platform/heap/prefinalizer.h" #include "third_party/blink/renderer/platform/platform_export.h" #include "third_party/blink/renderer/platform/scheduler/public/agent_group_scheduler.h" +#include "third_party/blink/renderer/platform/wtf/gc_plugin_ignore.h" namespace base { class SingleThreadTaskRunner; @@ -68,6 +69,7 @@ MainThreadSchedulerImpl& main_thread_scheduler_; // Not owned. HeapHashSet<WeakMember<Agent>> agents_; + GC_PLUGIN_IGNORE("https://crbug.com/1381979") BrowserInterfaceBrokerProxy broker_; };
diff --git a/third_party/blink/renderer/platform/theme/web_theme_engine_android.cc b/third_party/blink/renderer/platform/theme/web_theme_engine_android.cc index 57bcdda..9e996d2 100644 --- a/third_party/blink/renderer/platform/theme/web_theme_engine_android.cc +++ b/third_party/blink/renderer/platform/theme/web_theme_engine_android.cc
@@ -50,6 +50,8 @@ extra_params->text_field.background_color; native_theme_extra_params->text_field.has_border = extra_params->text_field.has_border; + native_theme_extra_params->text_field.auto_complete_active = + extra_params->text_field.auto_complete_active; native_theme_extra_params->text_field.zoom = extra_params->text_field.zoom; break;
diff --git a/third_party/blink/web_tests/FlagExpectations/highdpi b/third_party/blink/web_tests/FlagExpectations/highdpi index 1eaae8d..696bdca 100644 --- a/third_party/blink/web_tests/FlagExpectations/highdpi +++ b/third_party/blink/web_tests/FlagExpectations/highdpi
@@ -136,7 +136,6 @@ crbug.com/1191215 fast/css/sticky/sticky-overflow-hidden.html [ Failure ] crbug.com/1191215 fast/forms/color-scheme/date/date-appearance-basic.html [ Failure ] crbug.com/1191215 fast/forms/date/date-appearance-l10n.html [ Failure ] -crbug.com/1191215 fast/forms/date/date-with-csp.html [ Failure ] crbug.com/1191215 fast/forms/select-popup/popup-menu-move-after-open.html [ Failure ] crbug.com/1191215 fast/forms/textarea/basic-textareas-quirks.html [ Failure ] crbug.com/1191215 fast/forms/textarea/textarea-scrolled-type.html [ Failure ]
diff --git a/third_party/blink/web_tests/SlowTests b/third_party/blink/web_tests/SlowTests index 553e79d..24a227081 100644 --- a/third_party/blink/web_tests/SlowTests +++ b/third_party/blink/web_tests/SlowTests
@@ -19,7 +19,11 @@ crbug.com/24182 storage/indexeddb/mozilla/test_objectStore_openKeyCursor.html [ Slow ] crbug.com/24182 editing/selection/modify_move/move-by-word-visually-mac.html [ Slow ] crbug.com/24182 compositing/culling/filter-occlusion-blur-large.html [ Slow ] -crbug.com/24182 editing/selection/caret-at-bidi-boundary.html [ Slow ] +crbug.com/24182 [ Linux ] editing/selection/caret-at-bidi-boundary.html [ Slow ] +crbug.com/24182 [ Mac10.15 Release ] editing/selection/caret-at-bidi-boundary.html [ Slow ] +crbug.com/24182 [ Mac11 Release ] editing/selection/caret-at-bidi-boundary.html [ Slow ] +crbug.com/24182 [ Mac12 ] editing/selection/caret-at-bidi-boundary.html [ Slow ] +crbug.com/24182 [ Release Win ] editing/selection/caret-at-bidi-boundary.html [ Slow ] crbug.com/24182 editing/selection/modify_move/move-by-word-visually-crash-test-5.html [ Slow ] crbug.com/24182 fast/canvas/canvas-toBlob-toDataURL-race-imageEncoder-jpeg.html [ Slow ] crbug.com/24182 fast/canvas/canvas-toBlob-toDataURL-race-imageEncoder-png.html [ Slow ] @@ -45,7 +49,11 @@ crbug.com/24182 [ Mac12 ] jquery/attributes.html [ Slow ] crbug.com/24182 [ Mac12-arm64 Release ] jquery/attributes.html [ Slow ] crbug.com/24182 [ Release Win ] jquery/attributes.html [ Slow ] -crbug.com/24182 jquery/core.html [ Slow ] +crbug.com/24182 [ Linux ] jquery/core.html [ Slow ] +crbug.com/24182 [ Mac10.15 Release ] jquery/core.html [ Slow ] +crbug.com/24182 [ Mac11 Release ] jquery/core.html [ Slow ] +crbug.com/24182 [ Mac12 ] jquery/core.html [ Slow ] +crbug.com/24182 [ Release Win ] jquery/core.html [ Slow ] crbug.com/24182 jquery/css.html [ Slow ] crbug.com/24182 jquery/data.html [ Slow ] crbug.com/24182 jquery/dimensions.html [ Slow ] @@ -56,7 +64,12 @@ crbug.com/24182 [ Mac12 ] jquery/event.html [ Slow ] crbug.com/24182 [ Release Win ] jquery/event.html [ Slow ] crbug.com/24182 jquery/manipulation.html [ Slow ] -crbug.com/24182 jquery/offset.html [ Slow ] +crbug.com/24182 [ Debug ] jquery/offset.html [ Slow ] +crbug.com/24182 [ Linux Release ] jquery/offset.html [ Slow ] +crbug.com/24182 [ Mac10.15 Release ] jquery/offset.html [ Slow ] +crbug.com/24182 [ Mac11 Release ] jquery/offset.html [ Slow ] +crbug.com/24182 [ Mac12 Release ] jquery/offset.html [ Slow ] +crbug.com/24182 [ Release Win ] jquery/offset.html [ Slow ] crbug.com/24182 [ Linux ] jquery/traversing.html [ Slow ] crbug.com/24182 [ Mac10.15 Release ] jquery/traversing.html [ Slow ] crbug.com/24182 [ Mac11 Release ] jquery/traversing.html [ Slow ] @@ -165,7 +178,12 @@ # FIXME: These tests might still be buggy and time out. They were marked as Slow on 9/20/2013. # Double-check the data after they've been running another week or so. -crbug.com/245154 editing/selection/modify_move/move-by-character-brute-force.html [ Slow ] +crbug.com/245154 [ Debug ] editing/selection/modify_move/move-by-character-brute-force.html [ Slow ] +crbug.com/245154 [ Linux Release ] editing/selection/modify_move/move-by-character-brute-force.html [ Slow ] +crbug.com/245154 [ Mac10.15 Release ] editing/selection/modify_move/move-by-character-brute-force.html [ Slow ] +crbug.com/245154 [ Mac11 Release ] editing/selection/modify_move/move-by-character-brute-force.html [ Slow ] +crbug.com/245154 [ Mac12 Release ] editing/selection/modify_move/move-by-character-brute-force.html [ Slow ] +crbug.com/245154 [ Release Win ] editing/selection/modify_move/move-by-character-brute-force.html [ Slow ] # This test takes 5+ seconds as intended because it tests connection throttling. crbug.com/459377 http/tests/websocket/multiple-connections-throttled.html [ Slow ] @@ -242,7 +260,6 @@ crbug.com/1081534 [ Mac ] virtual/oopr-canvas2d/fast/canvas/canvas-blending-image-over-gradient.html [ Slow ] crbug.com/1081534 [ Mac ] virtual/oopr-canvas2d/fast/canvas/canvas-blending-pattern-over-color.html [ Slow ] crbug.com/1081534 [ Mac ] virtual/oopr-canvas2d/fast/canvas/canvas-blending-pattern-over-pattern.html [ Slow ] -crbug.com/1081534 [ Mac ] virtual/oopr-canvas2d/fast/canvas/canvas-blending-text.html [ Slow ] crbug.com/1081534 [ Mac ] virtual/oopr-canvas2d/fast/canvas/canvas-blending-transforms.html [ Slow ] crbug.com/1081534 [ Mac ] virtual/oopr-canvas2d/fast/canvas/canvas-blend-image.html [ Slow ] crbug.com/1081534 [ Linux ] virtual/oopr-canvas2d/fast/canvas/canvas-blend-image.html [ Slow ] @@ -405,7 +422,12 @@ crbug.com/874695 [ Mac11 Release ] fast/peerconnection/RTCPeerConnection-many.html [ Slow ] crbug.com/874695 [ Mac12 ] fast/peerconnection/RTCPeerConnection-many.html [ Slow ] crbug.com/874695 [ Release Win ] fast/peerconnection/RTCPeerConnection-many.html [ Slow ] -crbug.com/874695 fast/peerconnection/RTCRtpSender-setParameters.html [ Slow ] +crbug.com/874695 [ Debug ] fast/peerconnection/RTCRtpSender-setParameters.html [ Slow ] +crbug.com/874695 [ Linux Release ] fast/peerconnection/RTCRtpSender-setParameters.html [ Slow ] +crbug.com/874695 [ Mac10.15 Release ] fast/peerconnection/RTCRtpSender-setParameters.html [ Slow ] +crbug.com/874695 [ Mac11 Release ] fast/peerconnection/RTCRtpSender-setParameters.html [ Slow ] +crbug.com/874695 [ Mac12 Release ] fast/peerconnection/RTCRtpSender-setParameters.html [ Slow ] +crbug.com/874695 [ Release Win ] fast/peerconnection/RTCRtpSender-setParameters.html [ Slow ] crbug.com/874695 fast/scroll-behavior/overscroll-behavior.html [ Slow ] crbug.com/874695 fast/scrolling/autoscroll-iframe-no-scrolling.html [ Slow ] crbug.com/874695 fast/table/multiple-captions-crash3.html [ Slow ] @@ -507,7 +529,8 @@ crbug.com/874695 [ Debug Mac12 ] media/track/track-cue-gc-wrapper.html [ Slow ] crbug.com/874695 [ Release ] media/track/track-cue-gc-wrapper.html [ Slow ] crbug.com/874695 media/unsupported-rtsp.html [ Slow ] -crbug.com/874695 media/video-controls-always-visible-when-control-hovered.html [ Slow ] +crbug.com/874695 [ Debug Mac12 ] media/video-controls-always-visible-when-control-hovered.html [ Slow ] +crbug.com/874695 [ Release ] media/video-controls-always-visible-when-control-hovered.html [ Slow ] crbug.com/874695 [ Debug Mac12 ] media/video-controls-auto-hide-after-play-by-touch.html [ Slow ] crbug.com/874695 [ Release ] media/video-controls-auto-hide-after-play-by-touch.html [ Slow ] crbug.com/874695 [ Debug Mac12 ] media/video-controls-dont-show-on-focus-when-disabled.html [ Slow ] @@ -516,7 +539,8 @@ crbug.com/874695 media/video-controls-hide-after-touch-on-control.html [ Slow ] crbug.com/874695 media/video-controls-hide-on-move-outside-controls.html [ Slow ] crbug.com/874695 media/video-controls-show-on-focus.html [ Slow ] -crbug.com/874695 media/video-controls-visibility-multimodal-mouse-after-touch.html [ Slow ] +crbug.com/874695 [ Debug Mac12 ] media/video-controls-visibility-multimodal-mouse-after-touch.html [ Slow ] +crbug.com/874695 [ Release ] media/video-controls-visibility-multimodal-mouse-after-touch.html [ Slow ] crbug.com/874695 [ Debug Mac12 ] media/video-controls-visibility-multimodal-touch-after-mouse.html [ Slow ] crbug.com/874695 [ Release ] media/video-controls-visibility-multimodal-touch-after-mouse.html [ Slow ] crbug.com/874695 [ Debug Mac12 ] media/video-played-collapse.html [ Slow ] @@ -632,7 +656,12 @@ crbug.com/1091716 svg/as-object/sizing/svg-in-object-placeholder-fixed-percentage-intrinsic-ratio.html [ Slow ] crbug.com/1091716 svg/as-object/sizing/svg-in-object-placeholder-fixed-percentage-no-intrinsic-ratio.html [ Slow ] crbug.com/1091716 svg/as-object/sizing/svg-in-object-placeholder-percentage-auto-intrinsic-ratio.html [ Slow ] -crbug.com/1091716 svg/as-object/sizing/svg-in-object-placeholder-percentage-auto-no-intrinsic-ratio.html [ Slow ] +crbug.com/1091716 [ Debug ] svg/as-object/sizing/svg-in-object-placeholder-percentage-auto-no-intrinsic-ratio.html [ Slow ] +crbug.com/1091716 [ Linux Release ] svg/as-object/sizing/svg-in-object-placeholder-percentage-auto-no-intrinsic-ratio.html [ Slow ] +crbug.com/1091716 [ Mac10.15 Release ] svg/as-object/sizing/svg-in-object-placeholder-percentage-auto-no-intrinsic-ratio.html [ Slow ] +crbug.com/1091716 [ Mac11 Release ] svg/as-object/sizing/svg-in-object-placeholder-percentage-auto-no-intrinsic-ratio.html [ Slow ] +crbug.com/1091716 [ Mac12 Release ] svg/as-object/sizing/svg-in-object-placeholder-percentage-auto-no-intrinsic-ratio.html [ Slow ] +crbug.com/1091716 [ Release Win ] svg/as-object/sizing/svg-in-object-placeholder-percentage-auto-no-intrinsic-ratio.html [ Slow ] crbug.com/1091716 [ Linux ] svg/as-object/sizing/svg-in-object-placeholder-percentage-fixed-intrinsic-ratio.html [ Slow ] crbug.com/1091716 [ Mac10.15 Release ] svg/as-object/sizing/svg-in-object-placeholder-percentage-fixed-intrinsic-ratio.html [ Slow ] crbug.com/1091716 [ Mac11 Release ] svg/as-object/sizing/svg-in-object-placeholder-percentage-fixed-intrinsic-ratio.html [ Slow ] @@ -655,7 +684,12 @@ crbug.com/1092121 fast/css/large-list-of-rules-crash.html [ Slow ] crbug.com/1042205 virtual/off-main-thread-css-paint/external/wpt/css/css-paint-api/paint2d-filter.https.html [ Slow ] crbug.com/1093849 external/wpt/dom/nodes/Element-classlist.html [ Slow ] -crbug.com/1093853 external/wpt/dom/ranges/Range-surroundContents.html [ Slow ] +crbug.com/1093853 [ Debug ] external/wpt/dom/ranges/Range-surroundContents.html [ Slow ] +crbug.com/1093853 [ Linux Release ] external/wpt/dom/ranges/Range-surroundContents.html [ Slow ] +crbug.com/1093853 [ Mac10.15 Release ] external/wpt/dom/ranges/Range-surroundContents.html [ Slow ] +crbug.com/1093853 [ Mac11 Release ] external/wpt/dom/ranges/Range-surroundContents.html [ Slow ] +crbug.com/1093853 [ Mac12 Release ] external/wpt/dom/ranges/Range-surroundContents.html [ Slow ] +crbug.com/1093853 [ Release Win ] external/wpt/dom/ranges/Range-surroundContents.html [ Slow ] crbug.com/1093478 external/wpt/quirks/unitless-length/limited-quirks.html [ Slow ] crbug.com/1133836 [ Linux ] external/wpt/scroll-to-text-fragment/redirects.html [ Slow ] crbug.com/1133836 [ Mac10.13 Release ] external/wpt/scroll-to-text-fragment/redirects.html [ Slow ] @@ -678,7 +712,12 @@ # crbug.com/1095379: These were all added here in an attempt to reduce flakiness. crbug.com/983788 http/tests/cookies/same-site/popup-cross-site.https.html [ Slow ] -crbug.com/1049641 http/tests/devtools/sources/debugger/debugger-disable-enable.js [ Slow ] +crbug.com/1049641 [ Debug ] http/tests/devtools/sources/debugger/debugger-disable-enable.js [ Slow ] +crbug.com/1049641 [ Linux Release ] http/tests/devtools/sources/debugger/debugger-disable-enable.js [ Slow ] +crbug.com/1049641 [ Mac10.15 Release ] http/tests/devtools/sources/debugger/debugger-disable-enable.js [ Slow ] +crbug.com/1049641 [ Mac11 Release ] http/tests/devtools/sources/debugger/debugger-disable-enable.js [ Slow ] +crbug.com/1049641 [ Mac12 Release ] http/tests/devtools/sources/debugger/debugger-disable-enable.js [ Slow ] +crbug.com/1049641 [ Release Win ] http/tests/devtools/sources/debugger/debugger-disable-enable.js [ Slow ] crbug.com/947951 [ Win ] external/wpt/pointerevents/pointerevent_touch-action-inherit_child-auto-child-none_touch.html [ Slow ] crbug.com/626703 [ Mac ] external/wpt/preload/preload-with-type.html [ Slow ] crbug.com/626703 [ Mac ] external/wpt/html/semantics/embedded-content/media-elements/track/track-element/track-mode.html [ Slow ] @@ -700,7 +739,11 @@ crbug.com/829952 fast/webgl/texImage-imageBitmap-from-image-resize.html [ Slow ] crbug.com/1064522 external/wpt/html/user-activation/propagation-crossorigin.sub.html [ Slow ] crbug.com/863599 [ Debug ] external/wpt/requestidlecallback/callback-iframe.html [ Slow ] -crbug.com/869364 http/tests/devtools/console/console-correct-suggestions.js [ Slow ] +crbug.com/869364 [ Linux ] http/tests/devtools/console/console-correct-suggestions.js [ Slow ] +crbug.com/869364 [ Mac10.15 Release ] http/tests/devtools/console/console-correct-suggestions.js [ Slow ] +crbug.com/869364 [ Mac11 Release ] http/tests/devtools/console/console-correct-suggestions.js [ Slow ] +crbug.com/869364 [ Mac12 ] http/tests/devtools/console/console-correct-suggestions.js [ Slow ] +crbug.com/869364 [ Release Win ] http/tests/devtools/console/console-correct-suggestions.js [ Slow ] crbug.com/886566 [ Mac ] http/tests/csspaint/invalidation-background-image.html [ Slow ] crbug.com/886566 http/tests/csspaint/invalidation-content-image.html [ Slow ] crbug.com/907412 external/wpt/domxpath/xml_xpath_runner.html [ Slow ] @@ -747,17 +790,33 @@ crbug.com/1044715 [ Linux ] external/wpt/pointerevents/pointerevent_touch-action-inherit_parent-none_touch.html [ Slow ] crbug.com/1044715 [ Win ] external/wpt/pointerevents/pointerevent_touch-action-inherit_child-pan-x-child-pan-x_touch.html [ Slow ] crbug.com/1044715 [ Linux ] external/wpt/pointerevents/pointerevent_touch-action-inherit_child-pan-x-child-pan-x_touch.html [ Slow ] -crbug.com/1043396 http/tests/devtools/network/network-eventsource.js [ Slow ] +crbug.com/1043396 [ Linux ] http/tests/devtools/network/network-eventsource.js [ Slow ] +crbug.com/1043396 [ Mac10.15 Release ] http/tests/devtools/network/network-eventsource.js [ Slow ] +crbug.com/1043396 [ Mac11 Release ] http/tests/devtools/network/network-eventsource.js [ Slow ] +crbug.com/1043396 [ Mac12 ] http/tests/devtools/network/network-eventsource.js [ Slow ] +crbug.com/1043396 [ Release Win ] http/tests/devtools/network/network-eventsource.js [ Slow ] crbug.com/1043381 [ Release Win ] http/tests/devtools/elements/highlight/highlight-node-scroll.js [ Slow ] -crbug.com/1043381 [ Mac Release ] http/tests/devtools/elements/highlight/highlight-node-scroll.js [ Slow ] -crbug.com/1043356 [ Release ] http/tests/devtools/elements/styles-4/keyframes-source-offsets.js [ Slow ] +crbug.com/1043381 [ Mac10.15 Release ] http/tests/devtools/elements/highlight/highlight-node-scroll.js [ Slow ] +crbug.com/1043381 [ Mac11 Release ] http/tests/devtools/elements/highlight/highlight-node-scroll.js [ Slow ] +crbug.com/1043381 [ Mac11-arm64 Release ] http/tests/devtools/elements/highlight/highlight-node-scroll.js [ Slow ] +crbug.com/1043381 [ Mac12 Release ] http/tests/devtools/elements/highlight/highlight-node-scroll.js [ Slow ] +crbug.com/1043356 [ Linux Release ] http/tests/devtools/elements/styles-4/keyframes-source-offsets.js [ Slow ] +crbug.com/1043356 [ Mac10.15 Release ] http/tests/devtools/elements/styles-4/keyframes-source-offsets.js [ Slow ] +crbug.com/1043356 [ Mac11 Release ] http/tests/devtools/elements/styles-4/keyframes-source-offsets.js [ Slow ] +crbug.com/1043356 [ Mac11-arm64 Release ] http/tests/devtools/elements/styles-4/keyframes-source-offsets.js [ Slow ] +crbug.com/1043356 [ Mac12 Release ] http/tests/devtools/elements/styles-4/keyframes-source-offsets.js [ Slow ] +crbug.com/1043356 [ Release Win ] http/tests/devtools/elements/styles-4/keyframes-source-offsets.js [ Slow ] crbug.com/1043354 [ Linux Release ] http/tests/devtools/service-workers/service-worker-pause.js [ Slow ] crbug.com/1043354 [ Mac10.15 Release ] http/tests/devtools/service-workers/service-worker-pause.js [ Slow ] crbug.com/1043354 [ Mac11 Release ] http/tests/devtools/service-workers/service-worker-pause.js [ Slow ] crbug.com/1043354 [ Mac11-arm64 Release ] http/tests/devtools/service-workers/service-worker-pause.js [ Slow ] crbug.com/1043354 [ Mac12 Release ] http/tests/devtools/service-workers/service-worker-pause.js [ Slow ] crbug.com/1043354 [ Release Win ] http/tests/devtools/service-workers/service-worker-pause.js [ Slow ] -crbug.com/1043350 [ Release ] http/tests/devtools/elements/edit/set-attribute.js [ Slow ] +crbug.com/1043350 [ Linux Release ] http/tests/devtools/elements/edit/set-attribute.js [ Slow ] +crbug.com/1043350 [ Mac10.15 Release ] http/tests/devtools/elements/edit/set-attribute.js [ Slow ] +crbug.com/1043350 [ Mac11 Release ] http/tests/devtools/elements/edit/set-attribute.js [ Slow ] +crbug.com/1043350 [ Mac12 Release ] http/tests/devtools/elements/edit/set-attribute.js [ Slow ] +crbug.com/1043350 [ Release Win ] http/tests/devtools/elements/edit/set-attribute.js [ Slow ] crbug.com/1043310 [ Release Win ] external/wpt/css/cssom-view/idlharness.html [ Slow ] crbug.com/1043310 [ Mac Release ] external/wpt/css/cssom-view/idlharness.html [ Slow ] crbug.com/1043285 [ Linux Release ] http/tests/devtools/elements/styles/selector-line.js [ Slow ] @@ -793,7 +852,12 @@ crbug.com/1044350 [ Mac11-arm64 Release ] http/tests/devtools/network/network-xhr-replay.js [ Slow ] crbug.com/1044350 [ Mac12 Release ] http/tests/devtools/network/network-xhr-replay.js [ Slow ] crbug.com/1044350 [ Release Win ] http/tests/devtools/network/network-xhr-replay.js [ Slow ] -crbug.com/1044414 [ Release ] http/tests/devtools/elements/styles/selector-line-sourcemap-header.js [ Slow ] +crbug.com/1044414 [ Linux Release ] http/tests/devtools/elements/styles/selector-line-sourcemap-header.js [ Slow ] +crbug.com/1044414 [ Mac10.15 Release ] http/tests/devtools/elements/styles/selector-line-sourcemap-header.js [ Slow ] +crbug.com/1044414 [ Mac11 Release ] http/tests/devtools/elements/styles/selector-line-sourcemap-header.js [ Slow ] +crbug.com/1044414 [ Mac11-arm64 Release ] http/tests/devtools/elements/styles/selector-line-sourcemap-header.js [ Slow ] +crbug.com/1044414 [ Mac12 Release ] http/tests/devtools/elements/styles/selector-line-sourcemap-header.js [ Slow ] +crbug.com/1044414 [ Release Win ] http/tests/devtools/elements/styles/selector-line-sourcemap-header.js [ Slow ] crbug.com/1044415 [ Linux Release ] http/tests/devtools/runtime/evaluate-without-side-effects.js [ Slow ] crbug.com/1044415 [ Mac10.15 Release ] http/tests/devtools/runtime/evaluate-without-side-effects.js [ Slow ] crbug.com/1044415 [ Mac11 Release ] http/tests/devtools/runtime/evaluate-without-side-effects.js [ Slow ] @@ -801,8 +865,16 @@ crbug.com/1044415 [ Mac12 Release ] http/tests/devtools/runtime/evaluate-without-side-effects.js [ Slow ] crbug.com/1044415 [ Release Win ] http/tests/devtools/runtime/evaluate-without-side-effects.js [ Slow ] crbug.com/1044425 [ Release ] http/tests/devtools/elements/shadow/elements-panel-shadow-selection-on-refresh-1.js [ Slow ] -crbug.com/1044429 [ Release ] http/tests/devtools/oopif/oopif-navigator.js [ Slow ] -crbug.com/1044459 [ Release ] http/tests/devtools/elements/edit/set-outer-html-for-xhtml.js [ Slow ] +crbug.com/1044429 [ Linux Release ] http/tests/devtools/oopif/oopif-navigator.js [ Slow ] +crbug.com/1044429 [ Mac10.15 Release ] http/tests/devtools/oopif/oopif-navigator.js [ Slow ] +crbug.com/1044429 [ Mac11 Release ] http/tests/devtools/oopif/oopif-navigator.js [ Slow ] +crbug.com/1044429 [ Mac12 Release ] http/tests/devtools/oopif/oopif-navigator.js [ Slow ] +crbug.com/1044429 [ Release Win ] http/tests/devtools/oopif/oopif-navigator.js [ Slow ] +crbug.com/1044459 [ Linux Release ] http/tests/devtools/elements/edit/set-outer-html-for-xhtml.js [ Slow ] +crbug.com/1044459 [ Mac10.15 Release ] http/tests/devtools/elements/edit/set-outer-html-for-xhtml.js [ Slow ] +crbug.com/1044459 [ Mac11 Release ] http/tests/devtools/elements/edit/set-outer-html-for-xhtml.js [ Slow ] +crbug.com/1044459 [ Mac12 Release ] http/tests/devtools/elements/edit/set-outer-html-for-xhtml.js [ Slow ] +crbug.com/1044459 [ Release Win ] http/tests/devtools/elements/edit/set-outer-html-for-xhtml.js [ Slow ] crbug.com/1044506 [ Release Win ] http/tests/devtools/tracing-model-storage.js [ Slow ] crbug.com/1044506 [ Mac Release ] http/tests/devtools/tracing-model-storage.js [ Slow ] crbug.com/1044516 [ Linux Release ] http/tests/devtools/elements/edit/undo-set-outer-html-2.js [ Slow ] @@ -812,14 +884,22 @@ crbug.com/1044516 [ Mac12 Release ] http/tests/devtools/elements/edit/undo-set-outer-html-2.js [ Slow ] crbug.com/1044516 [ Release Win ] http/tests/devtools/elements/edit/undo-set-outer-html-2.js [ Slow ] crbug.com/1044518 [ Release Win ] http/tests/devtools/bindings/suspendtarget-navigator.js [ Slow ] -crbug.com/1044518 [ Mac Release ] http/tests/devtools/bindings/suspendtarget-navigator.js [ Slow ] +crbug.com/1044518 [ Mac10.15 Release ] http/tests/devtools/bindings/suspendtarget-navigator.js [ Slow ] +crbug.com/1044518 [ Mac11 Release ] http/tests/devtools/bindings/suspendtarget-navigator.js [ Slow ] +crbug.com/1044518 [ Mac11-arm64 Release ] http/tests/devtools/bindings/suspendtarget-navigator.js [ Slow ] +crbug.com/1044518 [ Mac12 Release ] http/tests/devtools/bindings/suspendtarget-navigator.js [ Slow ] crbug.com/1044544 [ Linux Release ] http/tests/devtools/network/network-disable-cache-preloads-twice.js [ Slow ] crbug.com/1044544 [ Mac10.15 Release ] http/tests/devtools/network/network-disable-cache-preloads-twice.js [ Slow ] crbug.com/1044544 [ Mac11 Release ] http/tests/devtools/network/network-disable-cache-preloads-twice.js [ Slow ] crbug.com/1044544 [ Mac11-arm64 Release ] http/tests/devtools/network/network-disable-cache-preloads-twice.js [ Slow ] crbug.com/1044544 [ Mac12 Release ] http/tests/devtools/network/network-disable-cache-preloads-twice.js [ Slow ] crbug.com/1044544 [ Release Win ] http/tests/devtools/network/network-disable-cache-preloads-twice.js [ Slow ] -crbug.com/1044545 [ Release ] http/tests/devtools/service-workers/service-workers-bypass-for-network-cors.js [ Slow ] +crbug.com/1044545 [ Linux Release ] http/tests/devtools/service-workers/service-workers-bypass-for-network-cors.js [ Slow ] +crbug.com/1044545 [ Mac10.15 Release ] http/tests/devtools/service-workers/service-workers-bypass-for-network-cors.js [ Slow ] +crbug.com/1044545 [ Mac11 Release ] http/tests/devtools/service-workers/service-workers-bypass-for-network-cors.js [ Slow ] +crbug.com/1044545 [ Mac11-arm64 Release ] http/tests/devtools/service-workers/service-workers-bypass-for-network-cors.js [ Slow ] +crbug.com/1044545 [ Mac12 Release ] http/tests/devtools/service-workers/service-workers-bypass-for-network-cors.js [ Slow ] +crbug.com/1044545 [ Release Win ] http/tests/devtools/service-workers/service-workers-bypass-for-network-cors.js [ Slow ] crbug.com/1044561 [ Linux Release ] http/tests/devtools/elements/styles/show-all-properties.js [ Slow ] crbug.com/1044561 [ Mac10.15 Release ] http/tests/devtools/elements/styles/show-all-properties.js [ Slow ] crbug.com/1044561 [ Mac11 Release ] http/tests/devtools/elements/styles/show-all-properties.js [ Slow ] @@ -840,8 +920,18 @@ crbug.com/1044822 [ Mac11-arm64 Release ] http/tests/devtools/cache-storage/cache-entry-deletion.js [ Slow ] crbug.com/1044822 [ Mac12 Release ] http/tests/devtools/cache-storage/cache-entry-deletion.js [ Slow ] crbug.com/1044822 [ Release Win ] http/tests/devtools/cache-storage/cache-entry-deletion.js [ Slow ] -crbug.com/1044823 http/tests/devtools/extensions/extensions-resources.js [ Slow ] -crbug.com/1044823 http/tests/devtools/extensions/extensions-timeline-api.js [ Slow ] +crbug.com/1044823 [ Linux ] http/tests/devtools/extensions/extensions-resources.js [ Slow ] +crbug.com/1044823 [ Mac10.15 Release ] http/tests/devtools/extensions/extensions-resources.js [ Slow ] +crbug.com/1044823 [ Mac11 Release ] http/tests/devtools/extensions/extensions-resources.js [ Slow ] +crbug.com/1044823 [ Mac12 ] http/tests/devtools/extensions/extensions-resources.js [ Slow ] +crbug.com/1044823 [ Release Win ] http/tests/devtools/extensions/extensions-resources.js [ Slow ] +crbug.com/1044823 [ Debug ] http/tests/devtools/extensions/extensions-timeline-api.js [ Slow ] +crbug.com/1044823 [ Linux Release ] http/tests/devtools/extensions/extensions-timeline-api.js [ Slow ] +crbug.com/1044823 [ Mac10.15 Release ] http/tests/devtools/extensions/extensions-timeline-api.js [ Slow ] +crbug.com/1044823 [ Mac11 Release ] http/tests/devtools/extensions/extensions-timeline-api.js [ Slow ] +crbug.com/1044823 [ Mac12 Release ] http/tests/devtools/extensions/extensions-timeline-api.js [ Slow ] +crbug.com/1044823 [ Mac12-arm64 Release ] http/tests/devtools/extensions/extensions-timeline-api.js [ Slow ] +crbug.com/1044823 [ Release Win ] http/tests/devtools/extensions/extensions-timeline-api.js [ Slow ] crbug.com/1044829 [ Release Win ] http/tests/devtools/cache-storage/cache-deletion.js [ Slow ] crbug.com/1044829 [ Mac10.15 Release ] http/tests/devtools/cache-storage/cache-deletion.js [ Slow ] crbug.com/1044829 [ Mac11 Release ] http/tests/devtools/cache-storage/cache-deletion.js [ Slow ] @@ -854,7 +944,11 @@ crbug.com/1046784 [ Mac11-arm64 Release ] http/tests/devtools/elements/styles-4/styles-formatting.js [ Slow ] crbug.com/1046784 [ Mac12 ] http/tests/devtools/elements/styles-4/styles-formatting.js [ Slow ] crbug.com/1046784 [ Release Win ] http/tests/devtools/elements/styles-4/styles-formatting.js [ Slow ] -crbug.com/1046784 http/tests/devtools/search/search-in-sourcemap.js [ Slow ] +crbug.com/1046784 [ Linux ] http/tests/devtools/search/search-in-sourcemap.js [ Slow ] +crbug.com/1046784 [ Mac10.15 Release ] http/tests/devtools/search/search-in-sourcemap.js [ Slow ] +crbug.com/1046784 [ Mac11 Release ] http/tests/devtools/search/search-in-sourcemap.js [ Slow ] +crbug.com/1046784 [ Mac12 ] http/tests/devtools/search/search-in-sourcemap.js [ Slow ] +crbug.com/1046784 [ Release Win ] http/tests/devtools/search/search-in-sourcemap.js [ Slow ] crbug.com/1046784 [ Linux ] http/tests/devtools/elements/styles-1/edit-inspector-stylesheet.js [ Slow ] crbug.com/1046784 [ Mac10.15 Release ] http/tests/devtools/elements/styles-1/edit-inspector-stylesheet.js [ Slow ] crbug.com/1046784 [ Mac11 Release ] http/tests/devtools/elements/styles-1/edit-inspector-stylesheet.js [ Slow ] @@ -875,9 +969,20 @@ crbug.com/1046784 [ Mac11 Release ] http/tests/devtools/elements/edit/set-outer-html-body.js [ Slow ] crbug.com/1046784 [ Mac12 ] http/tests/devtools/elements/edit/set-outer-html-body.js [ Slow ] crbug.com/1046784 [ Release Win ] http/tests/devtools/elements/edit/set-outer-html-body.js [ Slow ] -crbug.com/1046784 http/tests/devtools/elements/styles-1/add-new-rule-inline-style-csp.js [ Slow ] +crbug.com/1046784 [ Debug ] http/tests/devtools/elements/styles-1/add-new-rule-inline-style-csp.js [ Slow ] +crbug.com/1046784 [ Linux Release ] http/tests/devtools/elements/styles-1/add-new-rule-inline-style-csp.js [ Slow ] +crbug.com/1046784 [ Mac10.15 Release ] http/tests/devtools/elements/styles-1/add-new-rule-inline-style-csp.js [ Slow ] +crbug.com/1046784 [ Mac11 Release ] http/tests/devtools/elements/styles-1/add-new-rule-inline-style-csp.js [ Slow ] +crbug.com/1046784 [ Mac12 Release ] http/tests/devtools/elements/styles-1/add-new-rule-inline-style-csp.js [ Slow ] +crbug.com/1046784 [ Release Win ] http/tests/devtools/elements/styles-1/add-new-rule-inline-style-csp.js [ Slow ] crbug.com/1046784 http/tests/devtools/elements/styles-3/styles-disable-then-enable-overriden-ua.js [ Slow ] -crbug.com/1046784 http/tests/devtools/elements/styles-4/styles-inline-element-style-changes-should-not-force-style-recalc.js [ Slow ] +crbug.com/1046784 [ Debug ] http/tests/devtools/elements/styles-4/styles-inline-element-style-changes-should-not-force-style-recalc.js [ Slow ] +crbug.com/1046784 [ Linux Release ] http/tests/devtools/elements/styles-4/styles-inline-element-style-changes-should-not-force-style-recalc.js [ Slow ] +crbug.com/1046784 [ Mac10.15 Release ] http/tests/devtools/elements/styles-4/styles-inline-element-style-changes-should-not-force-style-recalc.js [ Slow ] +crbug.com/1046784 [ Mac11 Release ] http/tests/devtools/elements/styles-4/styles-inline-element-style-changes-should-not-force-style-recalc.js [ Slow ] +crbug.com/1046784 [ Mac11-arm64 Release ] http/tests/devtools/elements/styles-4/styles-inline-element-style-changes-should-not-force-style-recalc.js [ Slow ] +crbug.com/1046784 [ Mac12 Release ] http/tests/devtools/elements/styles-4/styles-inline-element-style-changes-should-not-force-style-recalc.js [ Slow ] +crbug.com/1046784 [ Release Win ] http/tests/devtools/elements/styles-4/styles-inline-element-style-changes-should-not-force-style-recalc.js [ Slow ] crbug.com/1046784 http/tests/devtools/elements/styles-3/styles-add-invalid-property.js [ Slow ] crbug.com/1046784 http/tests/devtools/elements/resolve-node-blocked.js [ Slow ] crbug.com/1046784 [ Linux ] http/tests/devtools/animation/animation-KeyframeEffect-crash.js [ Slow ] @@ -892,9 +997,20 @@ crbug.com/1046784 [ Mac11-arm64 Release ] http/tests/devtools/animation/animation-group-matching-transitions.js [ Slow ] crbug.com/1046784 [ Mac12 ] http/tests/devtools/animation/animation-group-matching-transitions.js [ Slow ] crbug.com/1046784 [ Release Win ] http/tests/devtools/animation/animation-group-matching-transitions.js [ Slow ] -crbug.com/1046784 http/tests/devtools/storage-panel-dom-storage.js [ Slow ] +crbug.com/1046784 [ Debug ] http/tests/devtools/storage-panel-dom-storage.js [ Slow ] +crbug.com/1046784 [ Linux Release ] http/tests/devtools/storage-panel-dom-storage.js [ Slow ] +crbug.com/1046784 [ Mac10.15 Release ] http/tests/devtools/storage-panel-dom-storage.js [ Slow ] +crbug.com/1046784 [ Mac11 Release ] http/tests/devtools/storage-panel-dom-storage.js [ Slow ] +crbug.com/1046784 [ Mac11-arm64 Release ] http/tests/devtools/storage-panel-dom-storage.js [ Slow ] +crbug.com/1046784 [ Mac12 Release ] http/tests/devtools/storage-panel-dom-storage.js [ Slow ] +crbug.com/1046784 [ Release Win ] http/tests/devtools/storage-panel-dom-storage.js [ Slow ] crbug.com/1046784 http/tests/devtools/elements/event-listener-sidebar-jquery1.js [ Slow ] -crbug.com/1046784 http/tests/devtools/persistence/persistence-tabbed-editor-tabs-order.js [ Slow ] +crbug.com/1046784 [ Debug ] http/tests/devtools/persistence/persistence-tabbed-editor-tabs-order.js [ Slow ] +crbug.com/1046784 [ Linux Release ] http/tests/devtools/persistence/persistence-tabbed-editor-tabs-order.js [ Slow ] +crbug.com/1046784 [ Mac10.15 Release ] http/tests/devtools/persistence/persistence-tabbed-editor-tabs-order.js [ Slow ] +crbug.com/1046784 [ Mac11 Release ] http/tests/devtools/persistence/persistence-tabbed-editor-tabs-order.js [ Slow ] +crbug.com/1046784 [ Mac12 Release ] http/tests/devtools/persistence/persistence-tabbed-editor-tabs-order.js [ Slow ] +crbug.com/1046784 [ Release Win ] http/tests/devtools/persistence/persistence-tabbed-editor-tabs-order.js [ Slow ] crbug.com/1046784 http/tests/devtools/elements/styles-4/styles-update-links-3.js [ Slow ] crbug.com/1046784 [ Linux ] http/tests/devtools/elements/styles-4/styles-update-links-2.js [ Slow ] crbug.com/1046784 [ Mac10.15 Release ] http/tests/devtools/elements/styles-4/styles-update-links-2.js [ Slow ] @@ -916,7 +1032,12 @@ crbug.com/1046784 [ Mac12 ] http/tests/devtools/elements/styles-4/styles-update-links-1.js [ Slow ] crbug.com/1046784 [ Release Win ] http/tests/devtools/elements/styles-4/styles-update-links-1.js [ Slow ] crbug.com/1046784 http/tests/devtools/elements/edit/set-outer-html.js [ Slow ] -crbug.com/1046784 http/tests/devtools/network/failed-request-response-mimetype.js [ Slow ] +crbug.com/1046784 [ Debug ] http/tests/devtools/network/failed-request-response-mimetype.js [ Slow ] +crbug.com/1046784 [ Linux Release ] http/tests/devtools/network/failed-request-response-mimetype.js [ Slow ] +crbug.com/1046784 [ Mac10.15 Release ] http/tests/devtools/network/failed-request-response-mimetype.js [ Slow ] +crbug.com/1046784 [ Mac11 Release ] http/tests/devtools/network/failed-request-response-mimetype.js [ Slow ] +crbug.com/1046784 [ Mac12 Release ] http/tests/devtools/network/failed-request-response-mimetype.js [ Slow ] +crbug.com/1046784 [ Release Win ] http/tests/devtools/network/failed-request-response-mimetype.js [ Slow ] crbug.com/1046784 [ Linux ] http/tests/devtools/elements/selected-element-changes-execution-context.js [ Slow ] crbug.com/1046784 [ Mac10.15 Release ] http/tests/devtools/elements/selected-element-changes-execution-context.js [ Slow ] crbug.com/1046784 [ Mac11 Release ] http/tests/devtools/elements/selected-element-changes-execution-context.js [ Slow ] @@ -931,7 +1052,14 @@ crbug.com/1046784 [ Mac12 ] http/tests/devtools/forced-layout-in-microtask.js [ Slow ] crbug.com/1046784 [ Release Win ] http/tests/devtools/forced-layout-in-microtask.js [ Slow ] crbug.com/1046784 http/tests/devtools/application-panel/resources-panel-iframe-idb.js [ Slow ] -crbug.com/1046784 http/tests/devtools/a11y-axe-core/sources/scope-pane-a11y-test.js [ Slow ] +crbug.com/1046784 [ Linux ] http/tests/devtools/a11y-axe-core/sources/scope-pane-a11y-test.js [ Slow ] +crbug.com/1046784 [ Mac10.13 Release ] http/tests/devtools/a11y-axe-core/sources/scope-pane-a11y-test.js [ Slow ] +crbug.com/1046784 [ Mac10.14 Release ] http/tests/devtools/a11y-axe-core/sources/scope-pane-a11y-test.js [ Slow ] +crbug.com/1046784 [ Mac10.15 Release ] http/tests/devtools/a11y-axe-core/sources/scope-pane-a11y-test.js [ Slow ] +crbug.com/1046784 [ Mac11 Release ] http/tests/devtools/a11y-axe-core/sources/scope-pane-a11y-test.js [ Slow ] +crbug.com/1046784 [ Mac11-arm64 Release ] http/tests/devtools/a11y-axe-core/sources/scope-pane-a11y-test.js [ Slow ] +crbug.com/1046784 [ Mac12 ] http/tests/devtools/a11y-axe-core/sources/scope-pane-a11y-test.js [ Slow ] +crbug.com/1046784 [ Release Win ] http/tests/devtools/a11y-axe-core/sources/scope-pane-a11y-test.js [ Slow ] crbug.com/1046784 http/tests/inspector-protocol/network/navigate-iframe-out2in.js [ Slow ] crbug.com/1048597 [ Linux ] virtual/android/fullscreen/video-scrolled-iframe.html [ Slow ] crbug.com/1057807 http/tests/misc/destroy-middle-click-locked-target-crash.html [ Slow ]
diff --git a/third_party/blink/web_tests/TestExpectations b/third_party/blink/web_tests/TestExpectations index 12b9bd2a..bb89a50 100644 --- a/third_party/blink/web_tests/TestExpectations +++ b/third_party/blink/web_tests/TestExpectations
@@ -203,7 +203,9 @@ # The tests happened to pass with two bugs canceled each other. Now they fail # with the first bug fixed. Will be fixed when the second bug is fixed (crrev.com/c/3752748). -crbug.com/881555 external/wpt/css/css-position/sticky/position-sticky-fixed-ancestor.html [ Failure ] +crbug.com/881555 [ Debug Mac12 ] external/wpt/css/css-position/sticky/position-sticky-fixed-ancestor.html [ Failure ] +crbug.com/881555 [ Mac11-arm64 Release ] external/wpt/css/css-position/sticky/position-sticky-fixed-ancestor.html [ Failure ] +crbug.com/881555 [ Mac12-arm64 Release ] external/wpt/css/css-position/sticky/position-sticky-fixed-ancestor.html [ Failure ] # --- Skia roll test suppressions # --- END Skia roll test suppresions @@ -296,7 +298,6 @@ crbug.com/1098369 fast/canvas/OffscreenCanvas-copyImage.html [ Failure Pass ] -crbug.com/1401765 [ Mac ] virtual/gpu/fast/canvas/canvas-path-non-invertible-transform.html [ Crash Pass ] crbug.com/1237275 fast/canvas/layers-lonebeginlayer.html [ Failure Pass ] crbug.com/1237275 fast/canvas/layers-unmatched-beginlayer.html [ Failure Pass ] @@ -499,13 +500,9 @@ crbug.com/980969 http/tests/input/discard-events-to-unstable-iframe.html [ Failure Pass ] -crbug.com/1086591 external/wpt/css/mediaqueries/aspect-ratio-004.html [ Failure ] -crbug.com/1086591 external/wpt/css/mediaqueries/device-aspect-ratio-002.html [ Failure ] -crbug.com/1002049 external/wpt/css/mediaqueries/aspect-ratio-005.html [ Failure ] -crbug.com/1002049 external/wpt/css/mediaqueries/aspect-ratio-006.html [ Failure ] +crbug.com/1002049 [ Mac12-arm64 Release ] external/wpt/css/mediaqueries/aspect-ratio-006.html [ Failure ] crbug.com/962417 external/wpt/css/mediaqueries/mq-negative-range-001.html [ Failure ] crbug.com/1343368 external/wpt/css/mediaqueries/viewport-script-dynamic.html [ Failure ] -crbug.com/1383945 external/wpt/css/mediaqueries/mq-calc-008.html [ Failure ] crbug.com/815111 external/wpt/css/css-fill-stroke/paint-order-001.tentative.html [ Failure ] @@ -1807,7 +1804,6 @@ crbug.com/1045672 fast/forms/select/listbox-tap.html [ Failure ] ### sheriff 2019-07-16 -crbug.com/983799 [ Win ] http/tests/navigation/redirect-on-back-updates-history-item.html [ Pass Timeout ] ### sheriff 2018-05-28 @@ -2158,7 +2154,7 @@ crbug.com/1371431 printing/fixed-positioned-headers-and-footers-clipped.html [ Crash Failure ] crbug.com/377696 printing/setPrinting.html [ Failure ] -crbug.com/1204498 external/wpt/service-workers/service-worker/client-navigate.https.html [ Failure Pass ] +crbug.com/1204498 external/wpt/service-workers/service-worker/client-navigate.https.html [ Failure Pass Timeout ] crbug.com/1223681 virtual/plz-dedicated-worker/external/wpt/service-workers/service-worker/client-navigate.https.html [ Failure Pass Timeout ] # crbug.com/1218723 This test fails when SplitCacheByNetworkIsolationKey is enabled. @@ -2999,7 +2995,6 @@ crbug.com/626703 external/wpt/preload/preload-resource-match.https.html [ Failure ] crbug.com/1359555 external/wpt/speculation-rules/prerender/workers.html [ Failure Timeout ] crbug.com/626703 [ Win ] external/wpt/speculation-rules/prerender/restriction-presentation-request.https.html [ Failure ] -crbug.com/626703 [ Win ] external/wpt/speculation-rules/prerender/storage-foundation.https.html [ Failure ] crbug.com/626703 [ Win ] virtual/partitioned-cookies/http/tests/inspector-protocol/network/disabled-cache-navigation.js [ Failure ] # ====== New tests from wpt-importer added here ====== @@ -3071,7 +3066,6 @@ crbug.com/626703 [ Linux ] wpt_internal/storage/quota/partitioned-webkitStorageInfo-persistent-quota-usage-details.tentative.sub.html [ Timeout ] crbug.com/626703 [ Linux ] wpt_internal/webmidi/loopback-receive.https.html [ Timeout ] crbug.com/626703 [ Linux ] wpt_internal/webmidi/send-system-messages.https.html [ Timeout ] -crbug.com/626703 [ Linux ] wpt_internal/webxr/ar/ar_anchor_getAnchors_null.https.html [ Timeout ] crbug.com/626703 [ Linux ] wpt_internal/webxr/ar/ar_hittestsource_lifetimes.https.html [ Timeout ] crbug.com/626703 [ Linux ] wpt_internal/webxr/ar/iframe-oopif.sub.https.html [ Timeout ] crbug.com/626703 [ Linux ] wpt_internal/webxr/xrDevice_supportsSession_immersive.https.html [ Timeout ] @@ -3829,7 +3823,9 @@ crbug.com/769347 [ Mac ] fast/dom/inert/inert-node-is-uneditable.html [ Failure ] crbug.com/769056 virtual/text-antialias/emoji-web-font.html [ Failure ] -crbug.com/1159689 [ Mac ] virtual/text-antialias/emoticons.html [ Failure Pass ] +crbug.com/1159689 [ Mac11-arm64 Release ] virtual/text-antialias/emoticons.html [ Failure Pass ] +crbug.com/1159689 [ Mac12 ] virtual/text-antialias/emoticons.html [ Failure Pass ] +crbug.com/1159689 [ Mac12-arm64 Release ] virtual/text-antialias/emoticons.html [ Failure Pass ] crbug.com/770232 [ Win ] virtual/text-antialias/hyphenate-character.html [ Failure ] @@ -4626,7 +4622,8 @@ crbug.com/1112508 fast/forms/number/number-wheel-event.html [ Failure ] # Sheriff 2020-07-20 -crbug.com/1107572 [ Mac ] http/tests/devtools/tracing/timeline-style/timeline-style-recalc-with-invalidations.js [ Failure Pass ] +crbug.com/1107572 [ Debug Mac12 ] http/tests/devtools/tracing/timeline-style/timeline-style-recalc-with-invalidations.js [ Failure Pass ] +crbug.com/1107572 [ Mac11-arm64 Release ] http/tests/devtools/tracing/timeline-style/timeline-style-recalc-with-invalidations.js [ Failure Pass ] crbug.com/1107572 [ Mac ] http/tests/devtools/tracing/timeline-style/timeline-style-recalc-with-invalidator-invalidations.js [ Failure Pass ] # Sheriff 2020-07-22 @@ -5211,7 +5208,6 @@ # Depends on fixing WPT cross-origin iframe click flake in crbug.com/1066891. crbug.com/1227710 [ Mac ] external/wpt/bluetooth/requestDevice/cross-origin-iframe.sub.https.window.html [ Failure Pass ] -crbug.com/1227710 [ Win ] external/wpt/bluetooth/requestDevice/cross-origin-iframe.sub.https.window.html [ Failure Pass ] # Sheriff 2021-07-13 @@ -5847,7 +5843,11 @@ crbug.com/1299858 [ Win ] http/tests/fetch/serviceworker/thorough/redirect-nocors-base-https-other-https.html [ Pass Timeout ] crbug.com/1299858 [ Win ] http/tests/fetch/window/thorough/cors-base-https-other-https.html [ Pass Timeout ] crbug.com/1299858 [ Win ] http/tests/fetch/workers/thorough/cookie-nocors-base-https-other-https.html [ Pass Timeout ] -crbug.com/1299948 [ Mac ] external/wpt/css/css-tables/crashtests/textarea-intrinsic-size-crash.html [ Pass Timeout ] +crbug.com/1299948 [ Mac10.14 Release ] external/wpt/css/css-tables/crashtests/textarea-intrinsic-size-crash.html [ Pass Timeout ] +crbug.com/1299948 [ Mac10.15 Release ] external/wpt/css/css-tables/crashtests/textarea-intrinsic-size-crash.html [ Pass Timeout ] +crbug.com/1299948 [ Mac11 Release ] external/wpt/css/css-tables/crashtests/textarea-intrinsic-size-crash.html [ Pass Timeout ] +crbug.com/1299948 [ Mac11-arm64 Release ] external/wpt/css/css-tables/crashtests/textarea-intrinsic-size-crash.html [ Pass Timeout ] +crbug.com/1299948 [ Mac12 ] external/wpt/css/css-tables/crashtests/textarea-intrinsic-size-crash.html [ Pass Timeout ] crbug.com/1299972 [ Linux ] screen_orientation/screenorientation-unsupported-no-crash.html [ Failure Pass Timeout ] # Disable flaky test for further investigation @@ -5934,7 +5934,8 @@ # Sheriff 2022-04-08 crbug.com/1314514 [ Mac ] css3/blending/mix-blend-mode-isolated-group-1.html [ Failure Pass ] -crbug.com/1314514 [ Mac ] css3/blending/mix-blend-mode-isolated-group-3.html [ Failure Pass ] +crbug.com/1314514 [ Mac11-arm64 Release ] css3/blending/mix-blend-mode-isolated-group-3.html [ Failure Pass ] +crbug.com/1314514 [ Mac12-arm64 Release ] css3/blending/mix-blend-mode-isolated-group-3.html [ Failure Pass ] crbug.com/1314514 [ Win ] css3/blending/background-blend-mode-gradient-image.html [ Failure Pass ] crbug.com/1314514 [ Win ] css3/blending/background-blend-mode-image-image.html [ Failure Pass ] crbug.com/1314514 [ Win ] css3/blending/background-blend-mode-tiled-gradient.html [ Failure Pass ] @@ -6082,7 +6083,8 @@ # Sheriff 2022-06-24 crbug.com/1339211 [ Mac ] external/wpt/css/css-text-decor/text-decoration-thickness-fixed.html [ Failure Pass ] -crbug.com/1339291 [ Mac ] external/wpt/webaudio/the-audio-api/the-convolvernode-interface/realtime-conv.html [ Failure Pass ] +crbug.com/1339291 [ Debug Mac12 ] external/wpt/webaudio/the-audio-api/the-convolvernode-interface/realtime-conv.html [ Failure Pass ] +crbug.com/1339291 [ Mac12-arm64 Release ] external/wpt/webaudio/the-audio-api/the-convolvernode-interface/realtime-conv.html [ Failure Pass ] crbug.com/1339293 [ Linux ] http/tests/devtools/network/network-initiator.js [ Failure Pass ] crbug.com/1339293 [ Linux ] external/wpt/html/semantics/embedded-content/the-img-element/invisible-image.html [ Failure Pass ] crbug.com/1339293 [ Linux ] virtual/threaded/external/wpt/requestidlecallback/deadline-max-rAF-dynamic.html [ Failure Pass ] @@ -6807,7 +6809,7 @@ # Disabled to land devtools-frontend change: crbug.com/1376854 http/tests/devtools/elements/accessibility/autocomplete-attribute.js [ Crash Failure Pass Timeout ] -crbug.com/1376854 http/tests/devtools/elements/styles-3/style-autocomplete.js [ Crash Failure Pass Timeout ] +crbug.com/1376854 [ Debug Mac12 ] http/tests/devtools/elements/styles-3/style-autocomplete.js [ Crash Failure Pass Timeout ] # Sheriff 2022-10-20 crbug.com/1376845 external/wpt/mediacapture-insertable-streams/MediaStreamTrackProcessor-backpressure.https.html [ Failure Pass ] @@ -6929,6 +6931,7 @@ # TODO(crbug.com/1403877): Deflake this test. virtual/portals/http/tests/devtools/portals/portals-elements-nesting.js [ Failure Pass ] +crbug.com/1347831 http/tests/devtools/application-panel/resources-panel-iframe-idb.js [ Failure Pass ] # TODO(crbug.com/1404614): Fix this test on MacOS (sheriff 2023-01-03). crbug.com/1404614 [ Mac ] external/wpt/url/url-setters-a-area.window.html?exclude=(file|javascript|mailto) [ Failure Pass ] @@ -6945,6 +6948,7 @@ crbug.com/1406380 [ Win ] external/wpt/infrastructure/server/webtransport-h3.https.sub.any.worker.html [ Failure Pass ] crbug.com/1406380 [ Win ] external/wpt/infrastructure/server/webtransport-h3.https.sub.any.sharedworker.html [ Failure Pass ] crbug.com/1406380 [ Win ] external/wpt/infrastructure/server/webtransport-h3.https.sub.any.html [ Failure Pass ] +crbug.com/1406380 [ Win ] external/wpt/infrastructure/server/webtransport-h3.https.sub.any.serviceworker.html [ Failure Pass ] crbug.com/1347831 http/tests/devtools/cache-storage/cache-data.js [ Failure Pass ] crbug.com/1347831 http/tests/devtools/cache-storage/cache-deletion.js [ Failure Pass ] @@ -6953,4 +6957,4 @@ crbug.com/1347831 http/tests/devtools/cache-storage/cache-live-update-list.js [ Failure Pass ] crbug.com/1347831 http/tests/devtools/cache-storage/cache-names.js [ Failure Pass ] -crbug.com/1406661 [ Mac12 ] http/tests/devtools/persistence/automapping-dynamic-uisourcecodes.js [ Failure Pass ] \ No newline at end of file +crbug.com/1406661 [ Mac12 ] http/tests/devtools/persistence/automapping-dynamic-uisourcecodes.js [ Failure Pass ]
diff --git a/third_party/blink/web_tests/external/wpt/css/css-break/fixedpos-001-print-ref.html b/third_party/blink/web_tests/external/wpt/css/css-break/fixedpos-001-print-ref.html new file mode 100644 index 0000000..3d66305 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/css/css-break/fixedpos-001-print-ref.html
@@ -0,0 +1,17 @@ +<!DOCTYPE html> +<link rel="author" title="Morten Stenshorne" href="mailto:mstensho@chromium.org"> +<style> + body { margin: 0; } +</style> +<div style="position:absolute; bottom:0;"> + This should repeat on every page. +</div> +<div style="position:absolute; bottom:-100vh;"> + This should repeat on every page. +</div> +<div style="position:absolute; bottom:-200vh;"> + This should repeat on every page. +</div> +<div style="position:absolute; top:0;"> + There should be three pages. +</div>
diff --git a/third_party/blink/web_tests/external/wpt/css/css-break/fixedpos-001-print.html b/third_party/blink/web_tests/external/wpt/css/css-break/fixedpos-001-print.html new file mode 100644 index 0000000..04feb96 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/css/css-break/fixedpos-001-print.html
@@ -0,0 +1,13 @@ +<!DOCTYPE html> +<link rel="author" title="Morten Stenshorne" href="mailto:mstensho@chromium.org"> +<link rel="help" href="https://bugs.chromium.org/p/chromium/issues/detail?id=1399456"> +<link rel="match" href="fixedpos-001-print-ref.html"> +<style> + body { margin: 0; } +</style> +<div style="position:fixed; bottom:0;"> + This should repeat on every page. +</div> +<div style="position:absolute; height:300vh;"> + There should be three pages. +</div>
diff --git a/third_party/blink/web_tests/external/wpt/css/css-break/fixedpos-002-print-ref.html b/third_party/blink/web_tests/external/wpt/css/css-break/fixedpos-002-print-ref.html new file mode 100644 index 0000000..3d66305 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/css/css-break/fixedpos-002-print-ref.html
@@ -0,0 +1,17 @@ +<!DOCTYPE html> +<link rel="author" title="Morten Stenshorne" href="mailto:mstensho@chromium.org"> +<style> + body { margin: 0; } +</style> +<div style="position:absolute; bottom:0;"> + This should repeat on every page. +</div> +<div style="position:absolute; bottom:-100vh;"> + This should repeat on every page. +</div> +<div style="position:absolute; bottom:-200vh;"> + This should repeat on every page. +</div> +<div style="position:absolute; top:0;"> + There should be three pages. +</div>
diff --git a/third_party/blink/web_tests/external/wpt/css/css-break/fixedpos-002-print.html b/third_party/blink/web_tests/external/wpt/css/css-break/fixedpos-002-print.html new file mode 100644 index 0000000..c23c6be7 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/css/css-break/fixedpos-002-print.html
@@ -0,0 +1,13 @@ +<!DOCTYPE html> +<link rel="author" title="Morten Stenshorne" href="mailto:mstensho@chromium.org"> +<link rel="help" href="https://bugs.chromium.org/p/chromium/issues/detail?id=1399456"> +<link rel="match" href="fixedpos-002-print-ref.html"> +<style> + body { margin: 0; } +</style> +<div style="position:absolute; height:300vh;"> + There should be three pages. + <div style="position:fixed; bottom:0;"> + This should repeat on every page. + </div> +</div>
diff --git a/third_party/blink/web_tests/external/wpt/css/css-break/fixedpos-003-print-ref.html b/third_party/blink/web_tests/external/wpt/css/css-break/fixedpos-003-print-ref.html new file mode 100644 index 0000000..3d66305 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/css/css-break/fixedpos-003-print-ref.html
@@ -0,0 +1,17 @@ +<!DOCTYPE html> +<link rel="author" title="Morten Stenshorne" href="mailto:mstensho@chromium.org"> +<style> + body { margin: 0; } +</style> +<div style="position:absolute; bottom:0;"> + This should repeat on every page. +</div> +<div style="position:absolute; bottom:-100vh;"> + This should repeat on every page. +</div> +<div style="position:absolute; bottom:-200vh;"> + This should repeat on every page. +</div> +<div style="position:absolute; top:0;"> + There should be three pages. +</div>
diff --git a/third_party/blink/web_tests/external/wpt/css/css-break/fixedpos-003-print.html b/third_party/blink/web_tests/external/wpt/css/css-break/fixedpos-003-print.html new file mode 100644 index 0000000..1b06257 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/css/css-break/fixedpos-003-print.html
@@ -0,0 +1,13 @@ +<!DOCTYPE html> +<link rel="author" title="Morten Stenshorne" href="mailto:mstensho@chromium.org"> +<link rel="help" href="https://bugs.chromium.org/p/chromium/issues/detail?id=1399456"> +<link rel="match" href="fixedpos-003-print-ref.html"> +<style> + body { margin: 0; } +</style> +<div style="height:300vh;"> + There should be three pages. +</div> +<div style="position:fixed; bottom:0;"> + This should repeat on every page. +</div>
diff --git a/third_party/blink/web_tests/external/wpt/css/css-break/fixedpos-004-print-ref.html b/third_party/blink/web_tests/external/wpt/css/css-break/fixedpos-004-print-ref.html new file mode 100644 index 0000000..3e3473b --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/css/css-break/fixedpos-004-print-ref.html
@@ -0,0 +1,26 @@ +<!DOCTYPE html> +<link rel="author" title="Morten Stenshorne" href="mailto:mstensho@chromium.org"> +<style> + body { margin: 0; } +</style> +<div style="position:absolute; bottom:0; margin-bottom:2em;"> + This should repeat on every page. +</div> +<div style="position:absolute; bottom:-100vh; margin-bottom:2em;"> + This should repeat on every page. +</div> +<div style="position:absolute; bottom:-200vh; margin-bottom:2em;"> + This should repeat on every page. +</div> +<div style="position:absolute; bottom:0;"> + This should also repeat on every page. +</div> +<div style="position:absolute; bottom:-100vh;"> + This should also repeat on every page. +</div> +<div style="position:absolute; bottom:-200vh;"> + This should also repeat on every page. +</div> +<div style="position:absolute; top:0;"> + There should be three pages. +</div>
diff --git a/third_party/blink/web_tests/external/wpt/css/css-break/fixedpos-004-print.html b/third_party/blink/web_tests/external/wpt/css/css-break/fixedpos-004-print.html new file mode 100644 index 0000000..c138e9cd --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/css/css-break/fixedpos-004-print.html
@@ -0,0 +1,18 @@ +<!DOCTYPE html> +<link rel="author" title="Morten Stenshorne" href="mailto:mstensho@chromium.org"> +<link rel="help" href="https://bugs.chromium.org/p/chromium/issues/detail?id=1399456"> +<link rel="match" href="fixedpos-004-print-ref.html"> +<style> + body { margin: 0; } +</style> +<div style="position:fixed; bottom:2em;"> + This should repeat on every page. +</div> +<div style="position:absolute;"> + There should be three pages. + <div style="position:absolute; top:0; height:300vh;"> + <div style="position:fixed; bottom:0;"> + This should also repeat on every page. + </div> + </div> +</div>
diff --git a/third_party/blink/web_tests/external/wpt/css/css-break/fixedpos-005-print-ref.html b/third_party/blink/web_tests/external/wpt/css/css-break/fixedpos-005-print-ref.html new file mode 100644 index 0000000..e692ff8d --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/css/css-break/fixedpos-005-print-ref.html
@@ -0,0 +1,42 @@ +<!DOCTYPE html> +<link rel="author" title="Morten Stenshorne" href="mailto:mstensho@chromium.org"> +<style> + body { margin: 0; } +</style> +<div style="position:absolute; bottom:0; margin-bottom:2em;"> + This should repeat on every page. +</div> +<div style="position:absolute; bottom:-100vh; margin-bottom:2em;"> + This should repeat on every page. +</div> +<div style="position:absolute; bottom:-200vh; margin-bottom:2em;"> + This should repeat on every page. +</div> +<div style="position:absolute; bottom:-300vh; margin-bottom:2em;"> + This should repeat on every page. +</div> +<div style="position:absolute; bottom:-400vh; margin-bottom:2em;"> + This should repeat on every page. +</div> +<div style="position:absolute; bottom:0;"> + This should also repeat on every page. +</div> +<div style="position:absolute; bottom:-100vh;"> + This should also repeat on every page. +</div> +<div style="position:absolute; bottom:-200vh;"> + This should also repeat on every page. +</div> +<div style="position:absolute; bottom:-300vh;"> + This should also repeat on every page. +</div> +<div style="position:absolute; bottom:-400vh;"> + This should also repeat on every page. +</div> +<div style="height:100vh;"> + There should be five pages. +</div> +<div style="height:300vh;"> + This should be on the second page. +</div> +This should be on the fifth page.
diff --git a/third_party/blink/web_tests/external/wpt/css/css-break/fixedpos-005-print.html b/third_party/blink/web_tests/external/wpt/css/css-break/fixedpos-005-print.html new file mode 100644 index 0000000..0a2edc7 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/css/css-break/fixedpos-005-print.html
@@ -0,0 +1,22 @@ +<!DOCTYPE html> +<link rel="author" title="Morten Stenshorne" href="mailto:mstensho@chromium.org"> +<link rel="help" href="https://bugs.chromium.org/p/chromium/issues/detail?id=1399456"> +<link rel="match" href="fixedpos-005-print-ref.html"> +<style> + body { margin: 0; } +</style> +<div style="height:300vh;"> + There should be five pages. +</div> +<div style="position:fixed; bottom:2em;"> + This should repeat on every page. +</div> +<div style="position:absolute; top:100vh;"> + This should be on the second page. + <div style="position:fixed; bottom:0;"> + This should also repeat on every page. + </div> + <div style="position:absolute; top:300vh;"> + This should be on the fifth page. + </div> +</div>
diff --git a/third_party/blink/web_tests/external/wpt/css/css-break/fixedpos-006-print-ref.html b/third_party/blink/web_tests/external/wpt/css/css-break/fixedpos-006-print-ref.html new file mode 100644 index 0000000..b03e1d78 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/css/css-break/fixedpos-006-print-ref.html
@@ -0,0 +1,57 @@ +<!DOCTYPE html> +<link rel="author" title="Morten Stenshorne" href="mailto:mstensho@chromium.org"> +<style> + body { margin: 0; } +</style> +<div style="position:absolute; bottom:0; margin-bottom:4em;"> + This should repeat on every page. +</div> +<div style="position:absolute; bottom:-100vh; margin-bottom:4em;"> + This should repeat on every page. +</div> +<div style="position:absolute; bottom:-200vh; margin-bottom:4em;"> + This should repeat on every page. +</div> +<div style="position:absolute; bottom:-300vh; margin-bottom:4em;"> + This should repeat on every page. +</div> +<div style="position:absolute; bottom:-400vh; margin-bottom:4em;"> + This should repeat on every page. +</div> +<div style="position:absolute; bottom:0; margin-bottom:2em;"> + This should also repeat on every page. +</div> +<div style="position:absolute; bottom:-100vh; margin-bottom:2em;"> + This should also repeat on every page. +</div> +<div style="position:absolute; bottom:-200vh; margin-bottom:2em;"> + This should also repeat on every page. +</div> +<div style="position:absolute; bottom:-300vh; margin-bottom:2em;"> + This should also repeat on every page. +</div> +<div style="position:absolute; bottom:-400vh; margin-bottom:2em;"> + This should also repeat on every page. +</div> +<div style="position:absolute; bottom:0;"> + Even this should repeat on every page. +</div> +<div style="position:absolute; bottom:-100vh;"> + Even this should repeat on every page. +</div> +<div style="position:absolute; bottom:-200vh;"> + Even this should repeat on every page. +</div> +<div style="position:absolute; bottom:-300vh;"> + Even this should repeat on every page. +</div> +<div style="position:absolute; bottom:-400vh;"> + Even this should repeat on every page. +</div> +<div style="height:100vh;"> + There should be five pages. +</div> +<div style="height:100vh;"> + This should be on the second page. +</div> +This should be on the third page.
diff --git a/third_party/blink/web_tests/external/wpt/css/css-break/fixedpos-006-print.html b/third_party/blink/web_tests/external/wpt/css/css-break/fixedpos-006-print.html new file mode 100644 index 0000000..2386c16 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/css/css-break/fixedpos-006-print.html
@@ -0,0 +1,23 @@ +<!DOCTYPE html> +<link rel="author" title="Morten Stenshorne" href="mailto:mstensho@chromium.org"> +<link rel="help" href="https://bugs.chromium.org/p/chromium/issues/detail?id=1399456"> +<link rel="match" href="fixedpos-006-print-ref.html"> +<style> + body { margin: 0; } +</style> +There should be five pages. +<div style="position:fixed; bottom:4em;"> + This should repeat on every page. +</div> +<div style="position:absolute; top:100vh;"> + This should be on the second page. + <div style="position:fixed; bottom:2em;"> + This should also repeat on every page. + </div> + <div style="position:absolute; top:100vh; height:300vh;"> + This should be on the third page. + <div style="position:fixed; bottom:0;"> + Even this should repeat on every page. + </div> + </div> +</div>
diff --git a/third_party/blink/web_tests/external/wpt/css/css-break/fixedpos-007-print-ref.html b/third_party/blink/web_tests/external/wpt/css/css-break/fixedpos-007-print-ref.html new file mode 100644 index 0000000..f576c937 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/css/css-break/fixedpos-007-print-ref.html
@@ -0,0 +1,26 @@ +<!DOCTYPE html> +<link rel="author" title="Morten Stenshorne" href="mailto:mstensho@chromium.org"> +<style> + body { margin: 0; } +</style> +<div style="margin-top:4em;"> + There should be three pages. +</div> +<div style="position:absolute; top:0;"> + This should be repeated on every page. +</div> +<div style="position:absolute; top:100vh;"> + This should be repeated on every page. +</div> +<div style="position:absolute; top:200vh;"> + This should be repeated on every page. +</div> +<div style="position:absolute; top:0; margin-top:2em;"> + This should also be repeated on every page. +</div> +<div style="position:absolute; top:100vh; margin-top:2em;"> + This should also be repeated on every page. +</div> +<div style="position:absolute; top:200vh; margin-top:2em;"> + This should also be repeated on every page. +</div>
diff --git a/third_party/blink/web_tests/external/wpt/css/css-break/fixedpos-007-print.html b/third_party/blink/web_tests/external/wpt/css/css-break/fixedpos-007-print.html new file mode 100644 index 0000000..8dcb700 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/css/css-break/fixedpos-007-print.html
@@ -0,0 +1,19 @@ +<!DOCTYPE html> +<link rel="author" title="Morten Stenshorne" href="mailto:mstensho@chromium.org"> +<link rel="help" href="https://bugs.chromium.org/p/chromium/issues/detail?id=1399456"> +<link rel="match" href="fixedpos-007-print-ref.html"> +<style> + body { margin: 0; } +</style> +<div style="margin-top:4em;"> + There should be three pages. +</div> +<div style="position:absolute; top:50vh;"> + <div style="height:250vh;"></div> + <div style="position:fixed; top:0;"> + This should be repeated on every page. + </div> +</div> +<div style="position:fixed; top:2em;"> + This should also be repeated on every page. +</div>
diff --git a/third_party/blink/web_tests/external/wpt/css/css-break/fixedpos-008-print-ref.html b/third_party/blink/web_tests/external/wpt/css/css-break/fixedpos-008-print-ref.html new file mode 100644 index 0000000..6ed2528 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/css/css-break/fixedpos-008-print-ref.html
@@ -0,0 +1,44 @@ +<!DOCTYPE html> +<link rel="author" title="Morten Stenshorne" href="mailto:mstensho@chromium.org"> +<style> + body { margin: 0; } +</style> +<div style="margin-top:4em;"> + There should be six pages. +</div> +<div style="position:absolute; top:0;"> + This should be repeated on every page. +</div> +<div style="position:absolute; top:100vh;"> + This should be repeated on every page. +</div> +<div style="position:absolute; top:200vh;"> + This should be repeated on every page. +</div> +<div style="position:absolute; top:300vh;"> + This should be repeated on every page. +</div> +<div style="position:absolute; top:400vh;"> + This should be repeated on every page. +</div> +<div style="position:absolute; top:500vh;"> + This should be repeated on every page. +</div> +<div style="position:absolute; bottom:0;"> + This should also be repeated on every page. +</div> +<div style="position:absolute; bottom:-100vh;"> + This should also be repeated on every page. +</div> +<div style="position:absolute; bottom:-200vh;"> + This should also be repeated on every page. +</div> +<div style="position:absolute; bottom:-300vh;"> + This should also be repeated on every page. +</div> +<div style="position:absolute; bottom:-400vh;"> + This should also be repeated on every page. +</div> +<div style="position:absolute; bottom:-500vh;"> + This should also be repeated on every page. +</div>
diff --git a/third_party/blink/web_tests/external/wpt/css/css-break/fixedpos-008-print.html b/third_party/blink/web_tests/external/wpt/css/css-break/fixedpos-008-print.html new file mode 100644 index 0000000..02b5d63c --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/css/css-break/fixedpos-008-print.html
@@ -0,0 +1,23 @@ +<!DOCTYPE html> +<link rel="author" title="Morten Stenshorne" href="mailto:mstensho@chromium.org"> +<link rel="help" href="https://bugs.chromium.org/p/chromium/issues/detail?id=1399456"> +<link rel="match" href="fixedpos-008-print-ref.html"> +<style> + body { margin: 0; } +</style> +<div style="margin-top:4em;"> + There should be six pages. +</div> +<div style="position:fixed; top:0;"> + This should be repeated on every page. +</div> +<div style="position:absolute; top:50vh;"> + <div style="height:250vh;"></div> + <div style="position:absolute; top:0;"> + <div style="position:absolute; top:500vh; height:10px;"> + <div style="position:fixed; bottom:0;"> + This should also be repeated on every page. + </div> + </div> + </div> +</div>
diff --git a/third_party/blink/web_tests/external/wpt/resource-timing/body-size-cross-origin.https.html b/third_party/blink/web_tests/external/wpt/resource-timing/body-size-cross-origin.https.html new file mode 100644 index 0000000..b034013 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/resource-timing/body-size-cross-origin.https.html
@@ -0,0 +1,63 @@ +<!DOCTYPE HTML> +<html> +<head> +<meta charset="utf-8" /> +<title>Verify that encodedBodySize/decodedBodySize are CORS-protected rather than TAO-protected</title> +<link rel="author" title="Noam Rosenthal" href="nrosenthal@chromium.org"> +<script src="/resources/testharness.js"></script> +<script src="/resources/testharnessreport.js"></script> +<script src="/common/get-host-info.sub.js"></script> +<script src="/common/utils.js"></script> +</head> +<body> +<script> +const {ORIGIN, REMOTE_ORIGIN} = get_host_info(); + +async function test_body_size({mode, tao, expected_body_sizes}) { + promise_test(async t => { + const origin = mode === "same-origin" ? ORIGIN : REMOTE_ORIGIN; + const url = new URL(`${origin}/images/red.png?uid=${token()}`, + location.href); + const pipes = []; + if (mode === "cors") + pipes.push("header(Access-Control-Allow-Origin,*)"); + if (tao) + pipes.push("header(Timing-Allow-Origin,*)"); + const img = document.createElement("img"); + if (mode === "cors") + img.crossOrigin = "anonymous"; + + if (pipes.length) + url.searchParams.set("pipe", pipes.join("|")); + img.src = url.toString(); + await img.decode(); + const [entry] = performance.getEntriesByName(url.toString()); + if (expected_body_sizes) { + assert_greater_than(entry.encodedBodySize, 0); + assert_greater_than(entry.decodedBodySize, 0); + } else { + assert_equals(entry.encodedBodySize, 0); + assert_equals(entry.decodedBodySize, 0); + } + + if (tao || mode === "same-origin") + assert_equals(entry.transferSize, entry.encodedBodySize + 300); + else + assert_equals(entry.transferSize, 0); + + }, `Retrieving a ${mode} resource ${ + tao ? "with" : "without"} Timing-Allow-Origin should ${ + expected_body_sizes ? "expose" : "not expose" + } body size`); +} + +test_body_size({mode: "same-origin", tao: false, expected_body_sizes: true}); +test_body_size({mode: "same-origin", tao: true, expected_body_sizes: true}); +test_body_size({mode: "no-cors", tao: false, expected_body_sizes: false}); +test_body_size({mode: "no-cors", tao: true, expected_body_sizes: false}); +test_body_size({mode: "cors", tao: false, expected_body_sizes: true}); +test_body_size({mode: "cors", tao: true, expected_body_sizes: true}); + +</script> +</body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/resource-timing/resources/entry-invariants.js b/third_party/blink/web_tests/external/wpt/resource-timing/resources/entry-invariants.js index e35ea289c..1834915 100644 --- a/third_party/blink/web_tests/external/wpt/resource-timing/resources/entry-invariants.js +++ b/third_party/blink/web_tests/external/wpt/resource-timing/resources/entry-invariants.js
@@ -75,8 +75,6 @@ assert_positive_(entry, [ "fetchStart", "transferSize", - "encodedBodySize", - "decodedBodySize", ]); }, @@ -98,8 +96,6 @@ "secureConnectionStart", "redirectStart", "redirectEnd", - "encodedBodySize", - "decodedBodySize", ]); assert_not_negative_(entry, [ @@ -139,8 +135,6 @@ assert_positive_(entry, [ "fetchStart", "transferSize", - "encodedBodySize", - "decodedBodySize", ]); }, @@ -172,8 +166,6 @@ assert_positive_(entry, [ "fetchStart", "transferSize", - "encodedBodySize", - "decodedBodySize", ]); }, @@ -196,8 +188,6 @@ "secureConnectionStart", "redirectStart", "redirectEnd", - "encodedBodySize", - "decodedBodySize", ]); assert_not_negative_(entry, [ @@ -229,8 +219,6 @@ "workerStart", "redirectStart", "redirectEnd", - "encodedBodySize", - "decodedBodySize", ]); assert_not_negative_(entry, [ @@ -405,8 +393,6 @@ "requestStart", "responseStart", "transferSize", - "encodedBodySize", - "decodedBodySize", ]); assert_ordered_(entry, [ @@ -440,8 +426,6 @@ "requestStart", "responseStart", "transferSize", - "encodedBodySize", - "decodedBodySize", ]); }
diff --git a/third_party/blink/web_tests/external/wpt/resource-timing/resources/resource-loaders.js b/third_party/blink/web_tests/external/wpt/resource-timing/resources/resource-loaders.js index 5a859eb..cb0fde3 100644 --- a/third_party/blink/web_tests/external/wpt/resource-timing/resources/resource-loaders.js +++ b/third_party/blink/web_tests/external/wpt/resource-timing/resources/resource-loaders.js
@@ -16,11 +16,8 @@ image_with_attrs: async (path, attribute_map) => { return new Promise(resolve => { const img = new Image(); - if (attribute_map instanceof Object) { - for (const [key, value] of Object.entries(attribute_map)) { - img[key] = value; - } - } + for (const key in attribute_map) + img[key] = attribute_map[key]; img.onload = img.onerror = resolve; img.src = load.cache_bust(path); }); @@ -32,6 +29,10 @@ return load.image_with_attrs(path, undefined); }, + // Returns a promise that settles once the given path has been fetched as an + // image resource. + image_cors: path => load.image_with_attrs(path, {crossOrigin: "anonymous"}), + // Returns a promise that settles once the given path has been fetched as a // font resource. font: path => {
diff --git a/third_party/blink/web_tests/external/wpt/resource-timing/sizes-redirect-img.html b/third_party/blink/web_tests/external/wpt/resource-timing/sizes-redirect-img.html index 786018d..e4400297 100644 --- a/third_party/blink/web_tests/external/wpt/resource-timing/sizes-redirect-img.html +++ b/third_party/blink/web_tests/external/wpt/resource-timing/sizes-redirect-img.html
@@ -18,7 +18,7 @@ const redirectUrl = (redirectSourceOrigin, targetUrl) => { return redirectSourceOrigin + - '/resource-timing/resources/redirect-cors.py?timing_allow_origin=*' + + '/resource-timing/resources/redirect-cors.py?allow_origin=*&timing_allow_origin=*' + '&location=' + encodeURIComponent(targetUrl); }; @@ -35,18 +35,18 @@ verify_entry, "PerformanceResourceTiming sizes redirect image - same origin redirect"); -attribute_test(load.image, +attribute_test(load.image_cors, redirectUrl(hostInfo.HTTP_REMOTE_ORIGIN, baseUrl), verify_entry, "PerformanceResourceTiming sizes redirect image - cross origin redirect"); -attribute_test(load.image, +attribute_test(load.image_cors, redirectUrl(hostInfo.HTTP_REMOTE_ORIGIN, redirectUrl(hostInfo.HTTP_ORIGIN, baseUrl)), verify_entry, "PerformanceResourceTiming sizes redirect image - cross origin to same origin redirect"); -attribute_test(load.image, +attribute_test(load.image_cors, redirectUrl(hostInfo.HTTP_ORIGIN, redirectUrl(hostInfo.HTTP_REMOTE_ORIGIN, redirectUrl(hostInfo.HTTP_ORIGIN,
diff --git a/third_party/blink/web_tests/http/tests/devtools/application-panel/resources-panel-iframe-idb-expected.txt b/third_party/blink/web_tests/http/tests/devtools/application-panel/resources-panel-iframe-idb-expected.txt index 0701831..71205bd9 100644 --- a/third_party/blink/web_tests/http/tests/devtools/application-panel/resources-panel-iframe-idb-expected.txt +++ b/third_party/blink/web_tests/http/tests/devtools/application-panel/resources-panel-iframe-idb-expected.txt
@@ -13,10 +13,10 @@ Storage Local Storage http://127.0.0.1:8000/ - http://devtools.oopif.test:8000 + http://devtools.oopif.test:8000/^0http://127.0.0.1^31 Session Storage http://127.0.0.1:8000/ - http://devtools.oopif.test:8000 + http://devtools.oopif.test:8000/^0http://127.0.0.1^31 IndexedDB Database-iframe - http://devtools.oopif.test:8000/^0http://127.0.0.1^31 Database-iframe @@ -100,10 +100,10 @@ Storage Local Storage http://127.0.0.1:8000/ - http://devtools.oopif.test:8000 + http://devtools.oopif.test:8000/^0http://127.0.0.1^31 Session Storage http://127.0.0.1:8000/ - http://devtools.oopif.test:8000 + http://devtools.oopif.test:8000/^0http://127.0.0.1^31 IndexedDB Database-main-frame - http://127.0.0.1:8000/ Database-iframe - http://devtools.oopif.test:8000/^0http://127.0.0.1^31
diff --git a/third_party/closure_compiler/externs/file_manager_private.js b/third_party/closure_compiler/externs/file_manager_private.js index 93fa56d4..3f8be04 100644 --- a/third_party/closure_compiler/externs/file_manager_private.js +++ b/third_party/closure_compiler/externs/file_manager_private.js
@@ -359,7 +359,8 @@ * title: string, * iconUrl: (string|undefined), * isDefault: (boolean|undefined), - * isGenericFileHandler: (boolean|undefined) + * isGenericFileHandler: (boolean|undefined), + * isDlpBlocked: (boolean|undefined) * }} */ chrome.fileManagerPrivate.FileTask; @@ -839,12 +840,15 @@ /** * Gets the list of tasks that can be performed over selected files. |entries| - * Array of selected entries |callback| + * Array of selected entries. |sourceUrls| Array of source URLs corresponding to + * the entries |callback| * @param {!Array<!Entry>} entries + * @param {!Array<string>} sourceUrls * @param {function((!chrome.fileManagerPrivate.ResultingTasks|undefined))} * callback The list of matched file tasks for the entries. */ -chrome.fileManagerPrivate.getFileTasks = function(entries, callback) {}; +chrome.fileManagerPrivate.getFileTasks = function( + entries, sourceUrls, callback) {}; /** * Gets the MIME type of an entry.
diff --git a/third_party/jacoco/BUILD.gn b/third_party/jacoco/BUILD.gn index 93ebbe5..705951b 100644 --- a/third_party/jacoco/BUILD.gn +++ b/third_party/jacoco/BUILD.gn
@@ -17,20 +17,11 @@ ] } -# When running on-device, prevent Jacoco from trying to write its default -# output path. The test runner will explicitly dump to a file when appropriate. -# https://crbug.com/1334374 -android_assets("jacocoagent_properties_assets") { - renaming_sources = [ "jacoco-agent.properties" ] - renaming_destinations = [ "../jacoco-agent.properties" ] -} - java_prebuilt("jacocoagent_java") { include_java_resources = true supports_android = true jar_path = "lib/jacocoagent.jar" proguard_configs = [ "jacoco_instrument.flags" ] - deps = [ ":jacocoagent_properties_assets" ] } java_prebuilt("jacocoant_java") {
diff --git a/third_party/jacoco/README.chromium b/third_party/jacoco/README.chromium index 13bbd74..18ea162 100644 --- a/third_party/jacoco/README.chromium +++ b/third_party/jacoco/README.chromium
@@ -8,6 +8,3 @@ Description: JaCoCo is a Java code coverage tool. - -Local Modifications: -* Added jacoco-agent.properties for use on Android.
diff --git a/third_party/jacoco/jacoco-agent.properties b/third_party/jacoco/jacoco-agent.properties deleted file mode 100644 index 52c4b253..0000000 --- a/third_party/jacoco/jacoco-agent.properties +++ /dev/null
@@ -1 +0,0 @@ -output=none
diff --git a/tools/metrics/histograms/enums.xml b/tools/metrics/histograms/enums.xml index c3f2554..419ca97 100644 --- a/tools/metrics/histograms/enums.xml +++ b/tools/metrics/histograms/enums.xml
@@ -33734,6 +33734,14 @@ <int value="497" label="PASSWORDS_PRIVATE_ON_PASSWORD_MANAGER_AUTH_TIMEOUT"/> <int value="498" label="PASSWORDS_PRIVATE_ON_INSECURE_CREDENTIALS_CHANGED"/> <int value="499" label="VIRTUAL_KEYBOARD_PRIVATE_ON_COLOR_PROVIDER_CHANGED"/> + <int value="500" + label="SMART_CARD_PROVIDER_PRIVATE_ON_ESTABLISH_CONTEXT_REQUESTED"/> + <int value="501" + label="SMART_CARD_PROVIDER_PRIVATE_ON_RELEASE_CONTEXT_REQUESTED"/> + <int value="502" + label="SMART_CARD_PROVIDER_PRIVATE_ON_LIST_READERS_REQUESTED"/> + <int value="503" + label="SMART_CARD_PROVIDER_PRIVATE_ON_GET_STATUS_CHANGE_REQUESTED"/> </enum> <enum name="ExtensionFileWriteResult"> @@ -35570,6 +35578,13 @@ <int value="1748" label="FILEMANAGERPRIVATEINTERNAL_SEARCHFILES"/> <int value="1749" label="SYSTEMLOG_ADD"/> <int value="1750" label="DECLARATIVENETREQUEST_GETDISABLEDRULEIDS"/> + <int value="1751" + label="SMARTCARDPROVIDERPRIVATE_REPORTESTABLISHCONTEXTRESULT"/> + <int value="1752" + label="SMARTCARDPROVIDERPRIVATE_REPORTRELEASECONTEXTRESULT"/> + <int value="1753" label="SMARTCARDPROVIDERPRIVATE_REPORTLISTREADERSRESULT"/> + <int value="1754" + label="SMARTCARDPROVIDERPRIVATE_REPORTGETSTATUSCHANGERESULT"/> </enum> <enum name="ExtensionIconState"> @@ -36206,6 +36221,7 @@ <int value="244" label="kChromeOSTelemetryNetworkInformation"/> <int value="245" label="kPdfViewerPrivate"/> <int value="246" label="kSystemLog"/> + <int value="247" label="kSmartCardProviderPrivate"/> </enum> <enum name="ExtensionPointEnableState">
diff --git a/tools/metrics/histograms/metadata/commerce/histograms.xml b/tools/metrics/histograms/metadata/commerce/histograms.xml index 5e18b5c..7b1b272 100644 --- a/tools/metrics/histograms/metadata/commerce/histograms.xml +++ b/tools/metrics/histograms/metadata/commerce/histograms.xml
@@ -524,9 +524,6 @@ <histogram name="Commerce.SignIn.AccountWaaStatus" enum="AccountWaaStatusForCommerce" expires_after="2023-06-25"> - <obsolete> - Deprecated in 01/2023. It's no longer needed. - </obsolete> <owner>zhiyuancai@chromium.org</owner> <owner>ayman@chromium.org</owner> <owner>chrome-shopping@google.com</owner> @@ -575,10 +572,6 @@ <histogram name="Commerce.Subscriptions.{ManagementType}.Count" units="subscriptions" expires_after="2023-04-25"> - <obsolete> - Deprecated in 01/2023. Replaced by - Commerce.PriceTracking.PriceTrackedProductCount. - </obsolete> <owner>zhiyuancai@chromium.org</owner> <owner>ayman@chromium.org</owner> <owner>chrome-shopping@google.com</owner>
diff --git a/tools/metrics/histograms/metadata/histogram_suffixes_list.xml b/tools/metrics/histograms/metadata/histogram_suffixes_list.xml index 7426cbdf..938ddfa 100644 --- a/tools/metrics/histograms/metadata/histogram_suffixes_list.xml +++ b/tools/metrics/histograms/metadata/histogram_suffixes_list.xml
@@ -3662,16 +3662,6 @@ name="PageLoad.Clients.LoadingPredictor2.PaintTiming.NavigationToFirstContentfulPaint"/> </histogram_suffixes> -<histogram_suffixes name="PageLoadMetricsClientsMedia2" separator="." - ordering="prefix"> - <suffix name="Clients.MediaPageLoad2" - label="PageLoadMetrics for page loads that involved playing a media - element. Includes samples from prerendered pages"/> - <affected-histogram name="PageLoad.Experimental.Bytes.Cache2"/> - <affected-histogram name="PageLoad.Experimental.Bytes.Network"/> - <affected-histogram name="PageLoad.Experimental.Bytes.Total2"/> -</histogram_suffixes> - <histogram_suffixes name="PageLoadMetricsClientsMultiTabLoading" separator="." ordering="prefix"> <suffix name="Clients.MultiTabLoading" @@ -3800,16 +3790,6 @@ name="PageLoad.Clients.ServiceWorker2.ParseTiming.NavigationToParseStart"/> </histogram_suffixes> -<histogram_suffixes name="PageLoadMetricsClientsTabRestore" separator="." - ordering="prefix"> - <suffix name="Clients.TabRestore" - label="PageLoadMetrics that are a result of a navigation caused by a - tab restore."/> - <affected-histogram name="PageLoad.Experimental.Bytes.Cache2"/> - <affected-histogram name="PageLoad.Experimental.Bytes.Network"/> - <affected-histogram name="PageLoad.Experimental.Bytes.Total2"/> -</histogram_suffixes> - <histogram_suffixes name="PageLoadMetricsEarlyHints2" separator="." ordering="prefix"> <suffix name="Clients.EarlyHints2.Preload"
diff --git a/tools/metrics/histograms/metadata/ios/histograms.xml b/tools/metrics/histograms/metadata/ios/histograms.xml index 1bbf7f09..8293e46 100644 --- a/tools/metrics/histograms/metadata/ios/histograms.xml +++ b/tools/metrics/histograms/metadata/ios/histograms.xml
@@ -1462,7 +1462,7 @@ </histogram> <histogram name="IOS.Permission.Modal.Events" enum="IOSPermissionEvent" - expires_after="2023-02-22"> + expires_after="2024-01-10"> <owner>ewannpv@chromium.org</owner> <owner>gambard@chromium.org</owner> <owner>bling-team@google.com</owner> @@ -1473,7 +1473,7 @@ </histogram> <histogram name="IOS.Permission.PageInfo.Events" enum="IOSPermissionEvent" - expires_after="2023-02-22"> + expires_after="2024-01-10"> <owner>ewannpv@chromium.org</owner> <owner>gambard@chromium.org</owner> <owner>bling-team@google.com</owner>
diff --git a/tools/metrics/histograms/metadata/network/histograms.xml b/tools/metrics/histograms/metadata/network/histograms.xml index d5e0ddb8..7f876b7 100644 --- a/tools/metrics/histograms/metadata/network/histograms.xml +++ b/tools/metrics/histograms/metadata/network/histograms.xml
@@ -3489,7 +3489,7 @@ </histogram> <histogram name="NetworkService.DeletedOldCacheData" enum="Boolean" - expires_after="2023-01-22"> + expires_after="2023-06-30"> <owner>wfh@chromium.org</owner> <owner>mmenke@chromium.org</owner> <summary>
diff --git a/ui/file_manager/file_manager/background/js/test_util.js b/ui/file_manager/file_manager/background/js/test_util.js index c51572f..229cfbf 100644 --- a/ui/file_manager/file_manager/background/js/test_util.js +++ b/ui/file_manager/file_manager/background/js/test_util.js
@@ -389,7 +389,7 @@ */ test.util.sync .overrideTasks = (contentWindow, taskList, isPolicyDefault = false) => { - const getFileTasks = (entries, onTasks) => { + const getFileTasks = (entries, sourceUrls, onTasks) => { // Call onTask asynchronously (same with original getFileTasks). setTimeout(() => { const policyDefaultHandlerStatus = isPolicyDefault ?
diff --git a/ui/file_manager/file_manager/common/js/api.js b/ui/file_manager/file_manager/common/js/api.js index 88433db..8fffe7b 100644 --- a/ui/file_manager/file_manager/common/js/api.js +++ b/ui/file_manager/file_manager/common/js/api.js
@@ -281,10 +281,12 @@ /** * @param {!Array<!Entry|!FilesAppEntry>} entries + * @param {!Array<string>} dlpSourceUrls * @return {!Promise<chrome.fileManagerPrivate.ResultingTasks>} */ -export async function getFileTasks(entries) { - return promisify(chrome.fileManagerPrivate.getFileTasks, entries); +export async function getFileTasks(entries, dlpSourceUrls) { + return promisify( + chrome.fileManagerPrivate.getFileTasks, entries, dlpSourceUrls); } /**
diff --git a/ui/file_manager/file_manager/externs/ts/state.js b/ui/file_manager/file_manager/externs/ts/state.js index 50234d64..dd3c6e0 100644 --- a/ui/file_manager/file_manager/externs/ts/state.js +++ b/ui/file_manager/file_manager/externs/ts/state.js
@@ -132,6 +132,7 @@ * iconType: string, * isDefault: (boolean|undefined), * isGenericFileHandler: (boolean|undefined), + * isDlpBlocked: (boolean|undefined), * }} */ export let FileTask;
diff --git a/ui/file_manager/file_manager/foreground/js/file_manager_commands.js b/ui/file_manager/file_manager/foreground/js/file_manager_commands.js index 620c0a5e..578685a 100644 --- a/ui/file_manager/file_manager/foreground/js/file_manager_commands.js +++ b/ui/file_manager/file_manager/foreground/js/file_manager_commands.js
@@ -1163,13 +1163,20 @@ const noEntries = entries.length === 0; event.command.setHidden(noEntries); - // Hide 'move-to-trash' if trash will not be used. E.g. drive or removable. - if (event.command.id === 'move-to-trash' && - (!shouldMoveToTrash(entries, fileManager.volumeManager) || - !fileManager.trashEnabled)) { + const isTrashDisabled = + !shouldMoveToTrash(entries, fileManager.volumeManager) || + !fileManager.trashEnabled; + + if (event.command.id === 'move-to-trash' && isTrashDisabled) { event.canExecute = false; event.command.setHidden(true); } + + // If the "move-to-trash" command is enabled, don't show the Delete command + // but still leave it executable. + if (event.command.id === 'delete' && !isTrashDisabled) { + event.command.setHidden(true); + } } /**
diff --git a/ui/file_manager/file_manager/foreground/js/file_tasks.ts b/ui/file_manager/file_manager/foreground/js/file_tasks.ts index 2186ea0..cae9e5d9 100644 --- a/ui/file_manager/file_manager/foreground/js/file_tasks.ts +++ b/ui/file_manager/file_manager/foreground/js/file_tasks.ts
@@ -86,8 +86,10 @@ // Cannot use fake entries with getFileTasks. entries = entries.filter(e => !util.isFakeEntry(e)); + const dlpSourceUrls = metadataModel.getCache(entries, ['sourceUrl']) + .map(m => m.sourceUrl || ''); if (entries.length !== 0) { - resultingTasks = await getFileTasks(entries); + resultingTasks = await getFileTasks(entries, dlpSourceUrls); if (!resultingTasks || !resultingTasks.tasks) { throw new Error('Cannot get file tasks.'); }
diff --git a/ui/file_manager/file_manager/foreground/js/file_tasks_unittest.ts b/ui/file_manager/file_manager/foreground/js/file_tasks_unittest.ts index eef51765..9f2b432 100644 --- a/ui/file_manager/file_manager/foreground/js/file_tasks_unittest.ts +++ b/ui/file_manager/file_manager/foreground/js/file_tasks_unittest.ts
@@ -23,6 +23,7 @@ import {FileManager} from './file_manager.js'; import {FileTasks} from './file_tasks.js'; import {FileTransferController} from './file_transfer_controller.js'; +import {MetadataItem} from './metadata/metadata_item.js'; import {MetadataModel} from './metadata/metadata_model.js'; import {TaskController} from './task_controller.js'; import {TaskHistory} from './task_history.js'; @@ -140,7 +141,8 @@ mockChrome = { fileManagerPrivate: { getFileTasks: function( - _entries: Entry[], callback: (tasks: any) => void) { + _entries: Entry[], _sourceUrls: string[], + callback: (tasks: any) => void) { setTimeout(callback.bind(null, {tasks: [mockTask]}), 0); }, executeTask: function( @@ -204,7 +206,11 @@ passwordDialog, speakA11yMessage: (_text: string) => {}, }), - metadataModel: {} as unknown as MetadataModel, + metadataModel: { + getCache: function(_entries: Entry[], _names: string[]) { + return _entries.map(_ => new MetadataItem()); + }, + } as unknown as MetadataModel, directoryModel: { getCurrentRootType: function() { return null; @@ -352,7 +358,8 @@ */ export async function testOpenTaskPicker(done: () => void) { chrome.fileManagerPrivate.getFileTasks = - (_entries: Entry[], callback: (tasks: any) => void) => { + (_entries: Entry[], _sourceUrls: string[], + callback: (tasks: any) => void) => { setTimeout( callback.bind(null, { tasks: [ @@ -406,7 +413,7 @@ }; chrome.fileManagerPrivate.getFileTasks = - (_entries: Entry[], + (_entries: Entry[], _sourceUrls: string[], callback: (tasks: chrome.fileManagerPrivate.ResultingTasks|undefined) => void) => { setTimeout( @@ -506,7 +513,8 @@ title: '__MSG_INSTALL_LINUX_PACKAGE__', }; chrome.fileManagerPrivate.getFileTasks = - (_entries: Entry[], callback: (tasks: any) => void) => { + (_entries: Entry[], _sourceUrls: string[], + callback: (tasks: any) => void) => { setTimeout(callback.bind(null, {tasks: [fileTask]}), 0); }; return fileManager; @@ -546,7 +554,8 @@ export async function testToOpenTiniFileOpensImportCrostiniImageDialog( done: () => void) { chrome.fileManagerPrivate.getFileTasks = - (_entries: Entry[], callback: (tasks: any) => void) => { + (_entries: Entry[], _sourceUrls: string[], + callback: (tasks: any) => void) => { setTimeout( callback.bind(null, { tasks: [
diff --git a/ui/file_manager/file_manager/foreground/js/task_controller.ts b/ui/file_manager/file_manager/foreground/js/task_controller.ts index e0fbebee..2946e15 100644 --- a/ui/file_manager/file_manager/foreground/js/task_controller.ts +++ b/ui/file_manager/file_manager/foreground/js/task_controller.ts
@@ -365,6 +365,7 @@ console.assert(false); return false; }, + isDlpBlocked: false, }; tasks.execute(task); @@ -753,6 +754,7 @@ isDefault: boolean; isPolicyDefault: boolean; isGenericFileHandler?: boolean; + isDlpBlocked?: boolean; } /** @@ -773,5 +775,6 @@ isDefault: isDefault || false, isPolicyDefault: isPolicyDefault || false, isGenericFileHandler: task.isGenericFileHandler, + isDlpBlocked: task.isDlpBlocked, }; }
diff --git a/ui/file_manager/file_manager/foreground/js/task_controller_unittest.ts b/ui/file_manager/file_manager/foreground/js/task_controller_unittest.ts index 2c4ffa8..89c1986 100644 --- a/ui/file_manager/file_manager/foreground/js/task_controller_unittest.ts +++ b/ui/file_manager/file_manager/foreground/js/task_controller_unittest.ts
@@ -102,7 +102,9 @@ function setupFileManagerPrivate() { mockChrome.fileManagerPrivate = { getFileTaskCalledCount_: 0, - getFileTasks: function(_entries: Entry[], callback: (tasks: any) => void) { + getFileTasks: function( + _entries: Entry[], _sourceUrls: string[], + callback: (tasks: any) => void) { mockChrome.fileManagerPrivate.getFileTaskCalledCount_++; const fileTasks = ([ /** @type {!chrome.fileManagerPrivate.FileTask} */ ({
diff --git a/ui/file_manager/file_manager/foreground/js/ui/combobutton.js b/ui/file_manager/file_manager/foreground/js/ui/combobutton.js index 77c44c8..85e24cfae7 100644 --- a/ui/file_manager/file_manager/foreground/js/ui/combobutton.js +++ b/ui/file_manager/file_manager/foreground/js/ui/combobutton.js
@@ -71,6 +71,7 @@ if (item.bold) { menuitem.style.fontWeight = 'bold'; } + menuitem.toggleAttribute('disabled', !!item.isDlpBlocked); return menuitem; }
diff --git a/ui/file_manager/file_manager/state/actions_producers/current_directory.ts b/ui/file_manager/file_manager/state/actions_producers/current_directory.ts index a905b7d1..da0770e 100644 --- a/ui/file_manager/file_manager/state/actions_producers/current_directory.ts +++ b/ui/file_manager/file_manager/state/actions_producers/current_directory.ts
@@ -74,7 +74,9 @@ await selection.computeAdditional(window.fileManager.metadataModel); yield; try { - const resultingTasks = await getFileTasks(filesData.map(fd => fd.entry)); + const resultingTasks = await getFileTasks( + filesData.map(fd => fd.entry), + filesData.map(fd => fd.metadata.sourceUrl || '')); if (!resultingTasks || !resultingTasks.tasks) { return; }
diff --git a/ui/file_manager/file_manager/state/reducers/current_directory_unittest.ts b/ui/file_manager/file_manager/state/reducers/current_directory_unittest.ts index 6b14354f..0f6ef8f 100644 --- a/ui/file_manager/file_manager/state/reducers/current_directory_unittest.ts +++ b/ui/file_manager/file_manager/state/reducers/current_directory_unittest.ts
@@ -336,7 +336,7 @@ function mockGetFileTasks(tasks: chrome.fileManagerPrivate.FileTask[]) { const mocked = - (_entries: Entry[], + (_entries: Entry[], _sourceUrls: string[], callback: (resultingTasks: chrome.fileManagerPrivate.ResultingTasks) => void) => { setTimeout(callback, 0, {tasks}); @@ -354,6 +354,7 @@ isGenericFileHandler: false, title: 'app 1', iconUrl: undefined, + isDlpBlocked: false, }; export async function testFetchTasks(done: () => void) { @@ -393,6 +394,7 @@ isGenericFileHandler: false, title: 'app 1', iconUrl: undefined, + isDlpBlocked: false, }, ]; want.defaultTask = {...want.tasks[0]!};
diff --git a/ui/file_manager/file_manager/widgets/xf_conflict_dialog.ts b/ui/file_manager/file_manager/widgets/xf_conflict_dialog.ts index 3beded3..8ed26c52 100644 --- a/ui/file_manager/file_manager/widgets/xf_conflict_dialog.ts +++ b/ui/file_manager/file_manager/widgets/xf_conflict_dialog.ts
@@ -76,15 +76,24 @@ /** * Open the modal dialog to ask the user to resolve a conflict for the given - * |filename|. Set |checkbox| true to display the 'Apply to all' checkbox. + * |filename|. The default parameters after |filename| are as follows: + * + * Set |checkbox| true to display the 'Apply to all' checkbox in the dialog, + * and should be set true if there are potentially, multiple file names in + * a copy or move operation that conflict. The default is false. + * + * Set |directory| true if the |filename| is a directory (aka a folder). The + * default is false. */ - async show(filename: string, checkbox?: boolean): Promise<ConflictResult> { + async show( + filename: string, checkbox: boolean = false, + directory: boolean = false): Promise<ConflictResult> { const unlock = await this.mutex_.lock(); try { return await new Promise<ConflictResult>((resolve, reject) => { this.resolve_ = resolve; this.reject_ = reject; - this.showModal_(filename, !!checkbox); + this.showModal_(filename, checkbox, directory); }); } finally { unlock(); @@ -92,12 +101,13 @@ } /** - * Resets the dialog message content for the given |filename| and |checkbox| - * display state, and then shows the modal dialog. + * Resets the dialog message content for the given |filename| |checkbox| and + * |folder| display state, and then shows the modal dialog. */ - private showModal_(filename: string, checkbox: boolean) { - const message = strf('CONFLICT_DIALOG_MESSAGE', filename); - this.getMessageElement().innerText = message; + private showModal_(filename: string, checkbox: boolean, folder: boolean) { + const message = // 'A folder named ...' or 'A file named ...' + folder ? 'CONFLICT_DIALOG_FOLDER_MESSAGE' : 'CONFLICT_DIALOG_MESSAGE'; + this.getMessageElement().innerText = strf(message, filename); const applyToAll = this.getCheckboxElement(); applyToAll.hidden = !checkbox;
diff --git a/ui/file_manager/file_manager/widgets/xf_conflict_dialog_unittest.ts b/ui/file_manager/file_manager/widgets/xf_conflict_dialog_unittest.ts index 3115a344..8ff4b42 100644 --- a/ui/file_manager/file_manager/widgets/xf_conflict_dialog_unittest.ts +++ b/ui/file_manager/file_manager/widgets/xf_conflict_dialog_unittest.ts
@@ -42,6 +42,7 @@ // Check: the dialog message should contain 'file.txt'. const message = element.getMessageElement(); assertNotEquals('none', window.getComputedStyle(message).display); + assertTrue(message.innerText.includes('A file named')); assertTrue(message.innerText.includes('file.txt')); assertFalse(message.hidden); @@ -51,7 +52,7 @@ assertFalse(checkbox.checked); assertTrue(checkbox.hidden); - // Check: the dialog should have the focus. + // Check: dialog must have the focus, never its child DOM elements. assertNotEquals('none', window.getComputedStyle(dialog).display); await waitUntil(() => element.shadowRoot!.activeElement === dialog); @@ -76,6 +77,7 @@ // Check: the dialog message should contain 'image.jpg'. const message = element.getMessageElement(); assertNotEquals('none', window.getComputedStyle(message).display); + assertTrue(message.innerText.includes('A file named')); assertTrue(message.innerText.includes('image.jpg')); assertFalse(message.hidden); @@ -86,7 +88,45 @@ assertFalse(checkbox.checked); assertFalse(checkbox.hidden); - // Check: the dialog should have the focus. + // Check: dialog must have the focus, never its child DOM elements. + assertNotEquals('none', window.getComputedStyle(dialog).display); + await waitUntil(() => element.shadowRoot!.activeElement === dialog); + + done(); +} + +/* + * Tests that the dialog can open with the directory (aka a folder) message + * text shown. + */ +export async function testDialogShowDirectoryMessageText(done: () => void) { + const element = getConflictDialogElement(); + + // Check: the dialog should not be open. + const dialog = element.getDialogElement(); + assertFalse(dialog.open); + + // Open the conflict dialog for a given file name, with no checkbox, and + // (test-case) message text indicating that the file type is a folder. + const isDirectory = true; + const withCheckbox = false; + element.show('Downloads', withCheckbox, isDirectory); + await waitUntil(() => dialog.open); + + // Check: the dialog message should contain 'Downloads'. + const message = element.getMessageElement(); + assertNotEquals('none', window.getComputedStyle(message).display); + assertTrue(message.innerText.includes('A folder named')); + assertTrue(message.innerText.includes('Downloads')); + assertFalse(message.hidden); + + // Check: the 'Apply to all' checkbox should not be shown. + const checkbox = element.getCheckboxElement(); + assertEquals('none', window.getComputedStyle(checkbox).display); + assertFalse(checkbox.checked); + assertTrue(checkbox.hidden); + + // Check: dialog must have the focus, never its child DOM elements. assertNotEquals('none', window.getComputedStyle(dialog).display); await waitUntil(() => element.shadowRoot!.activeElement === dialog);
diff --git a/ui/file_manager/integration_tests/file_manager/directory_tree_context_menu.js b/ui/file_manager/integration_tests/file_manager/directory_tree_context_menu.js index e8dc457b..05dba2c 100644 --- a/ui/file_manager/integration_tests/file_manager/directory_tree_context_menu.js +++ b/ui/file_manager/integration_tests/file_manager/directory_tree_context_menu.js
@@ -952,6 +952,9 @@ if (await sendTestMessage({name: 'isTrashEnabled'}) !== 'true') { downloadsMenus.splice(4, 1); photosTwoMenus.splice(5, 1); + } else { + downloadsMenus.splice(5, 1); + photosTwoMenus.splice(6, 1); } const photosTwo = new TestEntryInfo({ @@ -1000,6 +1003,8 @@ ]; if (await sendTestMessage({name: 'isTrashEnabled'}) !== 'true') { photosMenus.splice(5, 1); + } else { + photosMenus.splice(6, 1); } // Check the context menu is on desired state for MyFiles. await checkContextMenu( @@ -1043,6 +1048,8 @@ ]; if (await sendTestMessage({name: 'isTrashEnabled'}) !== 'true') { photosMenus.splice(5, 1); + } else { + photosMenus.splice(6, 1); } // Check the context menu is on desired state for MyFiles. @@ -1094,6 +1101,9 @@ if (await sendTestMessage({name: 'isTrashEnabled'}) !== 'true') { downloadsMenus.splice(4, 1); photosMenus.splice(5, 1); + } else { + downloadsMenus.splice(5, 1); + photosMenus.splice(6, 1); } // Open Files app on local Downloads.
diff --git a/ui/gl/gl_image.cc b/ui/gl/gl_image.cc index 8c349e90..0249c5a7 100644 --- a/ui/gl/gl_image.cc +++ b/ui/gl/gl_image.cc
@@ -86,10 +86,6 @@ return false; } -void GLImage::ReleaseTexImage(unsigned target) { - NOTREACHED(); -} - void GLImage::OnMemoryDump(base::trace_event::ProcessMemoryDump* pmd, uint64_t process_tracing_id, const std::string& dump_name) {
diff --git a/ui/gl/gl_image.h b/ui/gl/gl_image.h index fa94864..e1837dc 100644 --- a/ui/gl/gl_image.h +++ b/ui/gl/gl_image.h
@@ -109,15 +109,11 @@ // It is valid for an implementation to always return false. virtual bool BindTexImage(unsigned target); - // Release image from texture currently bound to |target|. - virtual void ReleaseTexImage(unsigned target); - public: // Allow usage of these methods from text sites that are inconvenient to // friend. gfx::Size GetSizeForTesting() { return GetSize(); } bool BindTexImageForTesting(unsigned target) { return BindTexImage(target); } - void ReleaseTexImageForTesting(unsigned target) { ReleaseTexImage(target); } protected: // Dumps information about the memory backing the GLImage to a dump named
diff --git a/ui/gl/gl_image_d3d.h b/ui/gl/gl_image_d3d.h index f18e064..7a48f4ef 100644 --- a/ui/gl/gl_image_d3d.h +++ b/ui/gl/gl_image_d3d.h
@@ -48,7 +48,6 @@ unsigned GetInternalFormat() override; unsigned GetDataType() override; bool BindTexImage(unsigned target) override; - void ReleaseTexImage(unsigned target) override {} void OnMemoryDump(base::trace_event::ProcessMemoryDump* pmd, uint64_t process_tracing_id, const std::string& dump_name) override;
diff --git a/ui/gl/gl_image_d3d_unittest.cc b/ui/gl/gl_image_d3d_unittest.cc index e2354710..b4db19e1 100644 --- a/ui/gl/gl_image_d3d_unittest.cc +++ b/ui/gl/gl_image_d3d_unittest.cc
@@ -123,9 +123,6 @@ // Draw |texture| to viewport. internal::DrawTextureQuad(target, image_size); - // Release |image| from |texture|. - image->ReleaseTexImageForTesting(target); - // Read back pixels to check expectations. const uint8_t zero_color[] = {0, 0, 0, 0}; GLTestHelper::CheckPixels(0, 0, image_size.width(), image_size.height(),
diff --git a/ui/gl/gl_image_egl_pixmap.cc b/ui/gl/gl_image_egl_pixmap.cc index f7d3480..40fb173 100644 --- a/ui/gl/gl_image_egl_pixmap.cc +++ b/ui/gl/gl_image_egl_pixmap.cc
@@ -92,9 +92,8 @@ return true; } -void GLImageEGLPixmap::ReleaseTexImage(unsigned target) { +void GLImageEGLPixmap::ReleaseEGLImage() { DCHECK_NE(nullptr, surface_); - DCHECK_EQ(static_cast<GLenum>(GL_TEXTURE_2D), target); eglReleaseTexImage(display_, surface_, EGL_BACK_BUFFER); }
diff --git a/ui/gl/gl_image_egl_pixmap.h b/ui/gl/gl_image_egl_pixmap.h index 031fc35..e74cd4e 100644 --- a/ui/gl/gl_image_egl_pixmap.h +++ b/ui/gl/gl_image_egl_pixmap.h
@@ -31,11 +31,13 @@ unsigned GetInternalFormat() override; unsigned GetDataType() override; bool BindTexImage(unsigned target) override; - void ReleaseTexImage(unsigned target) override; void OnMemoryDump(base::trace_event::ProcessMemoryDump* pmd, uint64_t process_tracing_id, const std::string& dump_name) override; + // Releases the image that was bound via BindTexImage(). + void ReleaseEGLImage(); + protected: ~GLImageEGLPixmap() override;
diff --git a/ui/gl/gl_image_io_surface.h b/ui/gl/gl_image_io_surface.h index 6e306b8a..5d654c0c 100644 --- a/ui/gl/gl_image_io_surface.h +++ b/ui/gl/gl_image_io_surface.h
@@ -59,7 +59,6 @@ unsigned GetInternalFormat() override; unsigned GetDataType() override; bool BindTexImage(unsigned target) override; - void ReleaseTexImage(unsigned target) override; void OnMemoryDump(base::trace_event::ProcessMemoryDump* pmd, uint64_t process_tracing_id, const std::string& dump_name) override;
diff --git a/ui/gl/gl_image_io_surface.mm b/ui/gl/gl_image_io_surface.mm index a405241..b08196c8 100644 --- a/ui/gl/gl_image_io_surface.mm +++ b/ui/gl/gl_image_io_surface.mm
@@ -132,8 +132,6 @@ return false; } -void GLImageIOSurface::ReleaseTexImage(unsigned target) {} - void GLImageIOSurface::OnMemoryDump(base::trace_event::ProcessMemoryDump* pmd, uint64_t process_tracing_id, const std::string& dump_name) {
diff --git a/ui/gl/gl_image_native_pixmap.h b/ui/gl/gl_image_native_pixmap.h index 550980f..d3b6717 100644 --- a/ui/gl/gl_image_native_pixmap.h +++ b/ui/gl/gl_image_native_pixmap.h
@@ -51,7 +51,6 @@ gfx::Size GetSize() override; void* GetEGLImage() const override; bool BindTexImage(unsigned target) override; - void ReleaseTexImage(unsigned target) override {} unsigned GetInternalFormat() override; unsigned GetDataType() override; void OnMemoryDump(base::trace_event::ProcessMemoryDump* pmd,
diff --git a/ui/gl/gl_image_stub.h b/ui/gl/gl_image_stub.h index 2a0e8a3..db1c489 100644 --- a/ui/gl/gl_image_stub.h +++ b/ui/gl/gl_image_stub.h
@@ -22,7 +22,6 @@ unsigned GetInternalFormat() override; unsigned GetDataType() override; bool BindTexImage(unsigned target) override; - void ReleaseTexImage(unsigned target) override {} void OnMemoryDump(base::trace_event::ProcessMemoryDump* pmd, uint64_t process_tracing_id, const std::string& dump_name) override {}
diff --git a/ui/ozone/demo/skia/skia_surfaceless_gl_renderer.cc b/ui/ozone/demo/skia/skia_surfaceless_gl_renderer.cc index 6dab704..951c5b7 100644 --- a/ui/ozone/demo/skia/skia_surfaceless_gl_renderer.cc +++ b/ui/ozone/demo/skia/skia_surfaceless_gl_renderer.cc
@@ -96,7 +96,7 @@ gfx::AcceleratedWidget widget_ = gfx::kNullAcceleratedWidget; gfx::Size size_; - scoped_refptr<gl::GLImage> image_; + scoped_refptr<gl::GLImageNativePixmap> image_; unsigned int gl_tex_ = 0; sk_sp<SkSurface> sk_surface_; }; @@ -105,7 +105,6 @@ SurfacelessSkiaGlRenderer::BufferWrapper::~BufferWrapper() { if (gl_tex_) { - image_->ReleaseTexImage(GL_TEXTURE_2D); glDeleteTextures(1, &gl_tex_); } }
diff --git a/ui/ozone/demo/surfaceless_gl_renderer.cc b/ui/ozone/demo/surfaceless_gl_renderer.cc index b661ea6..13997a4 100644 --- a/ui/ozone/demo/surfaceless_gl_renderer.cc +++ b/ui/ozone/demo/surfaceless_gl_renderer.cc
@@ -74,7 +74,6 @@ glDeleteFramebuffersEXT(1, &gl_fb_); if (gl_tex_) { - image_->ReleaseTexImage(GL_TEXTURE_2D); glDeleteTextures(1, &gl_tex_); } }
diff --git a/ui/ozone/demo/surfaceless_gl_renderer.h b/ui/ozone/demo/surfaceless_gl_renderer.h index e1517e7..5342f57 100644 --- a/ui/ozone/demo/surfaceless_gl_renderer.h +++ b/ui/ozone/demo/surfaceless_gl_renderer.h
@@ -12,7 +12,7 @@ #include "ui/ozone/demo/gl_renderer.h" namespace gl { -class GLImage; +class GLImageNativePixmap; class Presenter; } @@ -59,7 +59,7 @@ gfx::AcceleratedWidget widget_ = gfx::kNullAcceleratedWidget; gfx::Size size_; - scoped_refptr<gl::GLImage> image_; + scoped_refptr<gl::GLImageNativePixmap> image_; unsigned int gl_fb_ = 0; unsigned int gl_tex_ = 0; };
diff --git a/ui/ozone/platform/wayland/host/shell_popup_wrapper.h b/ui/ozone/platform/wayland/host/shell_popup_wrapper.h index 4002262..675e875 100644 --- a/ui/ozone/platform/wayland/host/shell_popup_wrapper.h +++ b/ui/ozone/platform/wayland/host/shell_popup_wrapper.h
@@ -34,7 +34,15 @@ absl::optional<OwnedWindowAnchor> anchor; }; -// A wrapper around different versions of xdg popups. +// Wrapper interface for shell popups. +// +// This is one of three wrapper classes: Shell{Surface,Toplevel,Popup}Wrapper. +// It has the only sub-class in Chromium, but should not be removed because it +// eases downstream implementations. +// See https://crbug.com/1402672 +// +// Allows WaylandPopup to do stuff specific to popups, such as anchoring the +// window and grabbing the pointer. class ShellPopupWrapper { public: virtual ~ShellPopupWrapper() = default;
diff --git a/ui/ozone/platform/wayland/host/shell_surface_wrapper.h b/ui/ozone/platform/wayland/host/shell_surface_wrapper.h index 0e3eedeb..3fcf9b6d 100644 --- a/ui/ozone/platform/wayland/host/shell_surface_wrapper.h +++ b/ui/ozone/platform/wayland/host/shell_surface_wrapper.h
@@ -15,7 +15,12 @@ class XDGSurfaceWrapperImpl; -// Wrapper interface for different wayland xdg-shell surface versions. +// Wrapper interface for shell surfaces. +// +// This is one of three wrapper classes: Shell{Surface,Toplevel,Popup}Wrapper. +// It has the only sub-class in Chromium, but should not be removed because it +// eases downstream implementations. +// See https://crbug.com/1402672 class ShellSurfaceWrapper { public: virtual ~ShellSurfaceWrapper() = default;
diff --git a/ui/ozone/platform/wayland/host/shell_toplevel_wrapper.h b/ui/ozone/platform/wayland/host/shell_toplevel_wrapper.h index 521f61c..9186668c 100644 --- a/ui/ozone/platform/wayland/host/shell_toplevel_wrapper.h +++ b/ui/ozone/platform/wayland/host/shell_toplevel_wrapper.h
@@ -20,8 +20,14 @@ class XDGToplevelWrapperImpl; enum class ZOrderLevel; -// A wrapper around different versions of xdg toplevels. Allows -// WaylandToplevelWindow to set window-like properties such as maximize, +// Wrapper interface for shell top level windows. +// +// This is one of three wrapper classes: Shell{Surface,Toplevel,Popup}Wrapper. +// It has the only sub-class in Chromium, but should not be removed because it +// eases downstream implementations. +// See https://crbug.com/1402672 +// +// Allows WaylandToplevelWindow to set window-like properties such as maximize, // fullscreen, and minimize, set application-specific metadata like title and // id, as well as trigger user interactive operations such as interactive resize // and move.
