Move TestURLRequestContextGetter to url_request_test_util.{h,cc}

chrome/browser/intents/cws_intents_registry_unittest.cc

 // Copyright (c) 2012 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 "chrome/browser/intents/cws_intents_registry.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/message_loop.h"
 #include "base/utf_string_conversions.h"
-#include "chrome/test/base/test_url_request_context_getter.h"
 #include "content/test/test_url_fetcher_factory.h"
+#include "net/url_request/url_request_test_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace {
 
 const char kCWSQueryInvalid[] =
     "https://www-googleapis-staging.sandbox.google.com"
     "/chromewebstore/v1.1b/items/intent"
       "?intent=foo&mime_types=foo";
 const char kCWSResponseInvalid[] =
     "{\"error\":{\"errors\":[{\"domain\":\"global\",\"reason\":\"invalid\","
@@ skipping 61 matching lines @@
     return extensions_;
   }
 
   void Callback(const CWSIntentsRegistry::IntentExtensionList& extensions) {
     extensions_ = extensions;
   }
 
   CWSIntentsRegistry::IntentExtensionList extensions_;
   FakeURLFetcherFactory test_factory_;
 
- private:
+ protected:
   MessageLoop ui_loop_;
 };
 
 }  // namespace
 
 TEST_F(CWSIntentsRegistryTest, ValidQuery) {
-  TestURLRequestContextGetter context_getter;
+  const scoped_refptr<TestURLRequestContextGetter> context_getter(
+      new TestURLRequestContextGetter(ui_loop_.message_loop_proxy()));
   test_factory_.SetFakeResponse(kCWSQueryValid, kCWSResponseValid, true);
 
-  CWSIntentsRegistry registry(&context_getter);
+  CWSIntentsRegistry registry(context_getter);
   registry.GetIntentServices(ASCIIToUTF16("http://webintents.org/edit"),
                              ASCIIToUTF16("*/png"),
                              base::Bind(&CWSIntentsRegistryTest::Callback,
                                         base::Unretained(this)));
 
   WaitForResults();
   ASSERT_EQ(1UL, extensions_.size());
 
   EXPECT_EQ(0, extensions_[0].num_ratings);
   EXPECT_EQ(0.0, extensions_[0].average_rating);
   EXPECT_EQ(std::string(kValidManifest), UTF16ToUTF8(extensions_[0].manifest));
   EXPECT_EQ(std::string(kValidIconURL), extensions_[0].icon_url.spec());
 }
 
 TEST_F(CWSIntentsRegistryTest, InvalidQuery) {
-  TestURLRequestContextGetter context_getter;
+  const scoped_refptr<TestURLRequestContextGetter> context_getter(
+      new TestURLRequestContextGetter(ui_loop_.message_loop_proxy()));
   test_factory_.SetFakeResponse(kCWSQueryInvalid, kCWSResponseInvalid, true);
 
-  CWSIntentsRegistry registry(&context_getter);
+  CWSIntentsRegistry registry(context_getter);
   registry.GetIntentServices(ASCIIToUTF16("foo"),
                              ASCIIToUTF16("foo"),
                              base::Bind(&CWSIntentsRegistryTest::Callback,
                                         base::Unretained(this)));
 
   WaitForResults();
   EXPECT_EQ(0UL, extensions_.size());
 }