summaryrefslogtreecommitdiffstats
path: root/chrome/app
diff options
context:
space:
mode:
authorjcampan@chromium.org <jcampan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-02-25 01:35:56 +0000
committerjcampan@chromium.org <jcampan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-02-25 01:35:56 +0000
commitf2ac24f080bba97cafaca933e7d4efcf0e9eb9d6 (patch)
tree54c2592a9ae0cd2066e0756350ad9876a558b841 /chrome/app
parent6c5a7c761466d79810aaa871b6ac6eb3e2375c2c (diff)
downloadchromium_src-f2ac24f080bba97cafaca933e7d4efcf0e9eb9d6.zip
chromium_src-f2ac24f080bba97cafaca933e7d4efcf0e9eb9d6.tar.gz
chromium_src-f2ac24f080bba97cafaca933e7d4efcf0e9eb9d6.tar.bz2
Landing again the move of browser focus UI tests to in process.
TBR=sky Review URL: http://codereview.chromium.org/28097 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@10318 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app')
-rw-r--r--chrome/app/scoped_ole_initializer.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/chrome/app/scoped_ole_initializer.h b/chrome/app/scoped_ole_initializer.h
index 3560374..1dcc0d5 100644
--- a/chrome/app/scoped_ole_initializer.h
+++ b/chrome/app/scoped_ole_initializer.h
@@ -6,6 +6,7 @@
#define CHROME_APP_SCOPED_OLE_INITIALIZER_H_
#include "base/logging.h"
+#include "base/message_loop.h"
#include "build/build_config.h"
// Wraps OLE initialization in a cross-platform class meant to be used on the
@@ -19,12 +20,16 @@
class ScopedOleInitializer {
public:
ScopedOleInitializer() {
+ msg_loop_ = MessageLoop::current();
int ole_result = OleInitialize(NULL);
DCHECK(ole_result == S_OK);
}
~ScopedOleInitializer() {
+ DCHECK(msg_loop_ == MessageLoop::current());
OleUninitialize();
}
+
+ MessageLoop* msg_loop_;
};
#else