Merge pull request #903 from brave/magnet_url

Load magnet url instead of searching
brave · Nov 20, 2018 · d2c5737 · d2c5737
2 parents 485d0c3 + bf794ea
commit d2c5737
Show file tree

Hide file tree

Showing 8 changed files with 83 additions and 11 deletions.
diff --git a/browser/BUILD.gn b/browser/BUILD.gn
@@ -62,6 +62,7 @@ source_set("browser_process") {
     "//brave/components/brave_rewards/browser",
     "//brave/components/brave_shields/browser:brave_shields",
     "//brave/components/brave_sync",
+    "//brave/components/brave_webtorrent/browser",
     "//brave/components/content_settings/core/browser",
     "//chrome/common",
     "//components/component_updater",
@@ -110,6 +111,7 @@ source_set("browser") {
     "//base",
     "//brave/components/brave_referrals/browser",
     "//brave/components/brave_shields/browser:brave_shields",
+    "//brave/components/brave_webtorrent/browser",
     "//brave/components/resources",
     "//brave/browser/resources:brave_extension_grit",
     "//chrome/browser",

diff --git a/browser/autocomplete/brave_autocomplete_scheme_classifier.cc b/browser/autocomplete/brave_autocomplete_scheme_classifier.cc
@@ -6,12 +6,17 @@
 
 #include "base/strings/string_util.h"
 #include "brave/common/url_constants.h"
+#include "brave/components/brave_webtorrent/browser/webtorrent_util.h"
 #include "chrome/browser/profiles/profile.h"
 
 // See the BraveAutocompleteProviderClient why GetOriginalProfile() is fetched.
+// All services except TemplateURLService exposed from AutocompleteClassifier
+// uses original profile. So, |profile_| should be original profile same as
+// base class does.
 BraveAutocompleteSchemeClassifier::BraveAutocompleteSchemeClassifier(
     Profile* profile)
-    : ChromeAutocompleteSchemeClassifier(profile->GetOriginalProfile()) {
+    : ChromeAutocompleteSchemeClassifier(profile->GetOriginalProfile()),
+      profile_(profile->GetOriginalProfile()) {
 }
 
 BraveAutocompleteSchemeClassifier::~BraveAutocompleteSchemeClassifier() {
@@ -25,7 +30,9 @@ BraveAutocompleteSchemeClassifier::GetInputTypeForScheme(
     return metrics::OmniboxInputType::INVALID;
   }
   if (base::IsStringASCII(scheme) &&
-       base::LowerCaseEqualsASCII(scheme, kBraveUIScheme)) {
+      (base::LowerCaseEqualsASCII(scheme, kBraveUIScheme) ||
+       (webtorrent::IsWebtorrentEnabled(profile_) &&
+        base::LowerCaseEqualsASCII(scheme, kMagnetScheme)))) {
     return metrics::OmniboxInputType::URL;
   }
 

diff --git a/browser/autocomplete/brave_autocomplete_scheme_classifier.h b/browser/autocomplete/brave_autocomplete_scheme_classifier.h
@@ -16,6 +16,8 @@ class BraveAutocompleteSchemeClassifier : public ChromeAutocompleteSchemeClassif
       const std::string& scheme) const override;
 
  private:
+  Profile* profile_;
+
   DISALLOW_COPY_AND_ASSIGN(BraveAutocompleteSchemeClassifier);
 };
 

diff --git a/browser/brave_content_browser_client_browsertest.cc b/browser/brave_content_browser_client_browsertest.cc
@@ -11,12 +11,14 @@
 #include "brave/components/brave_rewards/browser/buildflags/buildflags.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/ui/browser.h"
+#include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/chrome_content_client.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/test/browser_test_utils.h"
+#include "content/public/test/test_navigation_observer.h"
 #include "extensions/browser/extension_registry.h"
 #include "extensions/browser/extension_system.h"
 #include "net/dns/mock_host_resolver.h"
@@ -140,6 +142,16 @@ IN_PROC_BROWSER_TEST_F(BraveContentBrowserClientTest, RewriteMagnetURLLink) {
       extension_url().spec().c_str()) << "Real URL should be extension URL";
 }
 
+IN_PROC_BROWSER_TEST_F(BraveContentBrowserClientTest, TypedMagnetURL) {
+  content::WebContents* web_contents =
+      browser()->tab_strip_model()->GetActiveWebContents();
+  content::TestNavigationObserver observer(web_contents);
+  LocationBar* location_bar = browser()->window()->GetLocationBar();
+  ui_test_utils::SendToOmniboxAndSubmit(location_bar, magnet_url().spec());
+  observer.Wait();
+  EXPECT_EQ(magnet_url(), web_contents->GetLastCommittedURL().spec());
+}
+
 IN_PROC_BROWSER_TEST_F(BraveContentBrowserClientTest, ReverseRewriteTorrentURL) {
   content::WebContents* contents = browser()->tab_strip_model()->GetActiveWebContents();
   ui_test_utils::NavigateToURL(browser(), torrent_extension_url());

diff --git a/components/brave_webtorrent/browser/BUILD.gn b/components/brave_webtorrent/browser/BUILD.gn
@@ -0,0 +1,16 @@
+source_set("browser") {
+  sources = [
+    "content_browser_client_helper.h",
+    "webtorrent_util.cc",
+    "webtorrent_util.h",
+  ]
+
+  deps = [
+    "//base",
+    "//brave/common",
+    "//content/public/browser",
+    "//extensions/browser",
+    "//extensions/common",
+    "//net",
+  ]
+}
diff --git a/components/brave_webtorrent/browser/content_browser_client_helper.h b/components/brave_webtorrent/browser/content_browser_client_helper.h
@@ -7,6 +7,7 @@
 #include "base/task/post_task.h"
 #include "brave/common/url_constants.h"
 #include "brave/common/extensions/extension_constants.h"
+#include "brave/components/brave_webtorrent/browser/webtorrent_util.h"
 #include "chrome/browser/external_protocol/external_protocol_handler.h"
 #include "content/public/browser/browser_task_traits.h"
 #include "content/public/browser/browser_thread.h"
@@ -52,15 +53,6 @@ static bool HandleTorrentURLReverseRewrite(GURL* url,
   return false;
 }
 
-static bool IsWebtorrentEnabled(content::BrowserContext* browser_context) {
-  bool isTorProfile =
-    Profile::FromBrowserContext(browser_context)->IsTorProfile();
-  extensions::ExtensionRegistry* registry =
-    extensions::ExtensionRegistry::Get(browser_context);
-  return !isTorProfile &&
-    registry->enabled_extensions().Contains(brave_webtorrent_extension_id);
-}
-
 static bool HandleTorrentURLRewrite(GURL* url,
     content::BrowserContext* browser_context) {
   if (!IsWebtorrentEnabled(browser_context)) return false;

diff --git a/components/brave_webtorrent/browser/webtorrent_util.cc b/components/brave_webtorrent/browser/webtorrent_util.cc
@@ -0,0 +1,23 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#include "brave/components/brave_webtorrent/browser/webtorrent_util.h"
+
+#include "brave/common/extensions/extension_constants.h"
+#include "chrome/browser/profiles/profile.h"
+#include "extensions/browser/extension_registry.h"
+
+namespace webtorrent {
+
+bool IsWebtorrentEnabled(content::BrowserContext* browser_context) {
+  bool isTorProfile =
+    Profile::FromBrowserContext(browser_context)->IsTorProfile();
+  extensions::ExtensionRegistry* registry =
+    extensions::ExtensionRegistry::Get(browser_context);
+  return !isTorProfile &&
+    registry->enabled_extensions().Contains(brave_webtorrent_extension_id);
+}
+
+}  // webtorrent
+
diff --git a/components/brave_webtorrent/browser/webtorrent_util.h b/components/brave_webtorrent/browser/webtorrent_util.h
@@ -0,0 +1,18 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#ifndef BRAVE_COMPONENTS_BRAVE_WEBTORRENT_BROWSER_WEBTORRENT_UTIL_H_
+#define BRAVE_COMPONENTS_BRAVE_WEBTORRENT_BROWSER_WEBTORRENT_UTIL_H_
+
+namespace content {
+class BrowserContext;
+}
+
+namespace webtorrent {
+
+bool IsWebtorrentEnabled(content::BrowserContext* browser_context);
+
+}  // webtorrent
+
+#endif  // BRAVE_COMPONENTS_BRAVE_WEBTORRENT_BROWSER_WEBTORRENT_UTIL_H_