chrome/browser/ui/webui/test_chrome_web_ui_controller_factory_browsertest.cc - Issue 12089051: Revert 179271

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

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

Side by Side Diff: chrome/browser/ui/webui/test_chrome_web_ui_controller_factory_browsertest.cc

Issue 12089051: Revert 179271 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: Created 7 years, 10 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

« no previous file with comments | « chrome/browser/ui/webui/test_chrome_web_ui_controller_factory.cc ('k') | chrome/browser/ui/webui/web_ui_browsertest.h » ('j') | no next file with comments »

OLD	NEW
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 "chrome/browser/ui/webui/test_chrome_web_ui_controller_factory.h"	5 #include "chrome/browser/ui/webui/test_chrome_web_ui_controller_factory.h"

6 #include "content/public/browser/web_ui_controller.h"	6 #include "content/public/browser/web_ui_controller.h"

7 #include "chrome/test/base/in_process_browser_test.h"	7 #include "chrome/test/base/in_process_browser_test.h"

8 #include "chrome/test/base/ui_test_utils.h"	8 #include "chrome/test/base/ui_test_utils.h"

9 #include "googleurl/src/gurl.h"	9 #include "googleurl/src/gurl.h"

10 #include "testing/gmock/include/gmock/gmock.h"	10 #include "testing/gmock/include/gmock/gmock.h"

(...skipping 53 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
64 IN_PROC_BROWSER_TEST_F(TestChromeWebUIControllerFactoryTest,	64 IN_PROC_BROWSER_TEST_F(TestChromeWebUIControllerFactoryTest,

65 TestWebUIProvider) {	65 TestWebUIProvider) {

66 const GURL kChromeTestChromeWebUIControllerFactoryURL(	66 const GURL kChromeTestChromeWebUIControllerFactoryURL(

67 kChromeTestChromeWebUIControllerFactory);	67 kChromeTestChromeWebUIControllerFactory);

68 EXPECT_CALL(mock_provider_,	68 EXPECT_CALL(mock_provider_,

69 NewWebUI(_, Eq(kChromeTestChromeWebUIControllerFactoryURL)))	69 NewWebUI(_, Eq(kChromeTestChromeWebUIControllerFactoryURL)))

70 .WillOnce(ReturnNewWebUI());	70 .WillOnce(ReturnNewWebUI());

71 ui_test_utils::NavigateToURL(browser(),	71 ui_test_utils::NavigateToURL(browser(),

72 kChromeTestChromeWebUIControllerFactoryURL);	72 kChromeTestChromeWebUIControllerFactoryURL);

73 }	73 }

OLD	NEW