| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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/command_line.h" | 5 #include "base/command_line.h" |
| 6 #include "base/files/file_path.h" | 6 #include "base/files/file_path.h" |
| 7 #include "base/strings/utf_string_conversions.h" | 7 #include "base/strings/utf_string_conversions.h" |
| 8 #include "base/test/histogram_tester.h" | 8 #include "base/test/histogram_tester.h" |
| 9 #include "base/time/time.h" | 9 #include "base/time/time.h" |
| 10 #include "content/browser/frame_host/cross_site_transferring_request.h" | 10 #include "content/browser/frame_host/cross_site_transferring_request.h" |
| (...skipping 1884 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1895 FrameHostMsg_Detach(manager->current_frame_host()->GetRoutingID())); | 1895 FrameHostMsg_Detach(manager->current_frame_host()->GetRoutingID())); |
| 1896 | 1896 |
| 1897 EXPECT_TRUE(delete_watcher.deleted()); | 1897 EXPECT_TRUE(delete_watcher.deleted()); |
| 1898 | 1898 |
| 1899 EXPECT_EQ(1U, site_instance->active_frame_count()); | 1899 EXPECT_EQ(1U, site_instance->active_frame_count()); |
| 1900 site_instance->decrement_active_frame_count(); | 1900 site_instance->decrement_active_frame_count(); |
| 1901 | 1901 |
| 1902 #if 0 | 1902 #if 0 |
| 1903 // TODO(nick): Currently a proxy to the removed frame lingers in the parent. | 1903 // TODO(nick): Currently a proxy to the removed frame lingers in the parent. |
| 1904 // Enable this assert below once the proxies to the subframe are correctly | 1904 // Enable this assert below once the proxies to the subframe are correctly |
| 1905 // cleaned up after detach. | 1905 // cleaned up after detach. http://crbug.com/444955. |
| 1906 ASSERT_TRUE(site_instance->HasOneRef()) | 1906 ASSERT_TRUE(site_instance->HasOneRef()) |
| 1907 << "This SiteInstance should be destroyable now."; | 1907 << "This SiteInstance should be destroyable now."; |
| 1908 #endif | 1908 #endif |
| 1909 } | 1909 } |
| 1910 | 1910 |
| 1911 } // namespace content | 1911 } // namespace content |
| OLD | NEW |