summaryrefslogtreecommitdiffstats
path: root/chrome_frame
diff options
context:
space:
mode:
Diffstat (limited to 'chrome_frame')
-rw-r--r--chrome_frame/chrome_launcher_unittest.cc1
-rw-r--r--chrome_frame/test/chrome_frame_test_utils.cc7
-rw-r--r--chrome_frame/test/chrome_frame_test_utils.h6
-rw-r--r--chrome_frame/test/ie_event_sink.cc3
4 files changed, 11 insertions, 6 deletions
diff --git a/chrome_frame/chrome_launcher_unittest.cc b/chrome_frame/chrome_launcher_unittest.cc
index c577d1e..835fc35 100644
--- a/chrome_frame/chrome_launcher_unittest.cc
+++ b/chrome_frame/chrome_launcher_unittest.cc
@@ -3,6 +3,7 @@
// found in the LICENSE file.
#include "base/command_line.h"
+#include "base/file_path.h"
#include "base/logging.h"
#include "chrome/common/chrome_switches.h"
#include "chrome_frame/chrome_launcher.h"
diff --git a/chrome_frame/test/chrome_frame_test_utils.cc b/chrome_frame/test/chrome_frame_test_utils.cc
index 6b03bf4..8b041a6 100644
--- a/chrome_frame/test/chrome_frame_test_utils.cc
+++ b/chrome_frame/test/chrome_frame_test_utils.cc
@@ -9,6 +9,7 @@
#include <iepmapi.h>
#include <sddl.h>
+#include "base/command_line.h"
#include "base/file_version_info.h"
#include "base/file_util.h"
#include "base/message_loop.h"
@@ -19,6 +20,7 @@
#include "base/scoped_bstr_win.h"
#include "base/scoped_handle.h"
#include "base/scoped_comptr_win.h"
+#include "base/string_util.h"
#include "base/utf_string_conversions.h"
#include "base/win_util.h"
#include "chrome/common/chrome_switches.h"
@@ -958,6 +960,11 @@ void DelaySendExtendedKeysEnter(TimedMsgLoop* loop, int delay, char c,
simulate_input::SendCharA, VK_RETURN, simulate_input::NONE), next_delay);
}
+CloseIeAtEndOfScope::~CloseIeAtEndOfScope() {
+ int closed = CloseAllIEWindows();
+ DLOG_IF(ERROR, closed != 0) << "Closed " << closed << " windows forcefully";
+}
+
base::ProcessHandle StartCrashService() {
FilePath exe_dir;
if (!PathService::Get(base::DIR_EXE, &exe_dir)) {
diff --git a/chrome_frame/test/chrome_frame_test_utils.h b/chrome_frame/test/chrome_frame_test_utils.h
index 13177fc..4b74f1e 100644
--- a/chrome_frame/test/chrome_frame_test_utils.h
+++ b/chrome_frame/test/chrome_frame_test_utils.h
@@ -374,11 +374,7 @@ void DelaySendExtendedKeysEnter(TimedMsgLoop* loop, int delay, char c,
class CloseIeAtEndOfScope {
public:
CloseIeAtEndOfScope() {}
- ~CloseIeAtEndOfScope() {
- int closed = CloseAllIEWindows();
- DLOG_IF(ERROR, closed != 0)
- << StringPrintf("Closed %i windows forcefully", closed);
- }
+ ~CloseIeAtEndOfScope();
};
// Starts the Chrome crash service which enables us to gather crash dumps
diff --git a/chrome_frame/test/ie_event_sink.cc b/chrome_frame/test/ie_event_sink.cc
index 2f7d32c..c04c3c8 100644
--- a/chrome_frame/test/ie_event_sink.cc
+++ b/chrome_frame/test/ie_event_sink.cc
@@ -6,6 +6,7 @@
#include "base/scoped_bstr_win.h"
#include "base/scoped_handle.h"
+#include "base/string_util.h"
#include "base/utf_string_conversions.h"
#include "base/win_util.h"
#include "chrome_frame/test/chrome_frame_test_utils.h"
@@ -542,4 +543,4 @@ HRESULT IEEventSink::OnMessage(const VARIANT* param) {
return S_OK;
}
-} // namespace chrome_frame_test \ No newline at end of file
+} // namespace chrome_frame_test