Salient parts of http://codereview.chromium.org/8392042/

content/browser/download/save_package_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>
 
 #include "base/file_path.h"
 #include "base/path_service.h"
 #include "base/scoped_temp_dir.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
-#include "content/browser/browser_thread.h"
 #include "content/browser/download/save_package.h"
 #include "content/browser/net/url_request_mock_http_job.h"
 #include "content/browser/renderer_host/test_render_view_host.h"
 #include "content/browser/tab_contents/test_tab_contents.h"
+#include "content/test/test_browser_thread.h"
 #include "googleurl/src/gurl.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 #define FPL FILE_PATH_LITERAL
 #if defined(OS_WIN)
 #define HTML_EXTENSION ".htm"
 // This second define is needed because MSVC is broken.
 #define FPL_HTML_EXTENSION L".htm"
 #else
 #define HTML_EXTENSION ".html"
@@ skipping 85 matching lines @@
       long_file_name += long_file_name;
     long_file_name.resize(
         kMaxFilePathLength - 9 - temp_dir_.path().value().length());
 
     save_package_fail_ = new SavePackage(contents(),
         temp_dir_.path().AppendASCII(long_file_name + HTML_EXTENSION),
         temp_dir_.path().AppendASCII(long_file_name + "_files"));
   }
 
  private:
-  BrowserThread browser_thread_;
+  content::TestBrowserThread browser_thread_;
 
   // SavePackage for successfully generating file name.
   scoped_refptr<SavePackage> save_package_success_;
   // SavePackage for failed generating file name.
   scoped_refptr<SavePackage> save_package_fail_;
 
   ScopedTempDir temp_dir_;
 
   DISALLOW_COPY_AND_ASSIGN(SavePackageTest);
 };
@@ skipping 284 matching lines @@
 TEST_F(SavePackageTest, TestGetUrlToBeSavedViewSource) {
   FilePath file_name(FILE_PATH_LITERAL("a.htm"));
   GURL view_source_url = URLRequestMockHTTPJob::GetMockViewSourceUrl(
                              FilePath(kTestDir).Append(file_name));
   GURL actual_url = URLRequestMockHTTPJob::GetMockUrl(
                         FilePath(kTestDir).Append(file_name));
   NavigateAndCommit(view_source_url);
   EXPECT_EQ(actual_url, GetUrlToBeSaved());
   EXPECT_EQ(view_source_url, contents()->GetURL());
 }