From 0938d3cb82dfd2424117f73573e757424ebede00 Mon Sep 17 00:00:00 2001 From: "aa@chromium.org" Date: Fri, 9 Jan 2009 20:37:35 +0000 Subject: This is a rename of the term 'Greasemonkey' to 'user script' in Chromium. I'm doing this to avoid confusion with the Firefox version of Greasemonkey and also because 'user script' is really the correct generic term. At the same time, I also moved user_script_master* into extensions/ because I want these two pieces to get closer and closer such that standalone user scripts are just a very small extension. Also extensions will be relying on most of the user script code. Review URL: http://codereview.chromium.org/17281 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@7827 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/test/testing_profile.h | 2 +- chrome/test/unit/unit_tests.scons | 4 ++-- chrome/test/unit/unittests.vcproj | 16 ++++++---------- 3 files changed, 9 insertions(+), 13 deletions(-) (limited to 'chrome/test') diff --git a/chrome/test/testing_profile.h b/chrome/test/testing_profile.h index c99b51c..37e6c17 100644 --- a/chrome/test/testing_profile.h +++ b/chrome/test/testing_profile.h @@ -70,7 +70,7 @@ class TestingProfile : public Profile { virtual ExtensionsService* GetExtensionsService() { return NULL; } - virtual GreasemonkeyMaster* GetGreasemonkeyMaster() { + virtual UserScriptMaster* GetUserScriptMaster() { return NULL; } virtual HistoryService* GetHistoryService(ServiceAccessType access) { diff --git a/chrome/test/unit/unit_tests.scons b/chrome/test/unit/unit_tests.scons index 4fe3332..a192cab 100644 --- a/chrome/test/unit/unit_tests.scons +++ b/chrome/test/unit/unit_tests.scons @@ -114,7 +114,7 @@ unit_test_files.extend([ '$CHROME_DIR/common/l10n_util_unittest.cc', '$CHROME_DIR/common/property_bag_unittest.cc', '$CHROME_DIR/common/unzip_unittest.cc', - '$CHROME_DIR/renderer/greasemonkey_slave_unittest.cc', + '$CHROME_DIR/renderer/user_script_slave_unittest.cc', '$CHROME_DIR/browser/history/visit_database_unittest.cc', ]) @@ -170,9 +170,9 @@ if env.Bit('windows'): '$CHROME_DIR/browser/download/download_manager_unittest.cc', '$CHROME_DIR/browser/download/download_request_manager_unittest.cc', '$CHROME_DIR/browser/download/save_package_unittest.cc', + '$CHROME_DIR/browser/extensions/user_script_master_unittest.cc', '$CHROME_DIR/browser/encryptor_unittest.cc', '$CHROME_DIR/browser/google_url_tracker_unittest.cc', - '$CHROME_DIR/browser/greasemonkey_master_unittest.cc', '$CHROME_DIR/browser/history/expire_history_backend_unittest.cc', '$CHROME_DIR/browser/history/history_backend_unittest.cc', '$CHROME_DIR/browser/history/history_querying_unittest.cc', diff --git a/chrome/test/unit/unittests.vcproj b/chrome/test/unit/unittests.vcproj index d8baadc..448a848 100644 --- a/chrome/test/unit/unittests.vcproj +++ b/chrome/test/unit/unittests.vcproj @@ -1055,30 +1055,26 @@ - - -- cgit v1.1