GTTF: convert some tests in chrome to use EmbeddedTestServer patch nr 1

chrome/browser/ui/gtk/bookmarks/bookmark_bar_gtk_interactive_uitest.cc

Index: chrome/browser/ui/gtk/bookmarks/bookmark_bar_gtk_interactive_uitest.cc
diff --git a/chrome/browser/ui/gtk/bookmarks/bookmark_bar_gtk_interactive_uitest.cc b/chrome/browser/ui/gtk/bookmarks/bookmark_bar_gtk_interactive_uitest.cc
index fe0922d8d3428c5abb9bd187d6f8ea04d8e4f871..cca8aa32cdbd4c80f6703a3a1a24d15df892f197 100644
--- a/chrome/browser/ui/gtk/bookmarks/bookmark_bar_gtk_interactive_uitest.cc
+++ b/chrome/browser/ui/gtk/bookmarks/bookmark_bar_gtk_interactive_uitest.cc
@@ -13,11 +13,11 @@
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/interactive_test_utils.h"
 #include "chrome/test/base/ui_test_utils.h"
-#include "net/test/spawned_test_server/spawned_test_server.h"
+#include "net/test/embedded_test_server/embedded_test_server.h"
 
 namespace {
 
-const char kSimplePage[] = "404_is_enough_for_us.html";
+const char kSimplePage[] = "/404_is_enough_for_us.html";
 
 void OnClicked(GtkWidget* widget, bool* clicked_bit) {
   *clicked_bit = true;
@@ -31,14 +31,14 @@ class BookmarkBarGtkInteractiveUITest : public InProcessBrowserTest {
 // Makes sure that when you switch back to an NTP with an active findbar,
 // the findbar is above the floating bookmark bar.
 IN_PROC_BROWSER_TEST_F(BookmarkBarGtkInteractiveUITest, FindBarTest) {
-  ASSERT_TRUE(test_server()->Start());
+  ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
 
   // Create new tab; open findbar.
   chrome::NewTab(browser());
   chrome::Find(browser());
 
   // Create new tab with an arbitrary URL.
-  GURL url = test_server()->GetURL(kSimplePage);
+  GURL url = embedded_test_server()->GetURL(kSimplePage);
   chrome::AddSelectedTabWithURL(browser(), url, content::PAGE_TRANSITION_TYPED);
 
   // Switch back to the NTP with the active findbar.
@@ -58,7 +58,7 @@ IN_PROC_BROWSER_TEST_F(BookmarkBarGtkInteractiveUITest, FindBarTest) {
 // Disabled due to http://crbug.com/88933.
 IN_PROC_BROWSER_TEST_F(
     BookmarkBarGtkInteractiveUITest, DISABLED_ClickOnFloatingTest) {
-  ASSERT_TRUE(test_server()->Start());
+  ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
 
   GtkWidget* other_bookmarks =
       ViewIDUtil::GetWidget(GTK_WIDGET(browser()->window()->GetNativeWindow()),