Fix two URLRequestContext leaks in HttpBridgeTest....

chrome/browser/sync/glue/http_bridge_unittest.cc

 // Copyright (c) 2006-2008 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.
 
-// TODO(timsteele): Re-enable ASAP.  http://crbug.com/19002
-#if 0
 #ifdef CHROME_PERSONALIZATION
 
 #include "base/thread.h"
 #include "chrome/browser/sync/glue/http_bridge.h"
 #include "net/url_request/url_request_unittest.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using browser_sync::HttpBridge;
 
 namespace {
 // TODO(timsteele): Should use PathService here. See Chromium Issue 3113.
 const char16 kDocRoot[] = L"chrome/test/data";
 }
 
 class HttpBridgeTest : public testing::Test {
  public:
-  HttpBridgeTest() : io_thread_("HttpBridgeTest IO thread") {
+  HttpBridgeTest() : io_thread_("HttpBridgeTest IO thread"),
+      fake_default_request_context_(NULL) {
   }
 
   virtual void SetUp() {
     base::Thread::Options options;
     options.message_loop_type = MessageLoop::TYPE_IO;
     io_thread_.StartWithOptions(options);
   }
 
   virtual void TearDown() {
+    io_thread_loop()->ReleaseSoon(FROM_HERE, fake_default_request_context_);
     io_thread_.Stop();
+    fake_default_request_context_ = NULL;
   }
 
   HttpBridge* BuildBridge() {
-    if (!request_context_) {
-      request_context_ = new HttpBridge::RequestContext(
-          new TestURLRequestContext());
+    if (!fake_default_request_context_) {
+      fake_default_request_context_ = new TestURLRequestContext();
+      fake_default_request_context_->AddRef();
     }
-    HttpBridge* bridge = new HttpBridge(request_context_,
-                                        io_thread_.message_loop());
+    HttpBridge* bridge = new HttpBridge(
+        new HttpBridge::RequestContext(fake_default_request_context_),
+        io_thread_.message_loop());
     bridge->use_io_loop_for_testing_ = true;
     return bridge;
   }
 
   MessageLoop* io_thread_loop() { return io_thread_.message_loop(); }
  private:
+  // A make-believe "default" request context, as would be returned by
+  // Profile::GetDefaultRequestContext().  Created lazily by BuildBridge.
+  TestURLRequestContext* fake_default_request_context_;
+
   // Separate thread for IO used by the HttpBridge.
-  scoped_refptr<HttpBridge::RequestContext> request_context_;
   base::Thread io_thread_;
 };
 
 // An HttpBridge that doesn't actually make network requests and just calls
 // back with dummy response info.
 class ShuntedHttpBridge : public HttpBridge {
  public:
   ShuntedHttpBridge(const URLRequestContext* baseline_context,
                     MessageLoop* io_loop, HttpBridgeTest* test)
       : HttpBridge(new HttpBridge::RequestContext(baseline_context),
@@ skipping 14 matching lines @@
     cookies.push_back("cookie1");
     std::string response_content = "success!";
     OnURLFetchComplete(NULL, GURL("www.google.com"), URLRequestStatus(),
                        200, cookies, response_content);
   }
   HttpBridgeTest* test_;
 };
 
 // Test the HttpBridge without actually making any network requests.
 TEST_F(HttpBridgeTest, TestMakeSynchronousPostShunted) {
+  scoped_refptr<TestURLRequestContext> ctx(new TestURLRequestContext());
   scoped_refptr<HttpBridge> http_bridge(new ShuntedHttpBridge(
-      new TestURLRequestContext(), io_thread_loop(), this));
+      ctx, io_thread_loop(), this));
   http_bridge->SetUserAgent("bob");
   http_bridge->SetURL("http://www.google.com", 9999);
   http_bridge->SetPostPayload("text/plain", 2, " ");
 
   int os_error = 0;
   int response_code = 0;
   bool success = http_bridge->MakeSynchronousPost(&os_error, &response_code);
   EXPECT_TRUE(success);
   EXPECT_EQ(200, response_code);
   EXPECT_EQ(0, os_error);
@@ skipping 64 matching lines @@
 // seems to be surprising the TestServer, because it isn't echoing the headers
 // properly.
 #if FIXED_SYNCER_BACKEND_COOKIE_PARSING
   EXPECT_NE(std::string::npos, response.find("Cookie: foo=bar; baz=boo"));
   EXPECT_NE(std::string::npos, response.find("User-Agent: bob"));
 #endif
   EXPECT_NE(std::string::npos, response.find(test_payload.c_str()));
 }
 
 #endif  // CHROME_PERSONALIZATION
-#endif