Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(42)

Side by Side Diff: content/browser/download/save_package_unittest.cc

Issue 2168403003: Avoid file IO on UI thread by moving more save-page-as stuff to the FILE thread. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Comment tweaks for base::nix::GetFileMimeType + two extra DCHECK_CURRENTLY_ON asserts in SavePackag… Created 4 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « content/browser/download/save_package.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include <stddef.h> 5 #include <stddef.h>
6 #include <stdint.h> 6 #include <stdint.h>
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/files/file_path.h" 10 #include "base/files/file_path.h"
(...skipping 401 matching lines...) Expand 10 before | Expand all | Expand 10 after
412 // Crashing on Windows, see http://crbug.com/79365 412 // Crashing on Windows, see http://crbug.com/79365
413 #if defined(OS_WIN) 413 #if defined(OS_WIN)
414 #define MAYBE_TestSuggestedSaveNames DISABLED_TestSuggestedSaveNames 414 #define MAYBE_TestSuggestedSaveNames DISABLED_TestSuggestedSaveNames
415 #else 415 #else
416 #define MAYBE_TestSuggestedSaveNames TestSuggestedSaveNames 416 #define MAYBE_TestSuggestedSaveNames TestSuggestedSaveNames
417 #endif 417 #endif
418 TEST_F(SavePackageTest, MAYBE_TestSuggestedSaveNames) { 418 TEST_F(SavePackageTest, MAYBE_TestSuggestedSaveNames) {
419 GURL url = net::URLRequestMockHTTPJob::GetMockUrl("save_page/a.htm"); 419 GURL url = net::URLRequestMockHTTPJob::GetMockUrl("save_page/a.htm");
420 NavigateAndCommit(url); 420 NavigateAndCommit(url);
421 for (size_t i = 0; i < arraysize(kSuggestedSaveNames); ++i) { 421 for (size_t i = 0; i < arraysize(kSuggestedSaveNames); ++i) {
422 scoped_refptr<SavePackage> save_package(new SavePackage(contents())); 422 base::FilePath save_name = SavePackage::GetSuggestedNameForSaveAs(
423 save_package->page_url_ = GURL(kSuggestedSaveNames[i].page_url); 423 kSuggestedSaveNames[i].page_title,
424 save_package->title_ = kSuggestedSaveNames[i].page_title; 424 GURL(kSuggestedSaveNames[i].page_url),
425
426 base::FilePath save_name = save_package->GetSuggestedNameForSaveAs(
427 kSuggestedSaveNames[i].ensure_html_extension, std::string()); 425 kSuggestedSaveNames[i].ensure_html_extension, std::string());
428 EXPECT_EQ(kSuggestedSaveNames[i].expected_name, save_name.value()) << 426 EXPECT_EQ(kSuggestedSaveNames[i].expected_name, save_name.value()) <<
429 "Test case " << i; 427 "Test case " << i;
430 } 428 }
431 } 429 }
432 430
433 // GetUrlToBeSaved method should return correct url to be saved. 431 // GetUrlToBeSaved method should return correct url to be saved.
434 TEST_F(SavePackageTest, TestGetUrlToBeSaved) { 432 TEST_F(SavePackageTest, TestGetUrlToBeSaved) {
435 GURL url = net::URLRequestMockHTTPJob::GetMockUrl("save_page/a.htm"); 433 GURL url = net::URLRequestMockHTTPJob::GetMockUrl("save_page/a.htm");
436 NavigateAndCommit(url); 434 NavigateAndCommit(url);
437 EXPECT_EQ(url, GetUrlToBeSaved()); 435 EXPECT_EQ(url, GetUrlToBeSaved());
438 } 436 }
439 437
440 // GetUrlToBeSaved method sould return actual url to be saved, 438 // GetUrlToBeSaved method sould return actual url to be saved,
441 // instead of the displayed url used to view source of a page. 439 // instead of the displayed url used to view source of a page.
442 // Ex:GetUrlToBeSaved method should return http://www.google.com 440 // Ex:GetUrlToBeSaved method should return http://www.google.com
443 // when user types view-source:http://www.google.com 441 // when user types view-source:http://www.google.com
444 TEST_F(SavePackageTest, TestGetUrlToBeSavedViewSource) { 442 TEST_F(SavePackageTest, TestGetUrlToBeSavedViewSource) {
445 GURL mock_url = net::URLRequestMockHTTPJob::GetMockUrl("save_page/a.htm"); 443 GURL mock_url = net::URLRequestMockHTTPJob::GetMockUrl("save_page/a.htm");
446 GURL view_source_url = 444 GURL view_source_url =
447 GURL(kViewSourceScheme + std::string(":") + mock_url.spec()); 445 GURL(kViewSourceScheme + std::string(":") + mock_url.spec());
448 GURL actual_url = net::URLRequestMockHTTPJob::GetMockUrl("save_page/a.htm"); 446 GURL actual_url = net::URLRequestMockHTTPJob::GetMockUrl("save_page/a.htm");
449 NavigateAndCommit(view_source_url); 447 NavigateAndCommit(view_source_url);
450 EXPECT_EQ(actual_url, GetUrlToBeSaved()); 448 EXPECT_EQ(actual_url, GetUrlToBeSaved());
451 EXPECT_EQ(view_source_url, contents()->GetLastCommittedURL()); 449 EXPECT_EQ(view_source_url, contents()->GetLastCommittedURL());
452 } 450 }
453 451
454 } // namespace content 452 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/download/save_package.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698