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

chrome/browser/extensions/ad_view_browsertest.cc

Index: chrome/browser/extensions/ad_view_browsertest.cc
diff --git a/chrome/browser/extensions/ad_view_browsertest.cc b/chrome/browser/extensions/ad_view_browsertest.cc
index 7f1ed5071bc324dac93841da17d5da05345059c2..efcc775ae3df1b8f3f3d581f6cb4c6d11defeeef 100644
--- a/chrome/browser/extensions/ad_view_browsertest.cc
+++ b/chrome/browser/extensions/ad_view_browsertest.cc
@@ -26,7 +26,7 @@ class AdViewTest : public extensions::PlatformAppBrowserTest {
 #define MAYBE_LoadCommitEventIsCalled LoadCommitEventIsCalled
 #endif
 IN_PROC_BROWSER_TEST_F(AdViewTest, MAYBE_LoadCommitEventIsCalled) {
-  ASSERT_TRUE(StartTestServer());
+  ASSERT_TRUE(StartEmbeddedTestServer());
 
   ASSERT_TRUE(RunPlatformAppTest(
       "platform_apps/ad_view/loadcommit_event")) << message_;
@@ -35,7 +35,7 @@ IN_PROC_BROWSER_TEST_F(AdViewTest, MAYBE_LoadCommitEventIsCalled) {
 // This test checks the "loadabort" event is called when the "src" attribute
 // of an <adview> is an invalid URL.
 IN_PROC_BROWSER_TEST_F(AdViewTest, LoadAbortEventIsCalled) {
-  ASSERT_TRUE(StartTestServer());
+  ASSERT_TRUE(StartEmbeddedTestServer());
 
   ASSERT_TRUE(RunPlatformAppTest(
       "platform_apps/ad_view/loadabort_event")) << message_;
@@ -51,7 +51,7 @@ IN_PROC_BROWSER_TEST_F(AdViewTest, LoadAbortEventIsCalled) {
 #define MAYBE_CommitMessageFromAdNetwork CommitMessageFromAdNetwork
 #endif
 IN_PROC_BROWSER_TEST_F(AdViewTest, MAYBE_CommitMessageFromAdNetwork) {
-  ASSERT_TRUE(StartTestServer());
+  ASSERT_TRUE(StartEmbeddedTestServer());
 
   ASSERT_TRUE(RunPlatformAppTest(
       "platform_apps/ad_view/onloadcommit_ack")) << message_;
@@ -63,7 +63,7 @@ IN_PROC_BROWSER_TEST_F(AdViewTest, MAYBE_CommitMessageFromAdNetwork) {
 //       file (image035.png) which the trybots don't process correctly when
 //       first checked-in.
 IN_PROC_BROWSER_TEST_F(AdViewTest, DISABLED_DisplayFirstAd) {
-  ASSERT_TRUE(StartTestServer());
+  ASSERT_TRUE(StartEmbeddedTestServer());
 
   ASSERT_TRUE(RunPlatformAppTest(
       "platform_apps/ad_view/display_first_ad")) << message_;
@@ -72,7 +72,7 @@ IN_PROC_BROWSER_TEST_F(AdViewTest, DISABLED_DisplayFirstAd) {
 // This test checks that <adview> attributes are also exposed as properties
 // (with the same name and value).
 IN_PROC_BROWSER_TEST_F(AdViewTest, PropertiesAreInSyncWithAttributes) {
-  ASSERT_TRUE(StartTestServer());
+  ASSERT_TRUE(StartEmbeddedTestServer());
 
   ASSERT_TRUE(RunPlatformAppTest(
       "platform_apps/ad_view/properties_exposed")) << message_;
@@ -81,7 +81,7 @@ IN_PROC_BROWSER_TEST_F(AdViewTest, PropertiesAreInSyncWithAttributes) {
 // This test checks an <adview> element has no behavior when the "adview"
 // permission is missing from the application manifest.
 IN_PROC_BROWSER_TEST_F(AdViewTest, AdViewPermissionIsRequired) {
-  ASSERT_TRUE(StartTestServer());
+  ASSERT_TRUE(StartEmbeddedTestServer());
 
   ASSERT_TRUE(RunPlatformAppTest(
       "platform_apps/ad_view/permission_required")) << message_;
@@ -97,7 +97,7 @@ IN_PROC_BROWSER_TEST_F(AdViewTest, AdViewPermissionIsRequired) {
 #define MAYBE_ChangeAdNetworkValue ChangeAdNetworkValue
 #endif
 IN_PROC_BROWSER_TEST_F(AdViewTest, ChangeAdNetworkValue) {
-  ASSERT_TRUE(StartTestServer());
+  ASSERT_TRUE(StartEmbeddedTestServer());
 
   ASSERT_TRUE(RunPlatformAppTest(
       "platform_apps/ad_view/change_ad_network")) << message_;
@@ -115,7 +115,7 @@ class AdViewNoSrcTest : public extensions::PlatformAppBrowserTest {
 // This test checks an invalid "ad-network" value (i.e. not whitelisted)
 // is ignored.
 IN_PROC_BROWSER_TEST_F(AdViewNoSrcTest, InvalidAdNetworkIsIgnored) {
-  ASSERT_TRUE(StartTestServer());
+  ASSERT_TRUE(StartEmbeddedTestServer());
 
   ASSERT_TRUE(RunPlatformAppTest(
       "platform_apps/ad_view/invalid_ad_network")) << message_;
@@ -124,7 +124,7 @@ IN_PROC_BROWSER_TEST_F(AdViewNoSrcTest, InvalidAdNetworkIsIgnored) {
 // This test checks the "src" attribute is ignored when the
 // "kEnableAdviewSrcAttribute" is missing.
 IN_PROC_BROWSER_TEST_F(AdViewNoSrcTest, EnableAdviewSrcAttributeFlagRequired) {
-  ASSERT_TRUE(StartTestServer());
+  ASSERT_TRUE(StartEmbeddedTestServer());
 
   ASSERT_TRUE(RunPlatformAppTest(
       "platform_apps/ad_view/src_flag_required")) << message_;
@@ -164,7 +164,7 @@ class AdViewNotEnabledTest : public extensions::PlatformAppBrowserTest {
 // This test checks an <adview> element has no behavior when the "kEnableAdview"
 // flag is missing.
 IN_PROC_BROWSER_TEST_F(AdViewNotEnabledTest, EnableAdviewFlagRequired) {
-  ASSERT_TRUE(StartTestServer());
+  ASSERT_TRUE(StartEmbeddedTestServer());
 
   ASSERT_TRUE(RunPlatformAppTest(
       "platform_apps/ad_view/flag_required")) << message_;