diff options
| author | aa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-02-05 22:51:54 +0000 |
|---|---|---|
| committer | aa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-02-05 22:51:54 +0000 |
| commit | d2a69e2fccc65e8c74b770343cecad7a1136f9fd (patch) | |
| tree | efc684e21d7ef65d72dcb31fba6a01184df8407b /chrome/test | |
| parent | a60551c712b36d6241c234cd81ae2a847f323ec5 (diff) | |
| download | chromium_src-d2a69e2fccc65e8c74b770343cecad7a1136f9fd.zip chromium_src-d2a69e2fccc65e8c74b770343cecad7a1136f9fd.tar.gz chromium_src-d2a69e2fccc65e8c74b770343cecad7a1136f9fd.tar.bz2 | |
Integrate URLPattern with Extension user scripts.
Also refactored the UserScript class in
UserScriptSlave and the UserScriptInfo structure
in UserScriptMaster into a common location.
Review URL: http://codereview.chromium.org/21070
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@9270 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test')
| -rw-r--r-- | chrome/test/unit/unit_tests.scons | 2 | ||||
| -rw-r--r-- | chrome/test/unit/unittests.vcproj | 24 |
2 files changed, 13 insertions, 13 deletions
diff --git a/chrome/test/unit/unit_tests.scons b/chrome/test/unit/unit_tests.scons index 4a2c333..f980ec1 100644 --- a/chrome/test/unit/unit_tests.scons +++ b/chrome/test/unit/unit_tests.scons @@ -205,6 +205,7 @@ input_files = ChromeFileList([ '$CHROME_DIR/common/bzip2_unittest.cc', '$CHROME_DIR/common/chrome_plugin_unittest.cc', '$CHROME_DIR/common/extensions/url_pattern_unittest.cc', + '$CHROME_DIR/common/extensions/user_script_unittest.cc', '$CHROME_DIR/common/gfx/emf_unittest.cc', '$CHROME_DIR/common/gfx/icon_util_unittest.cc', '$CHROME_DIR/common/ipc_message_unittest.cc', @@ -252,7 +253,6 @@ input_files = ChromeFileList([ '$CHROME_DIR/renderer/net/render_dns_queue_unittest.cc', '$CHROME_DIR/renderer/render_view_unittest.cc', '$CHROME_DIR/renderer/render_widget_unittest.cc', - '$CHROME_DIR/renderer/user_script_slave_unittest.cc', '$CHROME_DIR/renderer/render_process_unittest.cc', '$CHROME_DIR/renderer/render_thread_unittest.cc', diff --git a/chrome/test/unit/unittests.vcproj b/chrome/test/unit/unittests.vcproj index 70c9d65..89f6c66 100644 --- a/chrome/test/unit/unittests.vcproj +++ b/chrome/test/unit/unittests.vcproj @@ -603,6 +603,14 @@ > </File> <File + RelativePath="..\..\browser\net\resolve_proxy_msg_helper_unittest.cc" + > + </File> + <File + RelativePath="..\..\browser\net\resolve_proxy_msg_helper_unittest.h" + > + </File> + <File RelativePath="..\..\browser\renderer_host\resource_dispatcher_host_unittest.cc" > </File> @@ -711,14 +719,6 @@ > </File> <File - RelativePath="..\..\browser\net\resolve_proxy_msg_helper_unittest.cc" - > - </File> - <File - RelativePath="..\..\browser\net\resolve_proxy_msg_helper_unittest.h" - > - </File> - <File RelativePath="..\..\browser\extensions\user_script_master_unittest.cc" > </File> @@ -830,10 +830,6 @@ RelativePath="..\..\renderer\render_widget_unittest.cc" > </File> - <File - RelativePath="..\..\renderer\user_script_slave_unittest.cc" - > - </File> <Filter Name="test_infrastructure" > @@ -943,6 +939,10 @@ > </File> <File + RelativePath="..\..\common\extensions\user_script_unittest.cc" + > + </File> + <File RelativePath="..\..\common\win_util_unittest.cc" > </File> |