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

Side by Side Diff: chrome/browser/extensions/api/downloads/downloads_api_browsertest.cc

Issue 2248873002: Convert WindowOpenDisposition to an enum class. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase. Created 4 years, 3 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
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 // Disable everything on windows only. http://crbug.com/306144 5 // Disable everything on windows only. http://crbug.com/306144
6 #ifndef OS_WIN 6 #ifndef OS_WIN
7 7
8 #include <stddef.h> 8 #include <stddef.h>
9 #include <stdint.h> 9 #include <stdint.h>
10 10
(...skipping 479 matching lines...) Expand 10 before | Expand all | Expand 10 after
490 } 490 }
491 } 491 }
492 return new_item; 492 return new_item;
493 } 493 }
494 494
495 void FinishPendingSlowDownloads() { 495 void FinishPendingSlowDownloads() {
496 std::unique_ptr<content::DownloadTestObserver> observer( 496 std::unique_ptr<content::DownloadTestObserver> observer(
497 CreateDownloadObserver(1)); 497 CreateDownloadObserver(1));
498 GURL finish_url(net::URLRequestSlowDownloadJob::kFinishDownloadUrl); 498 GURL finish_url(net::URLRequestSlowDownloadJob::kFinishDownloadUrl);
499 ui_test_utils::NavigateToURLWithDisposition( 499 ui_test_utils::NavigateToURLWithDisposition(
500 current_browser(), finish_url, NEW_FOREGROUND_TAB, 500 current_browser(), finish_url,
501 WindowOpenDisposition::NEW_FOREGROUND_TAB,
501 ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION); 502 ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
502 observer->WaitForFinished(); 503 observer->WaitForFinished();
503 EXPECT_EQ(1u, observer->NumDownloadsSeenInState(DownloadItem::COMPLETE)); 504 EXPECT_EQ(1u, observer->NumDownloadsSeenInState(DownloadItem::COMPLETE));
504 } 505 }
505 506
506 content::DownloadTestObserver* CreateDownloadObserver(size_t download_count) { 507 content::DownloadTestObserver* CreateDownloadObserver(size_t download_count) {
507 return new content::DownloadTestObserverTerminal( 508 return new content::DownloadTestObserverTerminal(
508 GetCurrentManager(), download_count, 509 GetCurrentManager(), download_count,
509 content::DownloadTestObserver::ON_DANGEROUS_DOWNLOAD_FAIL); 510 content::DownloadTestObserver::ON_DANGEROUS_DOWNLOAD_FAIL);
510 } 511 }
(...skipping 3517 matching lines...) Expand 10 before | Expand all | Expand 10 after
4028 std::unique_ptr<content::DownloadTestObserver> observer( 4029 std::unique_ptr<content::DownloadTestObserver> observer(
4029 new JustInProgressDownloadObserver(manager, 1)); 4030 new JustInProgressDownloadObserver(manager, 1));
4030 ASSERT_EQ(0, manager->InProgressCount()); 4031 ASSERT_EQ(0, manager->InProgressCount());
4031 ASSERT_EQ(0, manager->NonMaliciousInProgressCount()); 4032 ASSERT_EQ(0, manager->NonMaliciousInProgressCount());
4032 // Tabs created just for a download are automatically closed, invalidating 4033 // Tabs created just for a download are automatically closed, invalidating
4033 // the download's WebContents. Downloads without WebContents cannot be 4034 // the download's WebContents. Downloads without WebContents cannot be
4034 // resumed. http://crbug.com/225901 4035 // resumed. http://crbug.com/225901
4035 ui_test_utils::NavigateToURLWithDisposition( 4036 ui_test_utils::NavigateToURLWithDisposition(
4036 current_browser(), 4037 current_browser(),
4037 GURL(net::URLRequestSlowDownloadJob::kUnknownSizeUrl), 4038 GURL(net::URLRequestSlowDownloadJob::kUnknownSizeUrl),
4038 CURRENT_TAB, 4039 WindowOpenDisposition::CURRENT_TAB, ui_test_utils::BROWSER_TEST_NONE);
4039 ui_test_utils::BROWSER_TEST_NONE);
4040 observer->WaitForFinished(); 4040 observer->WaitForFinished();
4041 EXPECT_EQ(1u, observer->NumDownloadsSeenInState(DownloadItem::IN_PROGRESS)); 4041 EXPECT_EQ(1u, observer->NumDownloadsSeenInState(DownloadItem::IN_PROGRESS));
4042 DownloadManager::DownloadVector items; 4042 DownloadManager::DownloadVector items;
4043 manager->GetAllDownloads(&items); 4043 manager->GetAllDownloads(&items);
4044 for (DownloadManager::DownloadVector::iterator iter = items.begin(); 4044 for (DownloadManager::DownloadVector::iterator iter = items.begin();
4045 iter != items.end(); ++iter) { 4045 iter != items.end(); ++iter) {
4046 if ((*iter)->GetState() == DownloadItem::IN_PROGRESS) { 4046 if ((*iter)->GetState() == DownloadItem::IN_PROGRESS) {
4047 // There should be only one IN_PROGRESS item. 4047 // There should be only one IN_PROGRESS item.
4048 EXPECT_EQ(NULL, item); 4048 EXPECT_EQ(NULL, item);
4049 item = *iter; 4049 item = *iter;
(...skipping 18 matching lines...) Expand all
4068 " \"incognito\": false," 4068 " \"incognito\": false,"
4069 " \"filename\":\"download-unknown-size\"}]", 4069 " \"filename\":\"download-unknown-size\"}]",
4070 item->GetId()))); 4070 item->GetId())));
4071 ASSERT_TRUE(item->GetTargetFilePath().empty()); 4071 ASSERT_TRUE(item->GetTargetFilePath().empty());
4072 ASSERT_EQ(DownloadItem::IN_PROGRESS, item->GetState()); 4072 ASSERT_EQ(DownloadItem::IN_PROGRESS, item->GetState());
4073 4073
4074 ClearEvents(); 4074 ClearEvents();
4075 ui_test_utils::NavigateToURLWithDisposition( 4075 ui_test_utils::NavigateToURLWithDisposition(
4076 current_browser(), 4076 current_browser(),
4077 GURL(net::URLRequestSlowDownloadJob::kErrorDownloadUrl), 4077 GURL(net::URLRequestSlowDownloadJob::kErrorDownloadUrl),
4078 NEW_BACKGROUND_TAB, 4078 WindowOpenDisposition::NEW_BACKGROUND_TAB,
4079 ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION); 4079 ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
4080 4080
4081 // Errors caught before filename determination are delayed until after 4081 // Errors caught before filename determination are delayed until after
4082 // filename determination. 4082 // filename determination.
4083 std::string error; 4083 std::string error;
4084 ASSERT_TRUE(ExtensionDownloadsEventRouter::DetermineFilename( 4084 ASSERT_TRUE(ExtensionDownloadsEventRouter::DetermineFilename(
4085 current_browser()->profile(), 4085 current_browser()->profile(),
4086 false, 4086 false,
4087 GetExtensionId(), 4087 GetExtensionId(),
4088 item->GetId(), 4088 item->GetId(),
(...skipping 218 matching lines...) Expand 10 before | Expand all | Expand 10 after
4307 EXPECT_EQ(downloads::FILENAME_CONFLICT_ACTION_PROMPT, conflict_action); 4307 EXPECT_EQ(downloads::FILENAME_CONFLICT_ACTION_PROMPT, conflict_action);
4308 EXPECT_FALSE(warnings.empty()); 4308 EXPECT_FALSE(warnings.empty());
4309 EXPECT_EQ(Warning::kDownloadFilenameConflict, 4309 EXPECT_EQ(Warning::kDownloadFilenameConflict,
4310 warnings.begin()->warning_type()); 4310 warnings.begin()->warning_type());
4311 EXPECT_EQ("incumbent", warnings.begin()->extension_id()); 4311 EXPECT_EQ("incumbent", warnings.begin()->extension_id());
4312 } 4312 }
4313 4313
4314 } // namespace extensions 4314 } // namespace extensions
4315 4315
4316 #endif // http://crbug.com/306144 4316 #endif // http://crbug.com/306144
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698