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

chrome/service/cloud_print/cloud_print_url_fetcher_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 "base/command_line.h"
 #include "base/message_loop_proxy.h"
 #include "base/ref_counted.h"
+#include "base/synchronization/waitable_event.h"
 #include "base/threading/thread.h"
-#include "base/synchronization/waitable_event.h"
 #include "chrome/common/net/url_request_context_getter.h"
+#include "chrome/service/cloud_print/cloud_print_url_fetcher.h"
 #include "chrome/service/service_process.h"
-#include "chrome/service/cloud_print/cloud_print_url_fetcher.h"
 #include "googleurl/src/gurl.h"
 #include "net/test/test_server.h"
 #include "net/url_request/url_request_status.h"
+#include "net/url_request/url_request_test_util.h"
 #include "net/url_request/url_request_throttler_manager.h"
-#include "net/url_request/url_request_unittest.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using base::Time;
 using base::TimeDelta;
 
 namespace {
 
 const FilePath::CharType kDocRoot[] = FILE_PATH_LITERAL("chrome/test/data");
 
 int g_request_context_getter_instances = 0;
@@ skipping 320 matching lines @@
       url, entry);
 
   CreateFetcher(url, 11);
 
   MessageLoop::current()->Run();
 
   net::URLRequestThrottlerManager::GetInstance()->EraseEntryForTests(url);
 }
 
 }  // namespace.