Make initialization of the QuicInMemoryCache explicit to avoid spooky action at a distance which co…

net/tools/quic/quic_in_memory_cache_test.cc

Index: net/tools/quic/quic_in_memory_cache_test.cc
diff --git a/net/tools/quic/quic_in_memory_cache_test.cc b/net/tools/quic/quic_in_memory_cache_test.cc
index e6b3d66484d4556a733314af2ffece8d75c39d33..d93a344f64339acec268d7e56d5bbec4d9d66457 100644
--- a/net/tools/quic/quic_in_memory_cache_test.cc
+++ b/net/tools/quic/quic_in_memory_cache_test.cc
@@ -26,27 +26,33 @@ namespace test {
 class QuicInMemoryCacheTest : public ::testing::Test {
  protected:
   QuicInMemoryCacheTest() {
-    base::FilePath path;
-    PathService::Get(base::DIR_SOURCE_ROOT, &path);
-    path = path.AppendASCII("net").AppendASCII("data")
-        .AppendASCII("quic_in_memory_cache_data");
-    // The file path is known to be an ascii string.
-    FLAGS_quic_in_memory_cache_dir = path.MaybeAsASCII();
+    QuicInMemoryCachePeer::ResetForTests();
   }
 
   ~QuicInMemoryCacheTest() override { QuicInMemoryCachePeer::ResetForTests(); }
 
-  void CreateRequest(StringPiece host,
-                     StringPiece path,
-                     BalsaHeaders* headers) {
+  void CreateRequest(string host, string path, BalsaHeaders* headers) {
     headers->SetRequestFirstlineFromStringPieces("GET", path, "HTTP/1.1");
     headers->ReplaceOrAppendHeader("host", host);
   }
 
-  void SetUp() override { QuicInMemoryCachePeer::ResetForTests(); }
-
+  string CacheDirectory() {
+    base::FilePath path;
+    PathService::Get(base::DIR_SOURCE_ROOT, &path);
+    path = path.AppendASCII("net").AppendASCII("data")
+        .AppendASCII("quic_in_memory_cache_data");
+    // The file path is known to be an ascii string.
+    return path.MaybeAsASCII();
+  }
 };
 
+TEST_F(QuicInMemoryCacheTest, GetResponseNoMatch) {
+  const QuicInMemoryCache::Response* response =
+      QuicInMemoryCache::GetInstance()->GetResponse("mail.google.com",
+                                                    "/index.html");
+  ASSERT_FALSE(response);
+}
+
 TEST_F(QuicInMemoryCacheTest, AddSimpleResponseGetResponse) {
   string response_body("hello response");
   QuicInMemoryCache* cache = QuicInMemoryCache::GetInstance();
@@ -63,6 +69,7 @@ TEST_F(QuicInMemoryCacheTest, AddSimpleResponseGetResponse) {
 }
 
 TEST_F(QuicInMemoryCacheTest, ReadsCacheDir) {
+  QuicInMemoryCache::GetInstance()->InitializeFromDirectory(CacheDirectory());
   const QuicInMemoryCache::Response* response =
       QuicInMemoryCache::GetInstance()->GetResponse("quic.test.url",
                                                     "/index.html");
@@ -75,6 +82,7 @@ TEST_F(QuicInMemoryCacheTest, ReadsCacheDir) {
 }
 
 TEST_F(QuicInMemoryCacheTest, UsesOriginalUrl) {
+  QuicInMemoryCache::GetInstance()->InitializeFromDirectory(CacheDirectory());
   const QuicInMemoryCache::Response* response =
       QuicInMemoryCache::GetInstance()->GetResponse("quic.test.url",
                                                     "/index.html");
@@ -86,13 +94,6 @@ TEST_F(QuicInMemoryCacheTest, UsesOriginalUrl) {
   EXPECT_LT(0U, response->body().length());
 }
 
-TEST_F(QuicInMemoryCacheTest, GetResponseNoMatch) {
-  const QuicInMemoryCache::Response* response =
-      QuicInMemoryCache::GetInstance()->GetResponse("mail.google.com",
-                                                    "/index.html");
-  ASSERT_FALSE(response);
-}
-
 }  // namespace test
 }  // namespace tools
 }  // namespace net