chrome/browser/ui/webui/web_component_test_ui.cc - Issue 1124873002: Mocha adapter for Polymer browser tests.

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

Issue 1124873002: Mocha adapter for Polymer browser tests. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Split out non-mocha stuff Created 5 years, 7 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

« chrome/browser/browser_resources.grd ('K') | « chrome/browser/ui/webui/web_component_test_ui.h ('k') | chrome/chrome_tests.gypi » ('j') | chrome/test/data/webui/mocha_adapter.js » ('J')

OLD	NEW
1 // Copyright 2015 The Chromium Authors. All rights reserved.	1 // Copyright 2015 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/web_component_test_ui.h"	5 #include "chrome/browser/ui/webui/web_component_test_ui.h"

6	6

7 #include "base/values.h"	7 #include "base/values.h"

8 #include "chrome/browser/profiles/profile.h"	8 #include "chrome/browser/profiles/profile.h"

9 #include "chrome/common/url_constants.h"	9 #include "chrome/common/url_constants.h"

10 #include "content/public/browser/web_ui.h"	10 #include "content/public/browser/web_ui.h"

11 #include "content/public/browser/web_ui_data_source.h"	11 #include "content/public/browser/web_ui_data_source.h"

12 #include "grit/browser_resources.h"	12 #include "grit/browser_resources.h"

13	13

14 WebComponentTestUI::WebComponentTestUI(content::WebUI* web_ui)	14 WebComponentTestUI::WebComponentTestUI(content::WebUI* web_ui)

15 : WebUIController(web_ui) {	15 : WebUIController(web_ui) {

16 content::WebUIDataSource* source =	16 content::WebUIDataSource* source =

17 content::WebUIDataSource::Create(chrome::kChromeUIWebComponentTestHost);	17 content::WebUIDataSource::Create(chrome::kChromeUIWebComponentTestHost);

	18 source->AddResourcePath("mocha.js", IDR_MOCHA_JS);

	19 source->AddResourcePath("mocha_adapter.js", IDR_MOCHA_ADAPTER_JS);

18 source->SetDefaultResource(IDR_WEB_COMPONENT_TEST_HTML);	20 source->SetDefaultResource(IDR_WEB_COMPONENT_TEST_HTML);

19	21

20 content::WebUIDataSource::Add(Profile::FromWebUI(web_ui), source);	22 content::WebUIDataSource::Add(Profile::FromWebUI(web_ui), source);

21 }	23 }

OLD	NEW