Use WebContents::GetManifest in ServiceWorker FetchTest instead of RequestAppBannerFromDevTools

chrome/browser/chrome_service_worker_browsertest.cc

Index: chrome/browser/chrome_service_worker_browsertest.cc
diff --git a/chrome/browser/chrome_service_worker_browsertest.cc b/chrome/browser/chrome_service_worker_browsertest.cc
index 8d054fc64659d88a29cd2d5840b2fade6b70de58..07fa1ad054cd3b382ef0cf0b1a48822adfde0bbd 100644
--- a/chrome/browser/chrome_service_worker_browsertest.cc
+++ b/chrome/browser/chrome_service_worker_browsertest.cc
@@ -241,11 +241,6 @@ class ChromeServiceWorkerManifestFetchTest
   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(
@@ -273,12 +268,21 @@ class ChromeServiceWorkerManifestFetchTest
   }
 
   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);
 };