Reapply r72562 with willchan's nits + locally tested shlib fixes.

chrome/browser/chrome_plugin_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.
 // Tests exercising the Chrome Plugin API.
 
 #include "base/file_util.h"
 #include "base/message_loop_proxy.h"
 #include "base/path_service.h"
 #include "base/string_util.h"
 #include "chrome/browser/browser_thread.h"
 #include "chrome/browser/chrome_plugin_host.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/chrome_plugin_lib.h"
 #include "chrome/common/net/url_request_context_getter.h"
 #include "chrome/test/chrome_plugin/test_chrome_plugin.h"
+#include "chrome/test/test_url_request_context_getter.h"
 #include "net/base/io_buffer.h"
 #include "net/http/http_response_headers.h"
 #include "net/url_request/url_request_test_job.h"
-#include "net/url_request/url_request_unittest.h"
+#include "net/url_request/url_request_test_util.h"
 #include "net/test/test_server.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace {
 
 const FilePath::CharType kDocRoot[] = FILE_PATH_LITERAL("chrome/test/data");
 const char kPluginFilename[] = "test_chrome_plugin.dll";
 const int kResponseBufferSize = 4096;
 
-class TestURLRequestContextGetter : public URLRequestContextGetter {
- public:
-  virtual net::URLRequestContext* GetURLRequestContext() {
-    if (!context_)
-      context_ = new TestURLRequestContext();
-    return context_;
-  }
-  virtual scoped_refptr<base::MessageLoopProxy> GetIOMessageLoopProxy() const {
-    return BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO);
-  }
-
- private:
-  ~TestURLRequestContextGetter() {}
-  scoped_refptr<net::URLRequestContext> context_;
-};
-
 class ChromePluginTest : public testing::Test,
                          public net::URLRequest::Delegate {
  public:
   ChromePluginTest()
       : io_thread_(BrowserThread::IO, &message_loop_),
         request_(NULL),
         response_buffer_(new net::IOBuffer(kResponseBufferSize)),
         plugin_(NULL),
         expected_payload_(NULL),
         request_context_getter_(new TestURLRequestContextGetter()) {
@@ skipping 245 matching lines @@
 TEST_F(ChromePluginTest, DoesNotInterceptOwnRequest) {
   const TestResponsePayload& payload = kChromeTestPluginPayloads[0];
 
   EXPECT_EQ(CPERR_SUCCESS, test_funcs_.test_make_request(
       "GET", GURL(payload.url)));
 
   MessageLoop::current()->Run();
 }
 
 }  // namespace