Adding SSL ETS Tests

chrome/browser/ui/website_settings/permission_bubble_manager_browsertest.cc

 // Copyright 2015 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 "chrome/browser/ui/website_settings/permission_bubble_manager.h"
 
 #include "base/command_line.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/browser/ui/website_settings/mock_permission_bubble_view.h"
@@ skipping 34 matching lines @@
 
 // Requests before the load event should be bundled into one bubble.
 // http://crbug.com/512849 flaky
 #if defined(OS_WIN)
 #define MAYBE_RequestsBeforeLoad DISABLED_RequestsBeforeLoad
 #else
 #define MAYBE_RequestsBeforeLoad RequestsBeforeLoad
 #endif
 IN_PROC_BROWSER_TEST_F(PermissionBubbleManagerBrowserTest,
                        MAYBE_RequestsBeforeLoad) {
-  ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
+  ASSERT_TRUE(embedded_test_server()->Start());
 
   ui_test_utils::NavigateToURLBlockUntilNavigationsComplete(
       browser(),
       embedded_test_server()->GetURL("/permissions/requests-before-load.html"),
       1);
   WaitForPermissionBubble();
 
   EXPECT_EQ(1, bubble_view()->show_count());
   EXPECT_EQ(2, bubble_view()->requests_count());
 }
 
 // Requests before the load should not be bundled with a request after the load.
 IN_PROC_BROWSER_TEST_F(PermissionBubbleManagerBrowserTest,
                        RequestsBeforeAfterLoad) {
-  ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
+  ASSERT_TRUE(embedded_test_server()->Start());
 
   ui_test_utils::NavigateToURLBlockUntilNavigationsComplete(
       browser(),
       embedded_test_server()->GetURL(
           "/permissions/requests-before-after-load.html"),
       1);
   WaitForPermissionBubble();
 
   EXPECT_EQ(1, bubble_view()->show_count());
   EXPECT_EQ(1, bubble_view()->requests_count());
 }
 
 // Navigating twice to the same URL should be equivalent to refresh. This means
 // showing the bubbles twice.
 // http://crbug.com/512849 flaky
 #if defined(OS_WIN)
 #define MAYBE_NavTwice DISABLED_NavTwice
 #else
 #define MAYBE_NavTwice NavTwice
 #endif
 IN_PROC_BROWSER_TEST_F(PermissionBubbleManagerBrowserTest, MAYBE_NavTwice) {
-  ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
+  ASSERT_TRUE(embedded_test_server()->Start());
 
   ui_test_utils::NavigateToURLBlockUntilNavigationsComplete(
       browser(),
       embedded_test_server()->GetURL("/permissions/requests-before-load.html"),
       1);
   WaitForPermissionBubble();
 
   ui_test_utils::NavigateToURLBlockUntilNavigationsComplete(
       browser(),
       embedded_test_server()->GetURL("/permissions/requests-before-load.html"),
       1);
   WaitForPermissionBubble();
 
   EXPECT_EQ(2, bubble_view()->show_count());
   EXPECT_EQ(4, bubble_view()->requests_count());
 }
 
 // Navigating twice to the same URL with a hash should be navigation within the
 // page. This means the bubble is only shown once.
 // http://crbug.com/512849 flaky
 #if defined(OS_WIN)
 #define MAYBE_NavTwiceWithHash DISABLED_NavTwiceWithHash
 #else
 #define MAYBE_NavTwiceWithHash NavTwiceWithHash
 #endif
 IN_PROC_BROWSER_TEST_F(PermissionBubbleManagerBrowserTest,
                        MAYBE_NavTwiceWithHash) {
-  ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
+  ASSERT_TRUE(embedded_test_server()->Start());
 
   ui_test_utils::NavigateToURLBlockUntilNavigationsComplete(
       browser(),
       embedded_test_server()->GetURL("/permissions/requests-before-load.html"),
       1);
   WaitForPermissionBubble();
 
   ui_test_utils::NavigateToURLBlockUntilNavigationsComplete(
       browser(),
       embedded_test_server()->GetURL(
           "/permissions/requests-before-load.html#0"),
       1);
   WaitForPermissionBubble();
 
   EXPECT_EQ(1, bubble_view()->show_count());
   EXPECT_EQ(2, bubble_view()->requests_count());
 }
 
 // Bubble requests should be shown after in-page navigation.
 IN_PROC_BROWSER_TEST_F(PermissionBubbleManagerBrowserTest, InPageNavigation) {
-  ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
+  ASSERT_TRUE(embedded_test_server()->Start());
 
   ui_test_utils::NavigateToURLBlockUntilNavigationsComplete(
       browser(),
       embedded_test_server()->GetURL("/empty.html"),
       1);
 
   ui_test_utils::NavigateToURLBlockUntilNavigationsComplete(
       browser(),
       embedded_test_server()->GetURL("/empty.html#0"),
       1);
 
   // Request 'geolocation' permission.
   ExecuteScriptAndGetValue(
       browser()->tab_strip_model()->GetActiveWebContents()->GetMainFrame(),
       "navigator.geolocation.getCurrentPosition(function(){});");
   WaitForPermissionBubble();
 
   EXPECT_EQ(1, bubble_view()->show_count());
   EXPECT_EQ(1, bubble_view()->requests_count());
 }
 
 }  // anonymous namespace