| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "base/bind.h" | 5 #include "base/bind.h" |
| 6 #include "base/callback.h" | 6 #include "base/callback.h" |
| 7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
| 8 #include "base/run_loop.h" | 8 #include "base/run_loop.h" |
| 9 #include "base/strings/utf_string_conversions.h" | 9 #include "base/strings/utf_string_conversions.h" |
| 10 #include "content/browser/fileapi/chrome_blob_storage_context.h" | 10 #include "content/browser/fileapi/chrome_blob_storage_context.h" |
| (...skipping 847 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 858 static int CountRenderProcessHosts() { | 858 static int CountRenderProcessHosts() { |
| 859 int result = 0; | 859 int result = 0; |
| 860 for (RenderProcessHost::iterator iter(RenderProcessHost::AllHostsIterator()); | 860 for (RenderProcessHost::iterator iter(RenderProcessHost::AllHostsIterator()); |
| 861 !iter.IsAtEnd(); | 861 !iter.IsAtEnd(); |
| 862 iter.Advance()) { | 862 iter.Advance()) { |
| 863 result++; | 863 result++; |
| 864 } | 864 } |
| 865 return result; | 865 return result; |
| 866 } | 866 } |
| 867 | 867 |
| 868 // Flaky timeouts on CrOS: http://crbug.com/387045 | 868 // Flaky timeouts on CrOS and crash on Android: http://crbug.com/387045 |
| 869 #if defined(OS_CHROMEOS) | 869 #if defined(OS_CHROMEOS) || defined(ANDROID) |
| 870 #define MAYBE_Registration DISABLED_Registration | 870 #define MAYBE_Registration DISABLED_Registration |
| 871 #else | 871 #else |
| 872 #define MAYBE_Registration Registration | 872 #define MAYBE_Registration Registration |
| 873 #endif | 873 #endif |
| 874 IN_PROC_BROWSER_TEST_F(ServiceWorkerBlackBoxBrowserTest, MAYBE_Registration) { | 874 IN_PROC_BROWSER_TEST_F(ServiceWorkerBlackBoxBrowserTest, MAYBE_Registration) { |
| 875 // Close the only window to be sure we're not re-using its RenderProcessHost. | 875 // Close the only window to be sure we're not re-using its RenderProcessHost. |
| 876 shell()->Close(); | 876 shell()->Close(); |
| 877 EXPECT_EQ(0, CountRenderProcessHosts()); | 877 EXPECT_EQ(0, CountRenderProcessHosts()); |
| 878 | 878 |
| 879 const std::string kWorkerUrl = "/service_worker/fetch_event.js"; | 879 const std::string kWorkerUrl = "/service_worker/fetch_event.js"; |
| (...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 969 const base::string16 kOKTitle2(base::ASCIIToUTF16("OK_2")); | 969 const base::string16 kOKTitle2(base::ASCIIToUTF16("OK_2")); |
| 970 const base::string16 kFailTitle2(base::ASCIIToUTF16("FAIL_2")); | 970 const base::string16 kFailTitle2(base::ASCIIToUTF16("FAIL_2")); |
| 971 content::TitleWatcher title_watcher2(shell()->web_contents(), kOKTitle2); | 971 content::TitleWatcher title_watcher2(shell()->web_contents(), kOKTitle2); |
| 972 title_watcher2.AlsoWaitForTitle(kFailTitle2); | 972 title_watcher2.AlsoWaitForTitle(kFailTitle2); |
| 973 | 973 |
| 974 NavigateToURL(shell(), embedded_test_server()->GetURL(kConfirmPageUrl)); | 974 NavigateToURL(shell(), embedded_test_server()->GetURL(kConfirmPageUrl)); |
| 975 EXPECT_EQ(kOKTitle2, title_watcher2.WaitAndGetTitle()); | 975 EXPECT_EQ(kOKTitle2, title_watcher2.WaitAndGetTitle()); |
| 976 } | 976 } |
| 977 | 977 |
| 978 } // namespace content | 978 } // namespace content |
| OLD | NEW |