Merge pull request #4032 from brave/fix-6637

Preventing Crypto Wallets from opening in private windows
brave · Nov 23, 2019 · b60900a · b60900a
2 parents 7860869 + 3b7f88f
commit b60900a
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 3 deletions.
diff --git a/browser/brave_scheme_load_browsertest.cc b/browser/brave_scheme_load_browsertest.cc
@@ -39,7 +39,7 @@ class BraveSchemeLoadBrowserTest : public InProcessBrowserTest,
       const TabStripModelChange& change,
       const TabStripSelectionChange& selection) override {
     if (change.type() == TabStripModelChange::kInserted) {
-      WaitForLoadStop(active_contents());
+      quit_closure_.Run();
     }
   }
 
@@ -69,23 +69,29 @@ class BraveSchemeLoadBrowserTest : public InProcessBrowserTest,
 
     browser()->tab_strip_model()->AddObserver(this);
 
+    base::RunLoop run_loop;
+    quit_closure_ = run_loop.QuitClosure();
+
     // Load url to private window.
     NavigateParams params(
         private_browser, GURL(url), ui::PAGE_TRANSITION_TYPED);
     Navigate(&params);
 
+    run_loop.Run();
+
     browser()->tab_strip_model()->RemoveObserver(this);
 
     EXPECT_STREQ(url.c_str(),
                  base::UTF16ToUTF8(browser()->location_bar_model()
                       ->GetFormattedFullURL()).c_str());
-    // EXPECT_EQ(url, active_contents()->GetVisibleURL());
     EXPECT_EQ(2, browser()->tab_strip_model()->count());
     // Private window stays as initial state.
     EXPECT_EQ("about:blank",
               private_model->GetActiveWebContents()->GetVisibleURL().spec());
     EXPECT_EQ(1, private_browser->tab_strip_model()->count());
   }
+
+  base::RepeatingClosure quit_closure_;
 };
 
 // Test whether brave page is not loaded from different host by window.open().
@@ -253,3 +259,8 @@ IN_PROC_BROWSER_TEST_F(BraveSchemeLoadBrowserTest,
                        RewardsPageIsNotAllowedInPrivateWindow) {
   TestURLIsNotLoadedInPrivateWindow("brave://rewards");
 }
+
+IN_PROC_BROWSER_TEST_F(BraveSchemeLoadBrowserTest,
+                       WalletPageIsNotAllowedInPrivateWindow) {
+  TestURLIsNotLoadedInPrivateWindow("brave://wallet");
+}
diff --git a/chromium_src/chrome/browser/ui/browser_navigator.cc b/chromium_src/chrome/browser/ui/browser_navigator.cc
@@ -53,7 +53,8 @@ void MaybeHandleInParent(NavigateParams* params, bool allow_in_incognito) {
 }
 
 bool IsHostAllowedInIncognitoBraveImpl(const base::StringPiece& host) {
-  if (host == kRewardsPageHost ||
+  if (host == kWalletHost ||
+      host == kRewardsPageHost ||
       host == kBraveUISyncHost ||
       host == chrome::kChromeUISyncInternalsHost) {
     return false;