Skip to content

Commit

Permalink
Roll src/third_party/content_analysis_sdk/src/ 93f5b9cfe..3102cb8a5 (…
Browse files Browse the repository at this point in the history
…3 commits)

https://chromium.googlesource.com/external/github.com/chromium/content_analysis_sdk.git/+log/93f5b9cfe950..3102cb8a514a

$ git log 93f5b9cfe..8d5118720 --date=short --no-merges --format='%ad %ae %s'
2023-08-17 105299435+dominiquefc Fix switch statement from last change (#100)
2023-08-17 105299435+dominiquefc Add Reason enum to ContentAnalysisRequest (#99)
2023-08-04 105299435+dominiquefc Update "Ack:" logging whitespace (#98)
2023-08-04 105299435+dominiquefc initial (#97)

Created with:
  roll-dep src/third_party/content_analysis_sdk/src

Bug: b/232967266, b/285317584
Change-Id: I8d15321576b9a9b221de26a40cf8eb58e18097bc
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4791106
Auto-Submit: Dominique Fauteux-Chapleau <domfc@chromium.org>
Commit-Queue: Roger Tawa <rogerta@chromium.org>
Reviewed-by: Roger Tawa <rogerta@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1185151}
  • Loading branch information
dominiquefc authored and Chromium LUCI CQ committed Aug 18, 2023
1 parent 5abaae5 commit 977d5e3
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 1 deletion.
2 changes: 1 addition & 1 deletion DEPS
Original file line number Diff line number Diff line change
Expand Up @@ -1156,7 +1156,7 @@ deps = {
Var('chromium_git') + '/external/github.com/google/anonymous-tokens.git' + '@' + '8c8d20953d502db31fec2353b199e6c22ef0236e',

'src/third_party/content_analysis_sdk/src':
Var('chromium_git') + '/external/github.com/chromium/content_analysis_sdk.git' + '@' + '93f5b9cfe9509a6b58eb0414f1bd610c4859ed1d',
Var('chromium_git') + '/external/github.com/chromium/content_analysis_sdk.git' + '@' + '8d5118720805fdce0dd3ee2999c964501de4532c',

'src/third_party/dav1d/libdav1d':
Var('chromium_git') + '/external/github.com/videolan/dav1d.git' + '@' + 'f8ae94eca0f53502a2cddd29a263c1edea4822a0',
Expand Down
23 changes: 23 additions & 0 deletions components/enterprise/common/proto/connectors_unittest.cc
Original file line number Diff line number Diff line change
Expand Up @@ -71,4 +71,27 @@ TEST(EnterpriseConnectorsProtoTest, PrintTypeEnum) {
EXPECT_EQ((int)ChromiumPrintMetadata::LOCAL, (int)SdkPrintMetadata::LOCAL);
}

using ChromiumReason = enterprise_connectors::ContentAnalysisRequest;
using SdkReason = content_analysis::sdk::ContentAnalysisRequest;

TEST(EnterpriseConnectorsProtoTest, ReasonEnum) {
EXPECT_EQ(ChromiumReason::Reason_ARRAYSIZE, 8);
EXPECT_EQ(ChromiumReason::Reason_ARRAYSIZE, SdkReason::Reason_ARRAYSIZE);

EXPECT_EQ((int)ChromiumReason::UNKNOWN, (int)SdkReason::UNKNOWN);
EXPECT_EQ((int)ChromiumReason::CLIPBOARD_PASTE,
(int)SdkReason::CLIPBOARD_PASTE);
EXPECT_EQ((int)ChromiumReason::DRAG_AND_DROP, (int)SdkReason::DRAG_AND_DROP);
EXPECT_EQ((int)ChromiumReason::FILE_PICKER_DIALOG,
(int)SdkReason::FILE_PICKER_DIALOG);
EXPECT_EQ((int)ChromiumReason::PRINT_PREVIEW_PRINT,
(int)SdkReason::PRINT_PREVIEW_PRINT);
EXPECT_EQ((int)ChromiumReason::SYSTEM_DIALOG_PRINT,
(int)SdkReason::SYSTEM_DIALOG_PRINT);
EXPECT_EQ((int)ChromiumReason::NORMAL_DOWNLOAD,
(int)SdkReason::NORMAL_DOWNLOAD);
EXPECT_EQ((int)ChromiumReason::SAVE_AS_DOWNLOAD,
(int)SdkReason::SAVE_AS_DOWNLOAD);
}

} // namespace enterprise_connectors

0 comments on commit 977d5e3

Please sign in to comment.