Merge branch '26.eap' into santo/26.eap11/user-agent-os1

Author: santoshmahto7

cobalt/BUILD.gn

@@ -205,7 +205,11 @@ test("cobalt_unittests") {
   }
 
   if (!is_android) {
-    sources += [ "//cobalt/shell/browser/splash_screen_unittest.cc" ]
+    sources += [
+      "//cobalt/shell/browser/lifecycle_unittest.cc",
+      "//cobalt/shell/browser/shell_test_support.h",
+      "//cobalt/shell/browser/splash_screen_unittest.cc",
+    ]
   }
 
   public_deps = [ "//third_party/zlib/google:compression_utils" ]

cobalt/app/cobalt.cc

@@ -107,26 +107,16 @@ int InitCobalt(int argc, const char** argv, const char* initial_deep_link) {
 
 void SbEventHandle(const SbEvent* event) {
   switch (event->type) {
-    case kSbEventTypePreload: {
-#if BUILDFLAG(IS_COBALT_HERMETIC_BUILD)
-      init_musl();
-#endif
-      SbEventStartData* data = static_cast<SbEventStartData*>(event->data);
-      g_exit_manager = new base::AtExitManager();
-      g_content_main_delegate = new cobalt::CobaltMainDelegate();
-      g_platform_event_source = new PlatformEventSourceStarboard();
-      InitCobalt(data->argument_count,
-                 const_cast<const char**>(data->argument_values), data->link);
-
-      break;
-    }
+    case kSbEventTypePreload:
     case kSbEventTypeStart: {
 #if BUILDFLAG(IS_COBALT_HERMETIC_BUILD)
       init_musl();
 #endif
       SbEventStartData* data = static_cast<SbEventStartData*>(event->data);
       g_exit_manager = new base::AtExitManager();
-      g_content_main_delegate = new cobalt::CobaltMainDelegate();
+      g_content_main_delegate =
+          new cobalt::CobaltMainDelegate(false /* is_content_browsertests */,
+                                         event->type == kSbEventTypeStart);
       g_platform_event_source = new PlatformEventSourceStarboard();
       InitCobalt(data->argument_count,
                  const_cast<const char**>(data->argument_values), data->link);
@@ -160,7 +150,10 @@ void SbEventHandle(const SbEvent* event) {
       g_platform_event_source->HandleFocusEvent(event);
       break;
     case kSbEventTypeConceal:
+      break;
     case kSbEventTypeReveal:
+      content::Shell::OnReveal();
+      break;
     case kSbEventTypeFreeze:
     case kSbEventTypeUnfreeze:
       break;

cobalt/app/cobalt_main_delegate.cc

@@ -30,11 +30,12 @@
 
 namespace cobalt {
 
-CobaltMainDelegate::CobaltMainDelegate(bool is_content_browsertests)
-    : content::ShellMainDelegate(is_content_browsertests) {}
+CobaltMainDelegate::CobaltMainDelegate(bool is_content_browsertests,
+                                       bool is_visible)
+    : content::ShellMainDelegate(is_content_browsertests),
+      is_visible_(is_visible) {}
 
 CobaltMainDelegate::~CobaltMainDelegate() {}
-
 absl::optional<int> CobaltMainDelegate::BasicStartupComplete() {
   base::CommandLine* cl = base::CommandLine::ForCurrentProcess();
   cl->AppendSwitch(switches::kEnableAggressiveDOMStorageFlushing);
@@ -45,7 +46,7 @@ absl::optional<int> CobaltMainDelegate::BasicStartupComplete() {
 
 content::ContentBrowserClient*
 CobaltMainDelegate::CreateContentBrowserClient() {
-  browser_client_ = std::make_unique<CobaltContentBrowserClient>();
+  browser_client_ = std::make_unique<CobaltContentBrowserClient>(is_visible_);
   return browser_client_.get();
 }
 

cobalt/app/cobalt_main_delegate.h

@@ -28,7 +28,8 @@ namespace cobalt {
 
 class CobaltMainDelegate : public content::ShellMainDelegate {
  public:
-  explicit CobaltMainDelegate(bool is_content_browsertests = false);
+  explicit CobaltMainDelegate(bool is_content_browsertests = false,
+                              bool is_visible = true);
 
   CobaltMainDelegate(const CobaltMainDelegate&) = delete;
   CobaltMainDelegate& operator=(const CobaltMainDelegate&) = delete;
@@ -54,6 +55,7 @@ class CobaltMainDelegate : public content::ShellMainDelegate {
   ~CobaltMainDelegate() override;
 
  private:
+  bool is_visible_;
   std::unique_ptr<content::BrowserMainRunner> main_runner_;
   std::unique_ptr<CobaltContentBrowserClient> browser_client_;
   std::unique_ptr<CobaltContentGpuClient> gpu_client_;

cobalt/browser/BUILD.gn

@@ -143,6 +143,8 @@ source_set("metrics") {
   sources = [
     "metrics/cobalt_enabled_state_provider.cc",
     "metrics/cobalt_enabled_state_provider.h",
+    "metrics/cobalt_memory_metrics_emitter.cc",
+    "metrics/cobalt_memory_metrics_emitter.h",
     "metrics/cobalt_metrics_log_uploader.cc",
     "metrics/cobalt_metrics_log_uploader.h",
     "metrics/cobalt_metrics_service_client.cc",

cobalt/browser/cobalt_browser_main_parts.cc

@@ -38,6 +38,9 @@
 
 namespace cobalt {
 
+CobaltBrowserMainParts::CobaltBrowserMainParts(bool is_visible)
+    : ShellBrowserMainParts(is_visible) {}
+
 int CobaltBrowserMainParts::PreCreateThreads() {
   SetupMetrics();
 #if BUILDFLAG(IS_ANDROIDTV)

cobalt/browser/cobalt_browser_main_parts.h

@@ -41,7 +41,7 @@ class GlobalFeatures;
 // ShellContentBrowserClient, this should implement BrowserMainParts.
 class CobaltBrowserMainParts : public content::ShellBrowserMainParts {
  public:
-  CobaltBrowserMainParts() = default;
+  explicit CobaltBrowserMainParts(bool is_visible = true);
 
   CobaltBrowserMainParts(const CobaltBrowserMainParts&) = delete;
   CobaltBrowserMainParts& operator=(const CobaltBrowserMainParts&) = delete;

cobalt/browser/cobalt_content_browser_client.cc

@@ -155,8 +155,9 @@ blink::UserAgentMetadata GetCobaltUserAgentMetadata() {
   return metadata;
 }
 
-CobaltContentBrowserClient::CobaltContentBrowserClient()
-    : video_geometry_setter_service_(
+CobaltContentBrowserClient::CobaltContentBrowserClient(bool is_visible)
+    : is_visible_(is_visible),
+      video_geometry_setter_service_(
           std::unique_ptr<cobalt::media::VideoGeometrySetterService,
                           base::OnTaskRunnerDeleter>(
               nullptr,
@@ -186,7 +187,8 @@ std::unique_ptr<content::BrowserMainParts>
 CobaltContentBrowserClient::CreateBrowserMainParts(
     bool /* is_integration_test */) {
   DCHECK_CALLED_ON_VALID_THREAD(thread_checker_);
-  auto browser_main_parts = std::make_unique<CobaltBrowserMainParts>();
+  auto browser_main_parts =
+      std::make_unique<CobaltBrowserMainParts>(is_visible_);
   set_browser_main_parts(browser_main_parts.get());
   return browser_main_parts;
 }

cobalt/browser/cobalt_content_browser_client.h

@@ -62,7 +62,7 @@ class CobaltWebContentsObserver;
 // a demo around Content.
 class CobaltContentBrowserClient : public content::ShellContentBrowserClient {
  public:
-  CobaltContentBrowserClient();
+  explicit CobaltContentBrowserClient(bool is_visible = true);
 
   CobaltContentBrowserClient(const CobaltContentBrowserClient&) = delete;
   CobaltContentBrowserClient& operator=(const CobaltContentBrowserClient&) =
@@ -147,6 +147,7 @@ class CobaltContentBrowserClient : public content::ShellContentBrowserClient {
   void CreateVideoGeometrySetterService();
   void OnSbWindowCreated(SbWindow window);
 
+  bool is_visible_;
   std::unique_ptr<CobaltWebContentsObserver> web_contents_observer_;
   std::unique_ptr<media::VideoGeometrySetterService, base::OnTaskRunnerDeleter>
       video_geometry_setter_service_;