[MD Bookmarks] Enable by default.

chrome/browser/ui/webui/bookmarks_ui_browsertest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/test/test_timeouts.h"
 #include "build/build_config.h"
 #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"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/test/browser_test_utils.h"
 #include "content/public/test/test_navigation_observer.h"
 
 class BookmarksTest : public InProcessBrowserTest {
  public:
@@ skipping 28 matching lines @@
     ASSERT_EQ("chrome-extension:", out);
     ASSERT_TRUE(content::ExecuteScriptAndExtractString(
         tab,
         "domAutomationController.send(location.pathname)",
         &out));
     ASSERT_EQ("/main.html", out);
   }
 };
 
 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.
   OpenBookmarksManager();
   ASSERT_EQ(1, browser()->tab_strip_model()->count());
   AssertIsBookmarksPage(browser()->tab_strip_model()->GetActiveWebContents());
 }
 
 // Flaky on Mac: https://crbug.com/524216
 #if defined(OS_MACOSX) || defined(OS_LINUX)
 #define MAYBE_CommandAgainGoesBackToBookmarksTab \
   DISABLED_CommandAgainGoesBackToBookmarksTab
 #else
 #define MAYBE_CommandAgainGoesBackToBookmarksTab \
   CommandAgainGoesBackToBookmarksTab
 #endif
 
 IN_PROC_BROWSER_TEST_F(BookmarksTest,
                        MAYBE_CommandAgainGoesBackToBookmarksTab) {
+  if (MdBookmarksUI::IsEnabled())
+    return;
+
   ui_test_utils::NavigateToURL(
       browser(),
       ui_test_utils::GetTestUrl(base::FilePath(),
                                 base::FilePath().AppendASCII("simple.html")));
   ASSERT_EQ(1, browser()->tab_strip_model()->count());
 
   // Bring up the bookmarks manager tab.
   OpenBookmarksManager();
   ASSERT_EQ(2, browser()->tab_strip_model()->count());
 
@@ skipping 12 matching lines @@
   content::TestNavigationObserver navigation_observer(
       browser()->tab_strip_model()->GetActiveWebContents());
   chrome::ShowBookmarkManager(browser());
   chrome::ShowBookmarkManager(browser());
   navigation_observer.Wait();
 
   ASSERT_EQ(1, browser()->tab_strip_model()->count());
 }
 
 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());
 }