[MD Bookmarks] Enable by default.

chrome/browser/ui/webui/bookmarks_ui_browsertest.cc

Index: chrome/browser/ui/webui/bookmarks_ui_browsertest.cc
diff --git a/chrome/browser/ui/webui/bookmarks_ui_browsertest.cc b/chrome/browser/ui/webui/bookmarks_ui_browsertest.cc
index c2440d846f8f51e8e43dcf5929d7a62fca5b7e98..722ef83a7f5fb140c3e24766a52268949ebf1e58 100644
--- a/chrome/browser/ui/webui/bookmarks_ui_browsertest.cc
+++ b/chrome/browser/ui/webui/bookmarks_ui_browsertest.cc
@@ -7,6 +7,7 @@
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/chrome_pages.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
+#include "chrome/browser/ui/webui/md_bookmarks/md_bookmarks_ui.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/ui_test_utils.h"
@@ -55,11 +56,17 @@ class BookmarksTest : public InProcessBrowserTest {
 };
 
 IN_PROC_BROWSER_TEST_F(BookmarksTest, ShouldRedirectToExtension) {
+  if (MdBookmarksUI::IsEnabled())

[tsergeant, 2017/06/15 07:23:44]

Can these tests remain enabled for MD Bookmarks? They all seem to do things we
still care about, and you would maybe just need to change
AssertIsBookmarksPage() to get them working again.

[calamity, 2017/06/19 06:00:29]

Done.

This test in particular has been deleted because it's a subset of
BookmarksLoaded.

+    return;
+
   ui_test_utils::NavigateToURL(browser(), GURL(chrome::kChromeUIBookmarksURL));
   AssertIsBookmarksPage(browser()->tab_strip_model()->GetActiveWebContents());
 }
 
 IN_PROC_BROWSER_TEST_F(BookmarksTest, CommandOpensBookmarksTab) {
+  if (MdBookmarksUI::IsEnabled())
+    return;
+
   ASSERT_EQ(1, browser()->tab_strip_model()->count());
 
   // Bring up the bookmarks manager tab.
@@ -79,6 +86,9 @@ IN_PROC_BROWSER_TEST_F(BookmarksTest, CommandOpensBookmarksTab) {
 
 IN_PROC_BROWSER_TEST_F(BookmarksTest,
                        MAYBE_CommandAgainGoesBackToBookmarksTab) {
+  if (MdBookmarksUI::IsEnabled())
+    return;
+
   ui_test_utils::NavigateToURL(
       browser(),
       ui_test_utils::GetTestUrl(base::FilePath(),
@@ -111,6 +121,9 @@ IN_PROC_BROWSER_TEST_F(BookmarksTest, TwoCommandsOneTab) {
 }
 
 IN_PROC_BROWSER_TEST_F(BookmarksTest, BookmarksLoaded) {
+  if (MdBookmarksUI::IsEnabled())
+    return;
+
   ui_test_utils::NavigateToURL(browser(), GURL(chrome::kChromeUIBookmarksURL));
   ASSERT_EQ(1, browser()->tab_strip_model()->count());
   AssertIsBookmarksPage(browser()->tab_strip_model()->GetActiveWebContents());