Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3358)

Unified Diff: chrome/browser/browser_resources.grd

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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/browser_resources.grd
diff --git a/chrome/browser/browser_resources.grd b/chrome/browser/browser_resources.grd
index 8f4d696f6d843516a09190c933c87e2e10b97660..4329d17f5e0ee006ef669ad64b5bd072e1b08376 100644
--- a/chrome/browser/browser_resources.grd
+++ b/chrome/browser/browser_resources.grd
@@ -206,6 +206,8 @@
<include name="IDR_LOCAL_NTP_DESIGN_JS" file="resources\local_ntp\local_ntp_design.js" flattenhtml="true" type="BINDATA" />
<include name="IDR_LOCAL_STATE_HTML" file="resources\local_state\local_state.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" />
<include name="IDR_LOCAL_STATE_JS" file="resources\local_state\local_state.js" flattenhtml="true" allowexternalscript="true" type="BINDATA" />
+ <include name="IDR_MOCHA_ADAPTER_JS" file="..\test\data\webui\mocha_adapter.js" flattenhtml="true" type="chrome_html" />
+ <include name="IDR_MOCHA_JS" file="..\..\third_party\mocha\mocha.js" flattenhtml="true" type="chrome_html" />
michaelpg 2015/05/05 12:23:54 I don't feel good about adding these to browser_re
stevenjb 2015/05/05 22:30:28 Yeah, this seems weird, but I don't know what the
michaelpg 2015/05/14 19:08:48 We could exclude these from branding=Chrome builds
<include name="IDR_MOST_VISITED_IFRAME_CSS" file="resources\local_ntp\most_visited_iframe.css" type="BINDATA" />
<include name="IDR_MOST_VISITED_TITLE_HTML" file="resources\local_ntp\most_visited_title.html" type="BINDATA" />
<include name="IDR_MOST_VISITED_TITLE_CSS" file="resources\local_ntp\most_visited_title.css" type="BINDATA" />
« no previous file with comments | « no previous file | chrome/browser/resources/web_component_test.html » ('j') | chrome/test/data/webui/mocha_adapter.js » ('J')

Powered by Google App Engine
This is Rietveld 408576698