diff options
| author | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-31 06:36:27 +0000 |
|---|---|---|
| committer | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-31 06:36:27 +0000 |
| commit | b0eebb403ad069142ec43e566134f4000f0f0f19 (patch) | |
| tree | cc2f2a64fcf34264449031758c589055fd2072cf /chrome/installer/gcapi/gcapi_test.cc | |
| parent | a20548491e2b97baf01fa8d103eca5c1dd8d80db (diff) | |
| download | chromium_src-b0eebb403ad069142ec43e566134f4000f0f0f19.zip chromium_src-b0eebb403ad069142ec43e566134f4000f0f0f19.tar.gz chromium_src-b0eebb403ad069142ec43e566134f4000f0f0f19.tar.bz2 | |
Revert 119841 - Implementation of GCAPI reactivation.
Also, some cleanup in gcapi_tests such that it now only runs gtest tests by default.
BUG=111453
TEST=gcapi_tests.exe
Review URL: https://chromiumcodereview.appspot.com/9288056
TBR=robertshield@chromium.org
Review URL: https://chromiumcodereview.appspot.com/9302029
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@119865 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/installer/gcapi/gcapi_test.cc')
| -rw-r--r-- | chrome/installer/gcapi/gcapi_test.cc | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/chrome/installer/gcapi/gcapi_test.cc b/chrome/installer/gcapi/gcapi_test.cc index b7f08bb..2100744 100644 --- a/chrome/installer/gcapi/gcapi_test.cc +++ b/chrome/installer/gcapi/gcapi_test.cc @@ -4,7 +4,6 @@ #include <stdio.h> -#include "base/command_line.h" #include "chrome/installer/gcapi/gcapi.h" #include "testing/gtest/include/gtest/gtest.h" @@ -55,17 +54,11 @@ void call_dynamically() { FreeLibrary(module); } -const char kManualLaunchTests[] = "launch-chrome"; - int main(int argc, char* argv[]) { - CommandLine::Init(argc, argv); - testing::InitGoogleTest(&argc, argv); RUN_ALL_TESTS(); - if (CommandLine::ForCurrentProcess()->HasSwitch(kManualLaunchTests)) { - call_dynamically(); - call_statically(); - printf("LaunchChrome returned %d.\n", LaunchGoogleChrome()); - } + call_dynamically(); + call_statically(); + printf("LaunchChrome returned %d.\n", LaunchGoogleChrome()); } |