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

net/url_request/url_request_job_tracker_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.h>
 #include <algorithm>
 #include <string>
 #include <vector>
 #include "base/message_loop.h"
 #include "googleurl/src/gurl.h"
 #include "net/base/filter.h"
 #include "net/base/io_buffer.h"
 #include "net/url_request/url_request.h"
 #include "net/url_request/url_request_job.h"
 #include "net/url_request/url_request_job_tracker.h"
 #include "net/url_request/url_request_status.h"
-#include "net/url_request/url_request_unittest.h"
+#include "net/url_request/url_request_test_util.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/platform_test.h"
 
 using testing::Eq;
 using testing::InSequence;
 using testing::NotNull;
 using testing::StrictMock;
 
 namespace {
@@ skipping 197 matching lines @@
   g_async_reads = true;
   AssertJobTrackerCallbacks("test:compressed");
 }
 
 TEST_F(URLRequestJobTrackerTest, CompressedSync) {
   g_async_reads = false;
   AssertJobTrackerCallbacks("test:compressed");
 }
 
 }  // namespace