summaryrefslogtreecommitdiffstats
path: root/chrome_frame/test/chrome_frame_unittests.cc
diff options
context:
space:
mode:
authorstoyan@google.com <stoyan@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-27 00:05:00 +0000
committerstoyan@google.com <stoyan@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-27 00:05:00 +0000
commit530a94a66cc9a68075bce7c625cb6e1d480e22a8 (patch)
tree8a782a2d4331d484edb793b85eb2d4ca28d3d233 /chrome_frame/test/chrome_frame_unittests.cc
parentcfd55769dc71733c382e1aeea8e78beda7d67d88 (diff)
downloadchromium_src-530a94a66cc9a68075bce7c625cb6e1d480e22a8.zip
chromium_src-530a94a66cc9a68075bce7c625cb6e1d480e22a8.tar.gz
chromium_src-530a94a66cc9a68075bce7c625cb6e1d480e22a8.tar.bz2
Move helper_gmock.h from ChromFrame subrtee to testing directory.
BUG=none TEST=builds ok Review URL: http://codereview.chromium.org/295049 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@30132 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame/test/chrome_frame_unittests.cc')
-rw-r--r--chrome_frame/test/chrome_frame_unittests.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/chrome_frame/test/chrome_frame_unittests.cc b/chrome_frame/test/chrome_frame_unittests.cc
index 37be881..14eb757 100644
--- a/chrome_frame/test/chrome_frame_unittests.cc
+++ b/chrome_frame/test/chrome_frame_unittests.cc
@@ -24,11 +24,12 @@
#include "chrome_frame/chrome_frame_delegate.h"
#include "chrome_frame/crash_reporting/vectored_handler-impl.h"
#include "chrome_frame/test/chrome_frame_test_utils.h"
-#include "chrome_frame/test/helper_gmock.h"
#include "chrome_frame/test_utils.h"
#include "chrome_frame/utils.h"
#include "chrome/installer/util/install_util.h"
#include "chrome/installer/util/helper.h"
+#include "testing/gmock_mutant.h"
+using testing::CreateFunctor;
const wchar_t kDocRoot[] = L"chrome_frame\\test\\data";
const int kLongWaitTimeout = 60 * 1000;