chrome/browser/ui/webui/web_ui_browsertest.cc - Issue 11885021: Don't derive from ChromeURLDataManager::DataSource, and instead have these classes implement a dele…

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/web_ui_browsertest.cc

Issue 11885021: Don't derive from ChromeURLDataManager::DataSource, and instead have these classes implement a dele… (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/

Patch Set: nits Created 7 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

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

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

--- chrome/browser/ui/webui/web_ui_browsertest.cc (revision 176443)

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

@@ -28,6 +28,7 @@

#include "chrome/test/base/test_tab_strip_model_observer.h"

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

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

+#include "content/public/browser/url_data_source_delegate.h"

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

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

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

@@ -267,21 +268,24 @@

// page is shown. While this doesn't matter for most tests, without it,

// navigation to different anchors cannot be listened to (via the hashchange

// event).

-class MockWebUIDataSource : public ChromeURLDataManager::DataSource {

+class MockWebUIDataSource : public content::URLDataSourceDelegate {

public:

- MockWebUIDataSource()

- : ChromeURLDataManager::DataSource("dummyurl", MessageLoop::current()) {}

+ MockWebUIDataSource() {}

private:

virtual ~MockWebUIDataSource() {}

+ virtual std::string GetSource() OVERRIDE {

+ return "dummyurl";

+ }

virtual void StartDataRequest(const std::string& path,

bool is_incognito,

int request_id) OVERRIDE {

std::string dummy_html = "<html><body>Dummy</body></html>";

scoped_refptr<base::RefCountedString> response =

base::RefCountedString::TakeString(&dummy_html);

- SendResponse(request_id, response);

+ url_data_source()->SendResponse(request_id, response);

}

std::string GetMimeType(const std::string& path) const OVERRIDE {

« chrome/browser/ui/webui/bookmarks_ui.cc ('K') | « chrome/browser/ui/webui/theme_source_unittest.cc ('k') | content/content_browser.gypi » ('j') | no next file with comments »