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

Unified Diff: chrome_frame/test/chrome_frame_test_utils.h

Issue 2822016: [chrome_frame] Refactor/merge IE no interference tests with other mock event ... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 10 years, 5 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
« no previous file with comments | « chrome_frame/chrome_frame.gyp ('k') | chrome_frame/test/chrome_frame_test_utils.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome_frame/test/chrome_frame_test_utils.h
===================================================================
--- chrome_frame/test/chrome_frame_test_utils.h (revision 51968)
+++ chrome_frame/test/chrome_frame_test_utils.h (working copy)
@@ -345,6 +345,18 @@
// Returns the version of Internet Explorer on the machine.
IEVersion GetInstalledIEVersion();
+// Returns the folder for CF test data.
+FilePath GetTestDataFolder();
+
+// Returns the path portion of the url.
+std::wstring GetPathFromUrl(const std::wstring& url);
+
+// Returns the path and query portion of the url.
+std::wstring GetPathAndQueryFromUrl(const std::wstring& url);
+
+// Adds the CF meta tag to the html page. Returns true if successful.
+bool AddCFMetaTag(std::string* html_data);
+
// Posts a delayed task to send an extended keystroke |repeat| times with an
// optional modifier via SendInput. Following this, the enter key is sent.
void DelaySendExtendedKeysEnter(TimedMsgLoop* loop, int delay, char c,
@@ -369,20 +381,6 @@
}
};
-// Specialization of CComObjectStackEx that performs object cleanup via
-// calling Base::Uninitialize() before we get to CComObjectStackEx' destructor.
-// The CComObjectStackEx destructor expects the reference count to be 0
-// or it will throw an assert. To work around that and to avoid having to
-// explicitly call Uninitialize() at the end of every test, we override the
-// destructor here to perform the cleanup.
-template <class Base>
-class ComStackObjectWithUninitialize : public CComObjectStackEx<Base> {
- public:
- virtual ~ComStackObjectWithUninitialize() {
- Base::Uninitialize();
- }
-};
-
// Starts the Chrome crash service which enables us to gather crash dumps
// during test runs.
base::ProcessHandle StartCrashService();
« no previous file with comments | « chrome_frame/chrome_frame.gyp ('k') | chrome_frame/test/chrome_frame_test_utils.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698