chrome/browser/ui/webui/test_chrome_web_ui_factory_browsertest.cc - Issue 9224002: Make WebUI objects not derive from WebUI. WebUI objects own the controller. This is the ownership...

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/ui/webui/test_chrome_web_ui_factory_browsertest.cc

Issue 9224002: Make WebUI objects not derive from WebUI. WebUI objects own the controller. This is the ownership... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/

Patch Set: sync to head to clear linux_chromeos browsertest failures Created 8 years, 11 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/ui/webui/test_chrome_web_ui_factory.cc ('k') | chrome/browser/ui/webui/tracing_ui.h » ('j') | content/browser/tab_contents/render_view_host_manager_unittest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/webui/test_chrome_web_ui_factory_browsertest.cc

===================================================================

--- chrome/browser/ui/webui/test_chrome_web_ui_factory_browsertest.cc (revision 117871)

+++ chrome/browser/ui/webui/test_chrome_web_ui_factory_browsertest.cc (working copy)

@@ -12,6 +12,7 @@

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

using content::WebContents;

+using content::WebUIController;

using ::testing::_;

using ::testing::Eq;

using ::testing::StrictMock;

@@ -20,15 +21,14 @@

// Returns a new WebUI object for the TabContents from |arg0|.

ACTION(ReturnNewWebUI) {

- static content::WebUIController temp_controller;

- return new WebUI(arg0, &temp_controller);

+ return new WebUIController(arg0);

}

// Mock the TestChromeWebUIFactory::WebUIProvider to prove that we are called as

// expected.

class MockWebUIProvider : public TestChromeWebUIFactory::WebUIProvider {

public:

- MOCK_METHOD2(NewWebUI, WebUI*(WebContents* tab_contents, const GURL& url));

+ MOCK_METHOD2(NewWebUI, WebUIController*(WebUI* web_ui, const GURL& url));

};

// Dummy URL location for us to override.