Address comments

kjyoun · kjyoun · commit bcc50e72ca44 · 2025-11-04T12:59:13.000-08:00
diff --git a/cobalt/browser/BUILD.gn b/cobalt/browser/BUILD.gn
@@ -28,12 +28,12 @@ source_set("browser") {
     "cobalt_content_browser_client.h",
     "cobalt_secure_navigation_throttle.cc",
     "cobalt_secure_navigation_throttle.h",
-    "cobalt_settings_impl.cc",
-    "cobalt_settings_impl.h",
     "cobalt_web_contents_delegate.cc",
     "cobalt_web_contents_delegate.h",
     "cobalt_web_contents_observer.cc",
     "cobalt_web_contents_observer.h",
+    "h5vcc_settings_impl.cc",
+    "h5vcc_settings_impl.h",
   ]
 
   if (is_androidtv) {
diff --git a/cobalt/browser/cobalt_content_browser_client.cc b/cobalt/browser/cobalt_content_browser_client.cc
@@ -27,11 +27,11 @@
 #include "cobalt/browser/cobalt_browser_interface_binders.h"
 #include "cobalt/browser/cobalt_browser_main_parts.h"
 #include "cobalt/browser/cobalt_secure_navigation_throttle.h"
-#include "cobalt/browser/cobalt_settings_impl.h"
 #include "cobalt/browser/cobalt_web_contents_observer.h"
 #include "cobalt/browser/constants/cobalt_experiment_names.h"
 #include "cobalt/browser/global_features.h"
-#include "cobalt/browser/mojom/cobalt_settings.mojom.h"
+#include "cobalt/browser/h5vcc_settings_impl.h"
+#include "cobalt/browser/mojom/h5vcc_settings.mojom.h"
 #include "cobalt/browser/user_agent/user_agent_platform_info.h"
 #include "cobalt/common/features/starboard_features_initialization.h"
 #include "cobalt/media/service/mojom/video_geometry_setter.mojom.h"
@@ -340,8 +340,8 @@ void CobaltContentBrowserClient::ExposeInterfacesToRenderer(
       video_geometry_setter_service_->GetBindSubscriberCallback(),
       base::SingleThreadTaskRunner::GetCurrentDefault());
 
-  registry->AddInterface<cobalt::mojom::CobaltSettings>(
-      base::BindRepeating(&CobaltSettingsImpl::Create),
+  registry->AddInterface<cobalt::mojom::H5vccSettings>(
+      base::BindRepeating(&H5vccSettingsImpl::Create),
       base::SingleThreadTaskRunner::GetCurrentDefault());
 }
 
diff --git a/cobalt/browser/h5vcc_settings_impl.cc b/cobalt/browser/h5vcc_settings_impl.cc
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "cobalt/browser/cobalt_settings_impl.h"
+#include "cobalt/browser/h5vcc_settings_impl.h"
 
 #include <memory>
 
@@ -22,19 +22,19 @@
 
 namespace cobalt {
 
-CobaltSettingsImpl::CobaltSettingsImpl() = default;
+H5vccSettingsImpl::H5vccSettingsImpl() = default;
 
-CobaltSettingsImpl::~CobaltSettingsImpl() = default;
+H5vccSettingsImpl::~H5vccSettingsImpl() = default;
 
 // static
-void CobaltSettingsImpl::Create(
-    mojo::PendingReceiver<mojom::CobaltSettings> receiver) {
-  mojo::MakeSelfOwnedReceiver(std::make_unique<CobaltSettingsImpl>(),
+void H5vccSettingsImpl::Create(
+    mojo::PendingReceiver<mojom::H5vccSettings> receiver) {
+  mojo::MakeSelfOwnedReceiver(std::make_unique<H5vccSettingsImpl>(),
                               std::move(receiver));
 }
 
-void CobaltSettingsImpl::GetSetting(const std::string& key,
-                                    GetSettingCallback callback) {
+void H5vccSettingsImpl::GetSetting(const std::string& key,
+                                   GetSettingCallback callback) {
   auto setting = GlobalFeatures::GetInstance()->GetSetting(key);
   if (!setting) {
     std::move(callback).Run(nullptr);
diff --git a/cobalt/browser/h5vcc_settings_impl.h b/cobalt/browser/h5vcc_settings_impl.h
@@ -12,28 +12,28 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef COBALT_BROWSER_COBALT_SETTINGS_IMPL_H_
-#define COBALT_BROWSER_COBALT_SETTINGS_IMPL_H_
+#ifndef COBALT_BROWSER_H5VCC_SETTINGS_IMPL_H_
+#define COBALT_BROWSER_H5VCC_SETTINGS_IMPL_H_
 
-#include "cobalt/browser/mojom/cobalt_settings.mojom.h"
+#include "cobalt/browser/mojom/h5vcc_settings.mojom.h"
 #include "mojo/public/cpp/bindings/pending_receiver.h"
 
 namespace cobalt {
 
-class CobaltSettingsImpl : public mojom::CobaltSettings {
+class H5vccSettingsImpl : public mojom::H5vccSettings {
  public:
-  CobaltSettingsImpl();
-  ~CobaltSettingsImpl() override;
+  H5vccSettingsImpl();
+  ~H5vccSettingsImpl() override;
 
-  CobaltSettingsImpl(const CobaltSettingsImpl&) = delete;
-  CobaltSettingsImpl& operator=(const CobaltSettingsImpl&) = delete;
+  H5vccSettingsImpl(const H5vccSettingsImpl&) = delete;
+  H5vccSettingsImpl& operator=(const H5vccSettingsImpl&) = delete;
 
-  static void Create(mojo::PendingReceiver<mojom::CobaltSettings> receiver);
+  static void Create(mojo::PendingReceiver<mojom::H5vccSettings> receiver);
 
-  // mojom::CobaltSettings implementation.
+  // mojom::H5vccSettings implementation.
   void GetSetting(const std::string& key, GetSettingCallback callback) override;
 };
 
 }  // namespace cobalt
 
-#endif  // COBALT_BROWSER_COBALT_SETTINGS_IMPL_H_
+#endif  // COBALT_BROWSER_H5VCC_SETTINGS_IMPL_H_
diff --git a/cobalt/browser/mojom/BUILD.gn b/cobalt/browser/mojom/BUILD.gn
@@ -15,5 +15,5 @@
 import("//mojo/public/tools/bindings/mojom.gni")
 
 mojom("mojom") {
-  sources = [ "cobalt_settings.mojom" ]
+  sources = [ "h5vcc_settings.mojom" ]
 }
diff --git a/cobalt/browser/mojom/h5vcc_settings.mojom b/cobalt/browser/mojom/h5vcc_settings.mojom
@@ -19,7 +19,7 @@ union SettingValue {
   int64 int_value;
 };
 
-interface CobaltSettings {
+interface H5vccSettings {
   // Synchronous call is used here because this is called before player
   // creation. Though it blocks the render thread, it is acceptable, since it
   // happens only at the construction stage.
diff --git a/cobalt/renderer/cobalt_content_renderer_client.cc b/cobalt/renderer/cobalt_content_renderer_client.cc
@@ -9,7 +9,7 @@
 
 #include "base/task/bind_post_task.h"
 #include "base/time/time.h"
-#include "cobalt/browser/mojom/cobalt_settings.mojom.h"
+#include "cobalt/browser/mojom/h5vcc_settings.mojom.h"
 #include "cobalt/renderer/cobalt_render_frame_observer.h"
 #include "components/cdm/renderer/widevine_key_system_info.h"
 #include "components/js_injection/renderer/js_communication.h"
@@ -190,7 +190,7 @@ void CobaltContentRendererClient::GetStarboardRendererFactoryTraits(
   renderer_factory_traits->audio_write_duration_remote =
       base::Microseconds(kSbPlayerWriteDurationRemote);
 
-  mojo::Remote<cobalt::mojom::CobaltSettings> cobalt_settings;
+  mojo::Remote<cobalt::mojom::H5vccSettings> cobalt_settings;
   content::RenderThread::Get()->BindHostReceiver(
       cobalt_settings.BindNewPipeAndPassReceiver());
 
diff --git a/media/mojo/services/starboard/starboard_renderer_wrapper.cc b/media/mojo/services/starboard/starboard_renderer_wrapper.cc
@@ -21,7 +21,6 @@
 #include "base/time/time.h"
 #include "media/base/starboard/starboard_rendering_mode.h"
 #include "media/mojo/services/mojo_media_log.h"
-#include "media/renderers/video_overlay_factory.h"
 
 namespace media {
 

Original file line number	Diff line number	Diff line change
`@@ -15,5 +15,5 @@`
`15`	`15`	`import("//mojo/public/tools/bindings/mojom.gni")`
`16`	`16`
`17`	`17`	`mojom("mojom") {`
`18`		`- sources = [ "cobalt_settings.mojom" ]`
	`18`	`+ sources = [ "h5vcc_settings.mojom" ]`
`19`	`19`	`}`