summaryrefslogtreecommitdiffstats
path: root/chrome/browser/download/save_page_browsertest.cc
diff options
context:
space:
mode:
authorxunjieli <xunjieli@chromium.org>2014-09-10 16:23:31 -0700
committerCommit bot <commit-bot@chromium.org>2014-09-10 23:25:48 +0000
commit0332c191aa02efc6c24d0c87a1d41b7c12d3b8a8 (patch)
tree0b5ee639c7015db3dc82b42ffc5f5a32f81fbbc0 /chrome/browser/download/save_page_browsertest.cc
parentdb7726aee7993008dff742790337f950fb371ebf (diff)
downloadchromium_src-0332c191aa02efc6c24d0c87a1d41b7c12d3b8a8.zip
chromium_src-0332c191aa02efc6c24d0c87a1d41b7c12d3b8a8.tar.gz
chromium_src-0332c191aa02efc6c24d0c87a1d41b7c12d3b8a8.tar.bz2
Move url_request_mock_http_job to net/test/url_request/
This CL is a part of the effort to move mock URLRequestJob files from content/test/net to net/test/url_request/. The reason for this refactoring is that Cronet will need to use these classes for testing, so it will be nice if they can be in net/test, as the dependency can work out nicely. BUG= Review URL: https://codereview.chromium.org/541743002 Cr-Commit-Position: refs/heads/master@{#294255}
Diffstat (limited to 'chrome/browser/download/save_page_browsertest.cc')
-rw-r--r--chrome/browser/download/save_page_browsertest.cc9
1 files changed, 6 insertions, 3 deletions
diff --git a/chrome/browser/download/save_page_browsertest.cc b/chrome/browser/download/save_page_browsertest.cc
index ecaa125..ca000a4 100644
--- a/chrome/browser/download/save_page_browsertest.cc
+++ b/chrome/browser/download/save_page_browsertest.cc
@@ -37,16 +37,17 @@
#include "content/public/browser/notification_service.h"
#include "content/public/browser/notification_types.h"
#include "content/public/browser/web_contents.h"
+#include "content/public/common/url_constants.h"
#include "content/public/test/test_utils.h"
-#include "content/test/net/url_request_mock_http_job.h"
+#include "net/test/url_request/url_request_mock_http_job.h"
#include "testing/gtest/include/gtest/gtest.h"
using content::BrowserContext;
using content::BrowserThread;
using content::DownloadItem;
using content::DownloadManager;
-using content::URLRequestMockHTTPJob;
using content::WebContents;
+using net::URLRequestMockHTTPJob;
namespace {
@@ -499,8 +500,10 @@ IN_PROC_BROWSER_TEST_F(SavePageBrowserTest, MAYBE_SaveHTMLOnlyTabDestroy) {
#endif
IN_PROC_BROWSER_TEST_F(SavePageBrowserTest, MAYBE_SaveViewSourceHTMLOnly) {
base::FilePath file_name(FILE_PATH_LITERAL("a.htm"));
- GURL view_source_url = URLRequestMockHTTPJob::GetMockViewSourceUrl(
+ GURL mock_url = URLRequestMockHTTPJob::GetMockUrl(
base::FilePath(kTestDir).Append(file_name));
+ GURL view_source_url =
+ GURL(content::kViewSourceScheme + std::string(":") + mock_url.spec());
GURL actual_page_url = URLRequestMockHTTPJob::GetMockUrl(
base::FilePath(kTestDir).Append(file_name));
ui_test_utils::NavigateToURL(browser(), view_source_url);