Index: components/web_cache/browser/web_cache_manager_unittest.cc |
diff --git a/chrome/browser/renderer_host/web_cache_manager_unittest.cc b/components/web_cache/browser/web_cache_manager_unittest.cc |
similarity index 92% |
rename from chrome/browser/renderer_host/web_cache_manager_unittest.cc |
rename to components/web_cache/browser/web_cache_manager_unittest.cc |
index 81a201190b4225f3484bf9548c46a24bfe35906b..8eb784ed24c4db3dcad9a39fd232cc846afc2aa9 100644 |
--- a/chrome/browser/renderer_host/web_cache_manager_unittest.cc |
+++ b/components/web_cache/browser/web_cache_manager_unittest.cc |
@@ -5,7 +5,7 @@ |
#include <string> |
#include "base/message_loop/message_loop.h" |
-#include "chrome/browser/renderer_host/web_cache_manager.h" |
+#include "components/web_cache/browser/web_cache_manager.h" |
#include "content/public/test/test_browser_thread.h" |
#include "testing/gtest/include/gtest/gtest.h" |
@@ -14,6 +14,8 @@ using base::TimeDelta; |
using content::BrowserThread; |
using blink::WebCache; |
+namespace web_cache { |
+ |
class WebCacheManagerTest : public testing::Test { |
protected: |
typedef WebCacheManager::StatsMap StatsMap; |
@@ -309,3 +311,27 @@ TEST_F(WebCacheManagerTest, AddToStrategyTest) { |
manager()->Remove(kRendererID); |
manager()->Remove(kRendererID2); |
} |
+ |
+TEST_F(WebCacheManagerTest, |
+ RemoveRendererBeforeCallingObserveActivityShouldNotCrashTest) { |
+ EXPECT_EQ(0U, active_renderers(manager()).size()); |
+ EXPECT_EQ(0U, inactive_renderers(manager()).size()); |
+ |
+ scoped_ptr<base::Closure> test_call_back( |
+ new base::Closure(base::MessageLoop::QuitWhenIdleClosure())); |
+ manager()->SetTestCallback(test_call_back.Pass()); |
+ |
+ manager()->Add(kRendererID); |
+ base::MessageLoop::current()->Run(); |
+ manager()->Add(kRendererID2); |
+ base::MessageLoop::current()->Run(); |
+ |
+ manager()->Remove(kRendererID); |
+ base::MessageLoop::current()->Run(); |
+ manager()->ObserveActivity(kRendererID); |
+ |
+ manager()->Remove(kRendererID2); |
+ base::MessageLoop::current()->Run(); |
erikwright (departed)
2014/09/10 15:49:43
Since the rest of this test suite is already using
Xi Han
2014/09/10 17:24:36
Done.
|
+} |
+ |
+} // namespace web_cache |