summaryrefslogtreecommitdiffstats
path: root/chrome_frame/test/chrome_frame_unittests.cc
diff options
context:
space:
mode:
Diffstat (limited to 'chrome_frame/test/chrome_frame_unittests.cc')
-rw-r--r--chrome_frame/test/chrome_frame_unittests.cc24
1 files changed, 12 insertions, 12 deletions
diff --git a/chrome_frame/test/chrome_frame_unittests.cc b/chrome_frame/test/chrome_frame_unittests.cc
index 20826b1..d24f5b3 100644
--- a/chrome_frame/test/chrome_frame_unittests.cc
+++ b/chrome_frame/test/chrome_frame_unittests.cc
@@ -34,7 +34,7 @@ const wchar_t kDocRoot[] = L"chrome_frame\\test\\data";
const int kLongWaitTimeout = 60 * 1000;
const int kShortWaitTimeout = 25 * 1000;
-_ATL_FUNC_INFO WebBrowserEventSink::kNavigateErrorInfo = {
+_ATL_FUNC_INFO WebBrowserEventSink::kNavigateErrorInfo = {
CC_STDCALL, VT_EMPTY, 5, {
VT_DISPATCH,
VT_VARIANT | VT_BYREF,
@@ -51,7 +51,7 @@ _ATL_FUNC_INFO WebBrowserEventSink::kNavigateComplete2Info = {
}
};
-_ATL_FUNC_INFO WebBrowserEventSink::kBeforeNavigate2Info = {
+_ATL_FUNC_INFO WebBrowserEventSink::kBeforeNavigate2Info = {
CC_STDCALL, VT_EMPTY, 7, {
VT_DISPATCH,
VT_VARIANT | VT_BYREF,
@@ -797,7 +797,7 @@ class ChromeFrameTestEnvironment: public testing::Environment {
public:
~ChromeFrameTestEnvironment() {
}
-
+
void SetUp() {
ScopedChromeFrameRegistrar::RegisterDefaults();
}
@@ -806,7 +806,7 @@ class ChromeFrameTestEnvironment: public testing::Environment {
}
};
-::testing::Environment* const chrome_frame_env =
+::testing::Environment* const chrome_frame_env =
::testing::AddGlobalTestEnvironment(new ChromeFrameTestEnvironment);
// TODO(stoyan): - Move everything below in separate file(s).
@@ -988,18 +988,18 @@ struct MockAutomationMessageSender : public AutomationMessageSender {
};
template <> struct RunnableMethodTraits<ProxyFactory::LaunchDelegate> {
- static void RetainCallee(ProxyFactory::LaunchDelegate* obj) {}
- static void ReleaseCallee(ProxyFactory::LaunchDelegate* obj) {}
+ void RetainCallee(ProxyFactory::LaunchDelegate* obj) {}
+ void ReleaseCallee(ProxyFactory::LaunchDelegate* obj) {}
};
template <> struct RunnableMethodTraits<MockProxyFactory> {
- static void RetainCallee(MockProxyFactory* obj) {}
- static void ReleaseCallee(MockProxyFactory* obj) {}
+ void RetainCallee(MockProxyFactory* obj) {}
+ void ReleaseCallee(MockProxyFactory* obj) {}
};
template <> struct RunnableMethodTraits<ChromeFrameAutomationClient> {
- static void RetainCallee(ChromeFrameAutomationClient* obj) {}
- static void ReleaseCallee(ChromeFrameAutomationClient* obj) {}
+ void RetainCallee(ChromeFrameAutomationClient* obj) {}
+ void ReleaseCallee(ChromeFrameAutomationClient* obj) {}
};
// MessageLoopForUI wrapper that runs only for a limited time.
@@ -1019,8 +1019,8 @@ struct TimedMsgLoop {
};
template <> struct RunnableMethodTraits<TimedMsgLoop> {
- static void RetainCallee(TimedMsgLoop* obj) {}
- static void ReleaseCallee(TimedMsgLoop* obj) {}
+ void RetainCallee(TimedMsgLoop* obj) {}
+ void ReleaseCallee(TimedMsgLoop* obj) {}
};
// Saves typing. It's somewhat hard to create a wrapper around