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

chrome/browser/printing/print_dialog_cloud_uitest.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 "chrome/browser/printing/print_dialog_cloud.h"
 #include "chrome/browser/printing/print_dialog_cloud_internal.h"
 
 #include <functional>
 
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "base/singleton.h"
 #include "base/threading/thread_restrictions.h"
 #include "base/values.h"
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/browser_thread.h"
 #include "chrome/browser/dom_ui/chrome_url_data_manager.h"
 #include "chrome/browser/printing/cloud_print/cloud_print_url.h"
 #include "chrome/browser/renderer_host/render_view_host.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/test/in_process_browser_test.h"
 #include "chrome/test/ui_test_utils.h"
 #include "net/url_request/url_request_filter.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"
 
 namespace {
 
 class TestData {
  public:
   static TestData* GetInstance() {
     return Singleton<TestData>::get();
   }
 
   const char* GetTestData() {
@@ skipping 212 matching lines @@
 
   std::wstring window_print(L"window.print()");
   browser()->GetSelectedTabContents()->render_view_host()->
       ExecuteJavascriptInWebFrame(std::wstring(), window_print);
 
   ui_test_utils::RunMessageLoop();
 
   ASSERT_TRUE(TestController::GetInstance()->result());
 }
 #endif