Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(321)

Unified Diff: ash/wm/ash_native_cursor_manager_interactive_uitest.cc

Issue 190663012: Run ContentMain in a browser_test's browser process. This removes duplication of code in the browse… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: try to fix android by restoring old path just for it Created 6 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/test/ash_test_base.cc ('k') | base/i18n/icu_util.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/ash_native_cursor_manager_interactive_uitest.cc
===================================================================
--- ash/wm/ash_native_cursor_manager_interactive_uitest.cc (revision 257432)
+++ ash/wm/ash_native_cursor_manager_interactive_uitest.cc (working copy)
@@ -8,10 +8,14 @@
#include "ash/shell.h"
#include "ash/test/ash_test_base.h"
#include "ash/test/cursor_manager_test_api.h"
+#include "base/path_service.h"
#include "base/run_loop.h"
#include "ui/aura/window.h"
#include "ui/aura/window_event_dispatcher.h"
+#include "ui/base/resource/resource_bundle.h"
#include "ui/base/test/ui_controls.h"
+#include "ui/base/ui_base_paths.h"
+#include "ui/gl/gl_surface.h"
#if defined(USE_X11)
#include <X11/Xlib.h>
@@ -22,8 +26,28 @@
namespace ash {
using ::wm::CursorManager;
-typedef test::AshTestBase AshNativeCursorManagerTest;
+class AshNativeCursorManagerTest : public test::AshTestBase {
+ public:
+ AshNativeCursorManagerTest() {}
+ virtual ~AshNativeCursorManagerTest() {}
+
+ virtual void SetUp() OVERRIDE {
+ gfx::GLSurface::InitializeOneOffForTests();
+
+ ui::RegisterPathProvider();
+ ResourceBundle::InitSharedInstanceWithLocale("en-US", NULL);
+ base::FilePath resources_pack_path;
+ PathService::Get(base::DIR_MODULE, &resources_pack_path);
+ resources_pack_path =
+ resources_pack_path.Append(FILE_PATH_LITERAL("resources.pak"));
+ ResourceBundle::GetSharedInstance().AddDataPackFromPath(
+ resources_pack_path, ui::SCALE_FACTOR_NONE);
+
+ test::AshTestBase::SetUp();
+ }
+};
+
namespace {
internal::DisplayInfo CreateDisplayInfo(int64 id,
« no previous file with comments | « ash/test/ash_test_base.cc ('k') | base/i18n/icu_util.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698