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

Side by Side Diff: chrome/browser/download/download_browsertest.cc

Issue 9814030: get rid of old options pages (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: more fixes Created 8 years, 9 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 | Annotate | Revision Log
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 <sstream> 5 #include <sstream>
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/bind_helpers.h" 8 #include "base/bind_helpers.h"
9 #include "base/file_path.h" 9 #include "base/file_path.h"
10 #include "base/file_util.h" 10 #include "base/file_util.h"
(...skipping 1571 matching lines...) Expand 10 before | Expand all | Expand 10 after
1582 EXPECT_EQ(DownloadItem::COMPLETE, info.state); 1582 EXPECT_EQ(DownloadItem::COMPLETE, info.state);
1583 } 1583 }
1584 1584
1585 // Test for crbug.com/14505. This tests that chrome:// urls are still functional 1585 // Test for crbug.com/14505. This tests that chrome:// urls are still functional
1586 // after download of a file while viewing another chrome://. 1586 // after download of a file while viewing another chrome://.
1587 IN_PROC_BROWSER_TEST_F(DownloadTest, ChromeURLAfterDownload) { 1587 IN_PROC_BROWSER_TEST_F(DownloadTest, ChromeURLAfterDownload) {
1588 ASSERT_TRUE(InitialSetup(false)); 1588 ASSERT_TRUE(InitialSetup(false));
1589 FilePath file(FILE_PATH_LITERAL("download-test1.lib")); 1589 FilePath file(FILE_PATH_LITERAL("download-test1.lib"));
1590 GURL download_url(URLRequestMockHTTPJob::GetMockUrl(file)); 1590 GURL download_url(URLRequestMockHTTPJob::GetMockUrl(file));
1591 GURL flags_url(chrome::kChromeUIFlagsURL); 1591 GURL flags_url(chrome::kChromeUIFlagsURL);
1592 GURL extensions_url(GURL(std::string(chrome::kChromeUISettingsURL) + 1592 GURL extensions_url(chrome::kChromeUIExtensionsFrameURL);
1593 chrome::kExtensionsSubPage));
1594 1593
1595 ui_test_utils::NavigateToURL(browser(), flags_url); 1594 ui_test_utils::NavigateToURL(browser(), flags_url);
1596 DownloadAndWait(browser(), download_url, EXPECT_NO_SELECT_DIALOG); 1595 DownloadAndWait(browser(), download_url, EXPECT_NO_SELECT_DIALOG);
1597 ui_test_utils::NavigateToURL(browser(), extensions_url); 1596 ui_test_utils::NavigateToURL(browser(), extensions_url);
1598 WebContents* contents = browser()->GetSelectedWebContents(); 1597 WebContents* contents = browser()->GetSelectedWebContents();
1599 ASSERT_TRUE(contents); 1598 ASSERT_TRUE(contents);
1600 bool webui_responded = false; 1599 bool webui_responded = false;
1601 EXPECT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractBool( 1600 EXPECT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractBool(
1602 contents->GetRenderViewHost(), 1601 contents->GetRenderViewHost(),
1603 L"", 1602 L"",
(...skipping 856 matching lines...) Expand 10 before | Expand all | Expand 10 after
2460 2459
2461 DownloadTestObserver* observer(DangerousDownloadWaiter( 2460 DownloadTestObserver* observer(DangerousDownloadWaiter(
2462 browser(), 1, DownloadTestObserver::ON_DANGEROUS_DOWNLOAD_ACCEPT)); 2461 browser(), 1, DownloadTestObserver::ON_DANGEROUS_DOWNLOAD_ACCEPT));
2463 ui_test_utils::NavigateToURL(browser(), blob_url); 2462 ui_test_utils::NavigateToURL(browser(), blob_url);
2464 observer->WaitForFinished(); 2463 observer->WaitForFinished();
2465 blob_controller->RemoveBlob(blob_url); 2464 blob_controller->RemoveBlob(blob_url);
2466 2465
2467 EXPECT_EQ(1u, observer->NumDownloadsSeenInState(DownloadItem::COMPLETE)); 2466 EXPECT_EQ(1u, observer->NumDownloadsSeenInState(DownloadItem::COMPLETE));
2468 EXPECT_EQ(1u, observer->NumDangerousDownloadsSeen()); 2467 EXPECT_EQ(1u, observer->NumDangerousDownloadsSeen());
2469 } 2468 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698