Use WebContents::GetManifest in ServiceWorker FetchTest instead of RequestAppBannerFromDevTools

chrome/browser/chrome_service_worker_browsertest.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.
 
 // This file tests that Service Workers (a Content feature) work in the Chromium
 // embedder.
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/files/scoped_temp_dir.h"
@@ skipping 223 matching lines @@
       RequestString("https://www.example.com/test.pdf", "no-cors", "include"),
       result);
 }
 
 class ChromeServiceWorkerManifestFetchTest
     : public ChromeServiceWorkerFetchTest {
  protected:
   ChromeServiceWorkerManifestFetchTest() {}
   ~ChromeServiceWorkerManifestFetchTest() override {}
 
-  void SetUpCommandLine(base::CommandLine* command_line) override {
-    ChromeServiceWorkerFetchTest::SetUpCommandLine(command_line);
-    command_line->AppendSwitch(switches::kEnableAddToShelf);
-  }
-
   std::string ExecuteManifestFetchTest(const std::string& url,
                                        const std::string& cross_origin) {
     std::string js(
         base::StringPrintf("reportOnFetch = false;"
                            "var link = document.createElement('link');"
                            "link.rel = 'manifest';"
                            "link.href = '%s';",
                            url.c_str()));
     if (!cross_origin.empty()) {
       js +=
           base::StringPrintf("link.crossOrigin = '%s';", cross_origin.c_str());
     }
     js += "document.head.appendChild(link);";
     ExecuteJavaScriptForTests(js);
     return RequestAppBannerAndGetIssuedRequests();
   }
 
  private:
   void ExecuteJavaScriptForTests(const std::string& js) {
     browser()
         ->tab_strip_model()
         ->GetActiveWebContents()
         ->GetMainFrame()
         ->ExecuteJavaScriptForTests(base::ASCIIToUTF16(js));
   }
 
   std::string RequestAppBannerAndGetIssuedRequests() {

[dominickn, 2016/07/19 03:06:27]

Nit: rename this GetManifestAndIssuedRequests?

[horo, 2016/07/19 03:13:40]

Done.

-    browser()->RequestAppBannerFromDevTools(
-        browser()->tab_strip_model()->GetActiveWebContents());
+    base::RunLoop run_loop;
+    browser()->tab_strip_model()->GetActiveWebContents()->GetManifest(
+        base::Bind(&ManifestCallbackAndRun, run_loop.QuitClosure()));
+    run_loop.Run();
     return ExecuteScriptAndExtractString(
         "if (issuedRequests.length != 0) reportRequests();"
         "else reportOnFetch = true;");
   }
+
+  static void ManifestCallbackAndRun(const base::Closure& continuation,
+                                     const GURL&,
+                                     const content::Manifest&) {
+    continuation.Run();
+  }
+
   DISALLOW_COPY_AND_ASSIGN(ChromeServiceWorkerManifestFetchTest);
 };
 
 IN_PROC_BROWSER_TEST_F(ChromeServiceWorkerManifestFetchTest, SameOrigin) {
   // <link rel="manifest" href="manifest.json">
   EXPECT_EQ(RequestString(GetURL("/manifest.json"), "cors", "same-origin"),
             ExecuteManifestFetchTest("manifest.json", ""));
 }
 
 IN_PROC_BROWSER_TEST_F(ChromeServiceWorkerManifestFetchTest,
@@ skipping 200 matching lines @@
             ExecutePNACLUrlLoaderTest("OtherCredentials"));
 }
 
 IN_PROC_BROWSER_TEST_F(ChromeServiceWorkerFetchPPAPIPrivateTest,
                        OtherOriginCORSCredentials) {
   EXPECT_EQ(GetRequestStringForPNACL(),
             ExecutePNACLUrlLoaderTest("OtherCORSCredentials"));
 }
 
 }  // namespace