Commit 0b1efea1 authored by Jiawei Li's avatar Jiawei Li Committed by Commit Bot

[bindings] Use std::string instead StringPiece as ScripId type

Changes to use std:string as ScriptId type which has been changed to
base::StringPiece on CastWebContents. Using base::StringPiece breaks the
normal behavior of injecting JS bindings and the browsertest. Changing
it back to std::string fixed the problem.

Bug: internal b/163431947, b/132986916
Test: cast_shell_internal_browsertest, CQ
Change-Id: I2a4cef5f208880816a4be3068e4e460dd9cf9fcf
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2350314Reviewed-by: default avatarSean Topping <seantopping@chromium.org>
Auto-Submit: Jiawei Li <lijiawei@chromium.org>
Commit-Queue: Jiawei Li <lijiawei@chromium.org>
Cr-Commit-Position: refs/heads/master@{#797101}
parent 4b87dfcf
...@@ -14,7 +14,6 @@ ...@@ -14,7 +14,6 @@
#include "base/optional.h" #include "base/optional.h"
#include "base/process/process.h" #include "base/process/process.h"
#include "base/strings/string16.h" #include "base/strings/string16.h"
#include "base/strings/string_piece_forward.h"
#include "chromecast/common/mojom/feature_manager.mojom.h" #include "chromecast/common/mojom/feature_manager.mojom.h"
#include "content/public/common/media_playback_renderer_type.mojom.h" #include "content/public/common/media_playback_renderer_type.mojom.h"
#include "services/service_manager/public/cpp/binder_registry.h" #include "services/service_manager/public/cpp/binder_registry.h"
...@@ -343,7 +342,7 @@ class CastWebContents { ...@@ -343,7 +342,7 @@ class CastWebContents {
// Returns the script injector instance, which injects scripts at page load // Returns the script injector instance, which injects scripts at page load
// time. // time.
virtual on_load_script_injector::OnLoadScriptInjectorHost<base::StringPiece>* virtual on_load_script_injector::OnLoadScriptInjectorHost<std::string>*
script_injector() = 0; script_injector() = 0;
// Injects on-load scripts into the WebContents' main frame. // Injects on-load scripts into the WebContents' main frame.
......
...@@ -10,7 +10,6 @@ ...@@ -10,7 +10,6 @@
#include "base/bind_helpers.h" #include "base/bind_helpers.h"
#include "base/no_destructor.h" #include "base/no_destructor.h"
#include "base/optional.h" #include "base/optional.h"
#include "base/strings/string_piece.h"
#include "base/strings/utf_string_conversions.h" #include "base/strings/utf_string_conversions.h"
#include "base/threading/sequenced_task_runner_handle.h" #include "base/threading/sequenced_task_runner_handle.h"
#include "base/values.h" #include "base/values.h"
...@@ -335,7 +334,7 @@ void CastWebContentsImpl::ClearRenderWidgetHostView() { ...@@ -335,7 +334,7 @@ void CastWebContentsImpl::ClearRenderWidgetHostView() {
} }
} }
on_load_script_injector::OnLoadScriptInjectorHost<base::StringPiece>* on_load_script_injector::OnLoadScriptInjectorHost<std::string>*
CastWebContentsImpl::script_injector() { CastWebContentsImpl::script_injector() {
return &script_injector_; return &script_injector_;
} }
......
...@@ -19,7 +19,6 @@ ...@@ -19,7 +19,6 @@
#include "base/memory/weak_ptr.h" #include "base/memory/weak_ptr.h"
#include "base/optional.h" #include "base/optional.h"
#include "base/sequence_checker.h" #include "base/sequence_checker.h"
#include "base/strings/string_piece_forward.h"
#include "base/time/time.h" #include "base/time/time.h"
#include "chromecast/browser/cast_media_blocker.h" #include "chromecast/browser/cast_media_blocker.h"
#include "chromecast/browser/cast_web_contents.h" #include "chromecast/browser/cast_web_contents.h"
...@@ -71,7 +70,7 @@ class CastWebContentsImpl : public CastWebContents, ...@@ -71,7 +70,7 @@ class CastWebContentsImpl : public CastWebContents,
void BlockMediaLoading(bool blocked) override; void BlockMediaLoading(bool blocked) override;
void BlockMediaStarting(bool blocked) override; void BlockMediaStarting(bool blocked) override;
void EnableBackgroundVideoPlayback(bool enabled) override; void EnableBackgroundVideoPlayback(bool enabled) override;
on_load_script_injector::OnLoadScriptInjectorHost<base::StringPiece>* on_load_script_injector::OnLoadScriptInjectorHost<std::string>*
script_injector() override; script_injector() override;
void InjectScriptsIntoMainFrame() override; void InjectScriptsIntoMainFrame() override;
void PostMessageToMainFrame( void PostMessageToMainFrame(
...@@ -178,7 +177,7 @@ class CastWebContentsImpl : public CastWebContents, ...@@ -178,7 +177,7 @@ class CastWebContentsImpl : public CastWebContents,
bool notifying_; bool notifying_;
int last_error_; int last_error_;
on_load_script_injector::OnLoadScriptInjectorHost<base::StringPiece> on_load_script_injector::OnLoadScriptInjectorHost<std::string>
script_injector_; script_injector_;
base::ObserverList<Observer>::Unchecked observer_list_; base::ObserverList<Observer>::Unchecked observer_list_;
......
...@@ -38,11 +38,10 @@ class MockCastWebContents : public CastWebContents { ...@@ -38,11 +38,10 @@ class MockCastWebContents : public CastWebContents {
MOCK_METHOD(void, BlockMediaLoading, (bool), (override)); MOCK_METHOD(void, BlockMediaLoading, (bool), (override));
MOCK_METHOD(void, BlockMediaStarting, (bool), (override)); MOCK_METHOD(void, BlockMediaStarting, (bool), (override));
MOCK_METHOD(void, EnableBackgroundVideoPlayback, (bool), (override)); MOCK_METHOD(void, EnableBackgroundVideoPlayback, (bool), (override));
MOCK_METHOD( MOCK_METHOD(on_load_script_injector::OnLoadScriptInjectorHost<std::string>*,
on_load_script_injector::OnLoadScriptInjectorHost<base::StringPiece>*, script_injector,
script_injector, (),
(), (override));
(override));
MOCK_METHOD(void, InjectScriptsIntoMainFrame, (), (override)); MOCK_METHOD(void, InjectScriptsIntoMainFrame, (), (override));
MOCK_METHOD(void, MOCK_METHOD(void,
PostMessageToMainFrame, PostMessageToMainFrame,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment