Add support for chrome://net-export in WebLayer to debug network prob…

…lems. Also fix chrome:// URLs not working in weblayer_shell. Bug: 1254558 Change-Id: I3cc841afa0a7db5378bbf6c3f9dc173770ad34a0 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3195531 Auto-Submit: John Abd-El-Malek <jam@chromium.org> Reviewed-by: David Trainor <dtrainor@chromium.org> Reviewed-by: Matt Menke <mmenke@chromium.org> Reviewed-by: Scott Violet <sky@chromium.org> Commit-Queue: Matt Menke <mmenke@chromium.org> Cr-Commit-Position: refs/heads/main@{#927258}
Denger-Network · Oct 1, 2021 · 3b560b7 · 3b560b7
1 parent 6e965a0
commit 3b560b7
Show file tree

Hide file tree

Showing 20 changed files with 278 additions and 27 deletions.
diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
@@ -3708,7 +3708,6 @@ generate_jni("chrome_jni_headers") {
     "java/src/org/chromium/chrome/browser/ChromePowerModeVoter.java",
     "java/src/org/chromium/chrome/browser/DevToolsServer.java",
     "java/src/org/chromium/chrome/browser/IntentHandler.java",
-    "java/src/org/chromium/chrome/browser/IntentHelper.java",
     "java/src/org/chromium/chrome/browser/NearOomMonitor.java",
     "java/src/org/chromium/chrome/browser/PlayServicesVersionInfo.java",
     "java/src/org/chromium/chrome/browser/SearchGeolocationDisclosureTabHelper.java",

diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java_sources.gni
@@ -34,7 +34,6 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/DevToolsServer.java",
   "java/src/org/chromium/chrome/browser/FileProviderHelper.java",
   "java/src/org/chromium/chrome/browser/IntentHandler.java",
-  "java/src/org/chromium/chrome/browser/IntentHelper.java",
   "java/src/org/chromium/chrome/browser/KeyboardShortcuts.java",
   "java/src/org/chromium/chrome/browser/LaunchIntentDispatcher.java",
   "java/src/org/chromium/chrome/browser/LauncherShortcutActivity.java",

diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
@@ -2813,8 +2813,6 @@ static_library("browser") {
       "android/instantapps/instant_apps_settings.cc",
       "android/instantapps/instant_apps_settings.h",
       "android/intent_handler.cc",
-      "android/intent_helper.cc",
-      "android/intent_helper.h",
       "android/javascript/web_context_fetcher.cc",
       "android/locale/locale_manager.cc",
       "android/locale/locale_manager.h",
@@ -3370,6 +3368,7 @@ static_library("browser") {
       "//components/bookmarks/common/android",
       "//components/browser_ui/contacts_picker/android",
       "//components/browser_ui/photo_picker/android",
+      "//components/browser_ui/share/android",
       "//components/browser_ui/site_settings/android",
       "//components/browser_ui/sms/android",
       "//components/browser_ui/util/android",

diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn
@@ -843,6 +843,7 @@ static_library("ui") {
       "//chrome/browser/ui/webui/explore_sites_internals:mojo_bindings",
       "//chrome/browser/ui/webui/feed_internals:mojo_bindings",
       "//components/browser_ui/client_certificate/android",
+      "//components/browser_ui/share/android",
       "//components/browser_ui/util/android",
       "//components/embedder_support/android:context_menu",
       "//components/embedder_support/android:web_contents_delegate",

diff --git a/chrome/browser/ui/webui/DEPS b/chrome/browser/ui/webui/DEPS
@@ -2,6 +2,7 @@ include_rules = [
   "+ash/components/account_manager",
   "+ash/components/audio",
   "+ash/webui/os_feedback_ui",
+  "+components/browser_ui/share/android",
   "+components/services/app_service/public",
   "+device/bluetooth",
   "+extensions/strings/grit/extensions_strings.h",

diff --git a/chrome/browser/ui/webui/net_export_ui.cc b/chrome/browser/ui/webui/net_export_ui.cc
@@ -46,7 +46,7 @@
 #include "ui/shell_dialogs/select_file_dialog.h"
 
 #if defined(OS_ANDROID)
-#include "chrome/browser/android/intent_helper.h"
+#include "components/browser_ui/share/android/intent_helper.h"
 #endif
 
 using content::BrowserThread;
@@ -311,10 +311,9 @@ void NetExportMessageHandler::SendEmail(const base::FilePath& file_to_send) {
   std::string body =
       "Please add some informative text about the network issues.";
   base::FilePath::StringType file_to_attach(file_to_send.value());
-  chrome::android::SendEmail(
-      base::UTF8ToUTF16(email), base::UTF8ToUTF16(subject),
-      base::UTF8ToUTF16(body), base::UTF8ToUTF16(title),
-      base::UTF8ToUTF16(file_to_attach));
+  browser_ui::SendEmail(base::UTF8ToUTF16(email), base::UTF8ToUTF16(subject),
+                        base::UTF8ToUTF16(body), base::UTF8ToUTF16(title),
+                        base::UTF8ToUTF16(file_to_attach));
 #endif
 }
 

diff --git a/components/browser_ui/share/android/BUILD.gn b/components/browser_ui/share/android/BUILD.gn
@@ -4,6 +4,22 @@
 
 import("//build/config/android/rules.gni")
 
+source_set("android") {
+  sources = [
+    "intent_helper.cc",
+    "intent_helper.h",
+  ]
+  deps = [
+    ":jni_headers",
+    "//base",
+  ]
+}
+
+generate_jni("jni_headers") {
+  sources =
+      [ "java/src/org/chromium/components/browser_ui/share/IntentHelper.java" ]
+}
+
 # Constants only target without dependencies to allow embedders to only include relevant code.
 android_library("constants_java") {
   sources = [
@@ -14,6 +30,7 @@ android_library("constants_java") {
 android_library("java") {
   sources = [
     "java/src/org/chromium/components/browser_ui/share/ClipboardImageFileProvider.java",
+    "java/src/org/chromium/components/browser_ui/share/IntentHelper.java",
     "java/src/org/chromium/components/browser_ui/share/ShareDialogAdapter.java",
     "java/src/org/chromium/components/browser_ui/share/ShareHelper.java",
     "java/src/org/chromium/components/browser_ui/share/ShareImageFileUtils.java",

diff --git a/chrome/browser/android/intent_helper.cc → ...browser_ui/share/android/intent_helper.cc b/chrome/browser/android/intent_helper.cc → ...browser_ui/share/android/intent_helper.cc
@@ -2,21 +2,20 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/android/intent_helper.h"
+#include "components/browser_ui/share/android/intent_helper.h"
 
 #include <jni.h>
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
 #include "base/android/scoped_java_ref.h"
-#include "chrome/android/chrome_jni_headers/IntentHelper_jni.h"
+#include "components/browser_ui/share/android/jni_headers/IntentHelper_jni.h"
 
 using base::android::AttachCurrentThread;
 using base::android::ConvertUTF16ToJavaString;
 using base::android::ScopedJavaLocalRef;
 
-namespace chrome {
-namespace android {
+namespace browser_ui {
 
 void SendEmail(const std::u16string& d_email,
                const std::u16string& d_subject,
@@ -36,5 +35,4 @@ void SendEmail(const std::u16string& d_email,
                               j_file_to_attach);
 }
 
-}  // namespace android
-}  // namespace chrome
+}  // namespace browser_ui
diff --git a/chrome/browser/android/intent_helper.h → .../browser_ui/share/android/intent_helper.h b/chrome/browser/android/intent_helper.h → .../browser_ui/share/android/intent_helper.h
@@ -2,16 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_ANDROID_INTENT_HELPER_H_
-#define CHROME_BROWSER_ANDROID_INTENT_HELPER_H_
+#ifndef COMPONENTS_BROWSER_UI_SHARE_ANDROID_INTENT_HELPER_H_
+#define COMPONENTS_BROWSER_UI_SHARE_ANDROID_INTENT_HELPER_H_
 
 #include <jni.h>
 
 #include <string>
 
-
-namespace chrome {
-namespace android {
+namespace browser_ui {
 
 // Triggers a send email intent.
 void SendEmail(const std::u16string& data_email,
@@ -20,7 +18,6 @@ void SendEmail(const std::u16string& data_email,
                const std::u16string& data_chooser_title,
                const std::u16string& data_file_to_attach);
 
-}  // namespace android
-}  // namespace chrome
+}  // namespace browser_ui
 
-#endif  // CHROME_BROWSER_ANDROID_INTENT_HELPER_H_
+#endif  // COMPONENTS_BROWSER_UI_SHARE_ANDROID_INTENT_HELPER_H_
diff --git a/...chromium/chrome/browser/IntentHelper.java → ...onents/browser_ui/share/IntentHelper.java b/...chromium/chrome/browser/IntentHelper.java → ...onents/browser_ui/share/IntentHelper.java
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-package org.chromium.chrome.browser;
+package org.chromium.components.browser_ui.share;
 
 import android.content.Intent;
 import android.net.Uri;
@@ -19,7 +19,6 @@
  * Helper for issuing intents to the android framework.
  */
 public abstract class IntentHelper {
-
     private IntentHelper() {}
 
     /**
@@ -37,7 +36,7 @@ static void sendEmail(
             String email, String subject, String body, String chooserTitle, String fileToAttach) {
         Intent send = new Intent(Intent.ACTION_SEND);
         send.setType("message/rfc822");
-        if (!TextUtils.isEmpty(email)) send.putExtra(Intent.EXTRA_EMAIL, new String[] { email });
+        if (!TextUtils.isEmpty(email)) send.putExtra(Intent.EXTRA_EMAIL, new String[] {email});
         send.putExtra(Intent.EXTRA_SUBJECT, subject);
         send.putExtra(Intent.EXTRA_TEXT, Html.fromHtml(body));
         if (!TextUtils.isEmpty(fileToAttach)) {

diff --git a/weblayer/BUILD.gn b/weblayer/BUILD.gn
@@ -327,6 +327,8 @@ source_set("weblayer_lib_base") {
     "browser/weblayer_speech_recognition_manager_delegate.h",
     "browser/weblayer_variations_service_client.cc",
     "browser/weblayer_variations_service_client.h",
+    "browser/webui/net_export_ui.cc",
+    "browser/webui/net_export_ui.h",
     "browser/webui/web_ui_controller_factory.cc",
     "browser/webui/web_ui_controller_factory.h",
     "browser/webui/weblayer_internals_ui.cc",
@@ -440,6 +442,7 @@ source_set("weblayer_lib_base") {
     "//components/language/core/browser",
     "//components/leveldb_proto",
     "//components/metrics",
+    "//components/net_log",
     "//components/network_time",
     "//components/no_state_prefetch/browser",
     "//components/no_state_prefetch/common",
@@ -704,6 +707,7 @@ source_set("weblayer_lib_base") {
       "//components/browser_ui/client_certificate/android",
       "//components/browser_ui/contacts_picker/android",
       "//components/browser_ui/photo_picker/android",
+      "//components/browser_ui/share/android",
       "//components/browser_ui/site_settings/android",
       "//components/browser_ui/sms/android",
       "//components/cdm/browser",

diff --git a/weblayer/browser/DEPS b/weblayer/browser/DEPS
@@ -46,6 +46,7 @@ include_rules = [
   "+components/media_router",
   "+components/metrics",
   "+components/navigation_interception",
+  "+components/net_log",
   "+components/network_session_configurator",
   "+components/network_time",
   "+components/page_load_metrics/browser",

diff --git a/weblayer/browser/system_network_context_manager.cc b/weblayer/browser/system_network_context_manager.cc
@@ -6,6 +6,7 @@
 
 #include "build/build_config.h"
 #include "build/chromeos_buildflags.h"
+#include "components/net_log/net_export_file_writer.h"
 #include "components/variations/net/variations_http_headers.h"
 #include "content/public/browser/network_service_instance.h"
 #include "services/cert_verifier/public/mojom/cert_verifier_service_factory.mojom.h"
@@ -129,4 +130,12 @@ SystemNetworkContextManager::GetSharedURLLoaderFactory() {
   return shared_url_loader_factory_;
 }
 
+net_log::NetExportFileWriter*
+SystemNetworkContextManager::GetNetExportFileWriter() {
+  if (!net_export_file_writer_) {
+    net_export_file_writer_ = std::make_unique<net_log::NetExportFileWriter>();
+  }
+  return net_export_file_writer_.get();
+}
+
 }  // namespace weblayer
diff --git a/weblayer/browser/system_network_context_manager.h b/weblayer/browser/system_network_context_manager.h
@@ -15,6 +15,10 @@ namespace network {
 class SharedURLLoaderFactory;
 }  // namespace network
 
+namespace net_log {
+class NetExportFileWriter;
+}
+
 namespace weblayer {
 
 // Manages a system-wide network context that's not tied to a profile.
@@ -63,6 +67,11 @@ class SystemNetworkContextManager {
   // network service crashes.
   scoped_refptr<network::SharedURLLoaderFactory> GetSharedURLLoaderFactory();
 
+  // Returns a shared global NetExportFileWriter instance, used by net-export.
+  // It lives here so it can outlive chrome://net-export/ if the tab is closed
+  // or destroyed, and so that it's destroyed before Mojo is shut down.
+  net_log::NetExportFileWriter* GetNetExportFileWriter();
+
  private:
   explicit SystemNetworkContextManager(const std::string& user_agent);
 
@@ -76,6 +85,9 @@ class SystemNetworkContextManager {
       shared_url_loader_factory_;
 
   mojo::Remote<network::mojom::NetworkContext> system_network_context_;
+
+  // Initialized on first access.
+  std::unique_ptr<net_log::NetExportFileWriter> net_export_file_writer_;
 };
 
 }  // namespace weblayer