Move webCacheManager to //components.

components/web_cache/browser/web_cache_manager_unittest.cc

 // Copyright (c) 2011 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 <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"
 
 using base::Time;
 using base::TimeDelta;
 using content::BrowserThread;
 using blink::WebCache;
 
+namespace web_cache {
+
 class WebCacheManagerTest : public testing::Test {
  protected:
   typedef WebCacheManager::StatsMap StatsMap;
   typedef WebCacheManager::Allocation Allocation;
   typedef WebCacheManager::AllocationStrategy AllocationStrategy;
 
   static const int kRendererID;
   static const int kRendererID2;
   static const WebCache::UsageStats kStats;
   static const WebCache::UsageStats kStats2;
@@ skipping 275 matching lines @@
 
   size_t expected_total_bytes = kExtraBytesToAllocate +
                                 kStats.liveSize + kStats.deadSize +
                                 kStats2.liveSize + kStats2.deadSize;
 
   EXPECT_GE(expected_total_bytes, total_bytes);
 
   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 friend status to invoke
protected/private methods and members of WebCacheManager, just call
ReviseAllocationStrategy from the suite (you will need to add a thunk to do so)
rather than waiting for the delayed task to execute.

That will remove the need for this callback.

[Xi Han, 2014/09/10 17:24:36]

Done.

+}
+
+}  // namespace web_cache