Commit 530a94a6 authored by stoyan@google.com's avatar stoyan@google.com

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
parent cfd55769
...@@ -24,11 +24,12 @@ ...@@ -24,11 +24,12 @@
#include "chrome_frame/chrome_frame_delegate.h" #include "chrome_frame/chrome_frame_delegate.h"
#include "chrome_frame/crash_reporting/vectored_handler-impl.h" #include "chrome_frame/crash_reporting/vectored_handler-impl.h"
#include "chrome_frame/test/chrome_frame_test_utils.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/test_utils.h"
#include "chrome_frame/utils.h" #include "chrome_frame/utils.h"
#include "chrome/installer/util/install_util.h" #include "chrome/installer/util/install_util.h"
#include "chrome/installer/util/helper.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 wchar_t kDocRoot[] = L"chrome_frame\\test\\data";
const int kLongWaitTimeout = 60 * 1000; const int kLongWaitTimeout = 60 * 1000;
......
...@@ -33,6 +33,7 @@ ...@@ -33,6 +33,7 @@
'gmock/src/gmock-printers.cc', 'gmock/src/gmock-printers.cc',
'gmock/src/gmock-spec-builders.cc', 'gmock/src/gmock-spec-builders.cc',
'gmock/src/gmock.cc', 'gmock/src/gmock.cc',
'gmock_mutant.h', # gMock helpers
], ],
'sources!': [ 'sources!': [
'gmock/src/gmock-all.cc', # Not needed by our build. 'gmock/src/gmock-all.cc', # Not needed by our build.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment