Index: ui/views/controls/webview/run_all_unittests.cc |
diff --git a/ui/app_list/test/run_all_unittests.cc b/ui/views/controls/webview/run_all_unittests.cc |
similarity index 65% |
copy from ui/app_list/test/run_all_unittests.cc |
copy to ui/views/controls/webview/run_all_unittests.cc |
index 48dd5a8be4096ae67b099a86927a6f1e0c69f78c..804b0f19151de75f77220beeec0fdf6e0f3656a7 100644 |
--- a/ui/app_list/test/run_all_unittests.cc |
+++ b/ui/views/controls/webview/run_all_unittests.cc |
@@ -2,31 +2,25 @@ |
// Use of this source code is governed by a BSD-style license that can be |
// found in the LICENSE file. |
-#include "base/basictypes.h" |
#include "base/bind.h" |
+#include "base/command_line.h" |
#include "base/compiler_specific.h" |
#include "base/path_service.h" |
#include "base/test/launcher/unit_test_launcher.h" |
#include "base/test/test_suite.h" |
#include "ui/base/resource/resource_bundle.h" |
#include "ui/base/ui_base_paths.h" |
- |
-#if !defined(OS_MACOSX) |
+#include "ui/base/ui_base_switches.h" |
#include "ui/gl/gl_surface.h" |
-#endif |
- |
-namespace { |
-class AppListTestSuite : public base::TestSuite { |
+class WebViewTestSuite : public base::TestSuite { |
public: |
- AppListTestSuite(int argc, char** argv) : base::TestSuite(argc, argv) {} |
+ WebViewTestSuite(int argc, char** argv) : base::TestSuite(argc, argv) {} |
protected: |
virtual void Initialize() OVERRIDE { |
-#if !defined(OS_MACOSX) |
- gfx::GLSurface::InitializeOneOffForTests(); |
-#endif |
base::TestSuite::Initialize(); |
+ gfx::GLSurface::InitializeOneOffForTests(); |
ui::RegisterPathProvider(); |
base::FilePath pak_dir; |
@@ -44,16 +38,17 @@ class AppListTestSuite : public base::TestSuite { |
} |
private: |
- DISALLOW_COPY_AND_ASSIGN(AppListTestSuite); |
+ DISALLOW_COPY_AND_ASSIGN(WebViewTestSuite); |
}; |
-} // namespace |
- |
int main(int argc, char** argv) { |
- AppListTestSuite test_suite(argc, argv); |
+ base::CommandLine::Init(argc, argv); |
+ base::CommandLine* cmd_line = base::CommandLine::ForCurrentProcess(); |
+ cmd_line->AppendSwitch(switches::kEnableTextInputFocusManager); |
msw
2014/04/22 17:12:56
Can this be done in webview_unittest.cc?
Yuki
2014/04/23 03:53:40
Done.
|
+ |
+ WebViewTestSuite test_suite(argc, argv); |
return base::LaunchUnitTests( |
- argc, |
- argv, |
- base::Bind(&AppListTestSuite::Run, base::Unretained(&test_suite))); |
+ argc, argv, base::Bind(&WebViewTestSuite::Run, |
+ base::Unretained(&test_suite))); |
} |