Adding SSL ETS Tests

chrome/browser/extensions/api/declarative_content/request_content_script_apitest.cc

 // Copyright 2014 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/files/file_path.h"
 #include "base/macros.h"
 #include "base/strings/stringprintf.h"
 #include "chrome/browser/extensions/extension_browsertest.h"
 #include "chrome/browser/extensions/test_extension_dir.h"
 #include "chrome/browser/ui/browser.h"
@@ skipping 179 matching lines @@
   return testing::AssertionSuccess();
 }
 
 
 // Try different permutations of "match all", "match particular domain (that is
 // visited by test)", and "match nonsense domain (not visited by test)" for
 // both manifest permissions and injection matcher conditions.
 // http://crbug.com/421118
 IN_PROC_BROWSER_TEST_F(RequestContentScriptAPITest,
                        DISABLED_PermissionMatcherAgreementInjection) {
-  ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
+  ASSERT_TRUE(embedded_test_server()->Start());
 
   // Positive tests: permissions and matcher contain conditions that match URL
   // visited during test.
   EXPECT_TRUE(RunTest(ALL, ALL, true));
   EXPECT_TRUE(RunTest(ALL, PARTICULAR, true));
   EXPECT_TRUE(RunTest(PARTICULAR, ALL, true));
   EXPECT_TRUE(RunTest(PARTICULAR, PARTICULAR, true));
 
   // Negative tests: permissions or matcher (or both) contain conditions that
   // do not match URL visited during test.
   EXPECT_TRUE(RunTest(NOWHERE, ALL, false));
   EXPECT_TRUE(RunTest(NOWHERE, PARTICULAR, false));
   EXPECT_TRUE(RunTest(NOWHERE, NOWHERE, false));
   EXPECT_TRUE(RunTest(ALL, NOWHERE, false));
   EXPECT_TRUE(RunTest(PARTICULAR, NOWHERE, false));
 
   // TODO(markdittmer): Add more tests:
   // - Inject script with multiple files
   // - Inject multiple scripts
   // - Match on CSS selector conditions
   // - Match all frames in document containing frames
 }
 
 }  // namespace extensions