summaryrefslogtreecommitdiffstats
path: root/cc/test/run_all_unittests.cc
diff options
context:
space:
mode:
authortfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-10-02 00:23:18 +0000
committertfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-10-02 00:23:18 +0000
commit7f0c53dbfc94d37f8fe7847da8b68fd36c48d365 (patch)
tree3e0100e884fdda6f8420d53e51f7c7f19d7534e7 /cc/test/run_all_unittests.cc
parent2672d2862a8a621285026d3c4d3b14448606522a (diff)
downloadchromium_src-7f0c53dbfc94d37f8fe7847da8b68fd36c48d365.zip
chromium_src-7f0c53dbfc94d37f8fe7847da8b68fd36c48d365.tar.gz
chromium_src-7f0c53dbfc94d37f8fe7847da8b68fd36c48d365.tar.bz2
cc: Change gtest includes to the style used in chromium.
BUG=144577 TEST=cc_unittests TBR=jamesr@chromium.org Review URL: https://codereview.chromium.org/11035010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@159601 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/test/run_all_unittests.cc')
-rw-r--r--cc/test/run_all_unittests.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/cc/test/run_all_unittests.cc b/cc/test/run_all_unittests.cc
index ca2eccd..9132bab 100644
--- a/cc/test/run_all_unittests.cc
+++ b/cc/test/run_all_unittests.cc
@@ -5,16 +5,16 @@
#include "base/message_loop.h"
#include "base/test/test_suite.h"
#include "cc/test/test_webkit_platform.h"
+#include "testing/gmock/include/gmock/gmock.h"
#include "third_party/WebKit/Source/Platform/chromium/public/Platform.h"
-#include <gmock/gmock.h>
int main(int argc, char** argv) {
::testing::InitGoogleMock(&argc, argv);
- TestSuite testSuite(argc, argv);
+ TestSuite test_suite(argc, argv);
cc::TestWebKitPlatform platform;
MessageLoop message_loop;
WebKit::Platform::initialize(&platform);
- int result = testSuite.Run();
+ int result = test_suite.Run();
WebKit::Platform::shutdown();
return result;