chrome/browser/download/download_browsertest.cc - Issue 562603002: Move PageTransition from //content/public/common to //ui/base

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/download/download_browsertest.cc

Issue 562603002: Move PageTransition from //content/public/common to //ui/base (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Rebase Created 6 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/download/chrome_download_manager_delegate_unittest.cc ('k') | chrome/browser/download/download_request_limiter.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/download/download_browsertest.cc

diff --git a/chrome/browser/download/download_browsertest.cc b/chrome/browser/download/download_browsertest.cc

index 316d7e72ef54acf45732a2d6e34580fa604db7a2..b939bf02d2852cc1f14b5844f509648690dfb439 100644

--- a/chrome/browser/download/download_browsertest.cc

+++ b/chrome/browser/download/download_browsertest.cc

@@ -78,7 +78,6 @@

#include "content/public/browser/web_contents.h"

#include "content/public/common/content_switches.h"

#include "content/public/common/context_menu_params.h"

-#include "content/public/common/page_transition_types.h"

#include "content/public/test/browser_test_utils.h"

#include "content/public/test/download_test_observer.h"

#include "content/public/test/test_file_error_injector.h"

@@ -91,6 +90,7 @@

#include "net/test/url_request/url_request_mock_http_job.h"

#include "testing/gtest/include/gtest/gtest.h"

#include "ui/base/l10n/l10n_util.h"

+#include "ui/base/page_transition_types.h"

#if defined(FULL_SAFE_BROWSING)

#include "chrome/browser/safe_browsing/download_feedback_service.h"

@@ -1342,7 +1342,7 @@ IN_PROC_BROWSER_TEST_F(DownloadTest, PerWindowShelf) {

EXPECT_NE(static_cast<WebContents*>(NULL),

chrome::AddSelectedTabWithURL(browser(),

GURL(url::kAboutBlankURL),

- content::PAGE_TRANSITION_TYPED));

+ ui::PAGE_TRANSITION_TYPED));

EXPECT_EQ(2, browser()->tab_strip_model()->count());

EXPECT_TRUE(browser()->window()->IsDownloadShelfVisible());