Skip to content

Commit

Permalink
Roll Open Screen from f3cb605aacaa to 563003581975 (1 revision)
Browse files Browse the repository at this point in the history
https://chromium.googlesource.com/openscreen.git/+log/f3cb605aacaa..563003581975

2023-10-13 wei4.wang@intel.com [OpenScreen] Replace absl::string_view with std::string_view

If this roll has caused a breakage, revert this CL and stop the roller
using the controls here:
https://autoroll.skia.org/r/openscreen-chromium
Please CC jophba@chromium.org on the revert to ensure that a human
is aware of the problem.

To file a bug in Chromium: https://bugs.chromium.org/p/chromium/issues/entry

To report a problem with the AutoRoller itself, please file a bug:
https://issues.skia.org/issues/new?component=1389291&template=1850622

Documentation for the AutoRoller is here:
https://skia.googlesource.com/buildbot/+doc/main/autoroll/README.md

(cherry picked from commit e9e7036)

Bug: None
Tbr: jophba@chromium.org
Change-Id: I7e33cf08fc16aa402d52853130b7a594ef57b177
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4939040
Commit-Queue: Mark Foltz <mfoltz@chromium.org>
Reviewed-by: Sean Topping <seantopping@chromium.org>
Cr-Original-Commit-Position: refs/heads/main@{#1209662}
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5035002
Reviewed-by: Mark Foltz <mfoltz@chromium.org>
Commit-Queue: Jordan Bayles <jophba@chromium.org>
Cr-Commit-Position: refs/branch-heads/6045@{#1367}
Cr-Branched-From: 905e8bd-refs/heads/main@{#1204232}
  • Loading branch information
mfoltzgoogle authored and Chromium LUCI CQ committed Nov 15, 2023
1 parent c25fb64 commit c1edbe9
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 3 deletions.
2 changes: 1 addition & 1 deletion DEPS
Original file line number Diff line number Diff line change
Expand Up @@ -1779,7 +1779,7 @@ deps = {
Var('chromium_git') + '/external/github.com/cisco/openh264' + '@' + '09a4f3ec842a8932341b195c5b01e141c8a16eb7',

'src/third_party/openscreen/src':
Var('chromium_git') + '/openscreen' + '@' + '934f2462ad01c407a596641dbc611df49e2017b4',
Var('chromium_git') + '/openscreen' + '@' + '563003581975a7a46187b945ccf68717a05d02b8',

'src/third_party/openxr/src': {
'url': Var('chromium_git') + '/external/github.com/KhronosGroup/OpenXR-SDK' + '@' + '58a00cf85c39ad5ec4dc43a769624e420c06179a',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@

#include "components/media_router/common/providers/cast/certificate/net_trust_store.h"

#include <string_view>

#include "base/check.h"
#include "base/files/file_path.h"
#include "base/files/file_util.h"
Expand All @@ -17,6 +19,7 @@
#include "net/cert/pki/path_builder.h"
#include "net/cert/pki/simple_path_builder_delegate.h"
#include "net/cert/x509_util.h"
#include "third_party/openscreen/src/cast/common/public/trust_store.h"

namespace {

Expand Down Expand Up @@ -62,7 +65,7 @@ std::unique_ptr<openscreen::cast::TrustStore> TrustStore::CreateInstanceForTest(

// static
std::unique_ptr<openscreen::cast::TrustStore>
TrustStore::CreateInstanceFromPemFile(absl::string_view file_path) {
TrustStore::CreateInstanceFromPemFile(std::string_view file_path) {
std::string pem_data;
CHECK(base::ReadFileToString(base::FilePath::FromASCII(base::StringPiece(
file_path.data(), file_path.size())),
Expand Down
2 changes: 1 addition & 1 deletion third_party/openscreen/src
Submodule src updated from 934f24 to 563003

0 comments on commit c1edbe9

Please sign in to comment.