Revert 170660

chrome/browser/extensions/web_view_browsertest.cc

 // Copyright (c) 2012 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/utf_string_conversions.h"
 #include "chrome/browser/automation/automation_util.h"
 #include "chrome/browser/extensions/platform_app_browsertest_util.h"
 #include "chrome/browser/ui/browser_tabstrip.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "chrome/test/base/test_launcher_utils.h"
@@ skipping 264 matching lines @@
   automation_util::GetCookies(GURL("http://localhost"),
                               cookie_contents2,
                               &cookie_size, &cookie_value);
   EXPECT_EQ("guest1=true; guest2=true", cookie_value);
 
   // The third tag should not have any cookies as it is in a separate partition.
   automation_util::GetCookies(GURL("http://localhost"),
                               named_partition_contents1,
                               &cookie_size, &cookie_value);
   EXPECT_EQ("", cookie_value);
-
-  CloseShellWindowsAndWaitForAppToExit();
 }
 
 // This tests that in-memory storage partitions are reset on browser restart,
 // but persistent ones maintain state for cookies and HTML5 storage.
 IN_PROC_BROWSER_TEST_F(WebViewTest, PRE_StoragePersistence) {
   ASSERT_TRUE(StartTestServer());
   const std::wstring kExpire =
       L"var expire = new Date(Date.now() + 24 * 60 * 60 * 1000);";
   std::wstring cookie_script1(kExpire);
   cookie_script1.append(
@@ skipping 70 matching lines @@
                               &cookie_size, &cookie_value);
   EXPECT_EQ("persist1=true", cookie_value);
   automation_util::GetCookies(GURL("http://localhost"),
                               persistent_partition_contents2,
                               &cookie_size, &cookie_value);
   EXPECT_EQ("persist1=true", cookie_value);
   automation_util::GetCookies(GURL("http://localhost"),
                               persistent_partition_contents3,
                               &cookie_size, &cookie_value);
   EXPECT_EQ("persist2=true", cookie_value);
-
-  CloseShellWindowsAndWaitForAppToExit();
 }
 
 // This is the post-reset portion of the StoragePersistence test.  See
 // PRE_StoragePersistence for main comment.
 IN_PROC_BROWSER_TEST_F(WebViewTest, StoragePersistence) {
   ASSERT_TRUE(StartTestServer());
 
   // We don't care where the main browser is on this test.
   GURL blank_url("about:blank");
 
@@ skipping 41 matching lines @@
                               &cookie_size, &cookie_value);
   EXPECT_EQ("persist1=true", cookie_value);
   automation_util::GetCookies(GURL("http://localhost"),
                               persistent_partition_contents2,
                               &cookie_size, &cookie_value);
   EXPECT_EQ("persist1=true", cookie_value);
   automation_util::GetCookies(GURL("http://localhost"),
                               persistent_partition_contents3,
                               &cookie_size, &cookie_value);
   EXPECT_EQ("persist2=true", cookie_value);
-
-  CloseShellWindowsAndWaitForAppToExit();
 }
 
 // This tests DOM storage isolation for packaged apps with webview tags. It
 // loads an app with multiple webview tags and each tag sets DOM storage
 // entries, which the test checks to ensure proper storage isolation is
 // enforced.
 IN_PROC_BROWSER_TEST_F(WebViewTest, DOMStorageIsolation) {
   ASSERT_TRUE(StartTestServer());
   GURL regular_url = test_server()->GetURL("files/title1.html");
 
@@ skipping 68 matching lines @@
       std::wstring(), get_session_storage.c_str(), &output));
   EXPECT_STREQ("badval", output.c_str());
   EXPECT_TRUE(ExecuteJavaScriptAndExtractString(
       default_tag_contents1->GetRenderViewHost(), std::wstring(),
       get_local_storage.c_str(), &output));
   EXPECT_STREQ("badval", output.c_str());
   EXPECT_TRUE(ExecuteJavaScriptAndExtractString(
       default_tag_contents1->GetRenderViewHost(), std::wstring(),
       get_session_storage.c_str(), &output));
   EXPECT_STREQ("badval", output.c_str());
-
-  CloseShellWindowsAndWaitForAppToExit();
 }
 
 // This tests IndexedDB isolation for packaged apps with webview tags. It loads
 // an app with multiple webview tags and each tag creates an IndexedDB record,
 // which the test checks to ensure proper storage isolation is enforced.
 IN_PROC_BROWSER_TEST_F(WebViewTest, IndexedDBIsolation) {
   ASSERT_TRUE(StartTestServer());
   GURL regular_url = test_server()->GetURL("files/title1.html");
 
   content::WebContents* default_tag_contents1;
@@ skipping 66 matching lines @@
   const char* script =
     "indexedDB.open('isolation').onsuccess = function(e) {"
     "  if (e.target.result.version == 1)"
     "    document.title = 'db not found';"
     "  else "
     "    document.title = 'error';"
     "}";
   ExecuteScriptWaitForTitle(chrome::GetWebContentsAt(browser(), 0),
                             script, "db not found");
   ExecuteScriptWaitForTitle(default_tag_contents1, script, "db not found");
-
-  CloseShellWindowsAndWaitForAppToExit();
 }