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

Unified Diff: extensions/test/extensions_unittests_main.cc

Issue 461273003: Rework ExtensionApiUnittest to run in extensions_unittests, removing its Chrome dependencies. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 4 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
« extensions/extensions.gyp ('K') | « extensions/extensions.gyp ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: extensions/test/extensions_unittests_main.cc
diff --git a/extensions/test/extensions_unittests_main.cc b/extensions/test/extensions_unittests_main.cc
index 50b02473960427514dae976f50e7a3107adf46c2..ff7f4a9d6c0c19da99f1d3daf26941c8c4cf91a5 100644
--- a/extensions/test/extensions_unittests_main.cc
+++ b/extensions/test/extensions_unittests_main.cc
@@ -16,6 +16,10 @@
#include "mojo/embedder/embedder.h"
#include "ui/base/resource/resource_bundle.h"
+#if !defined(OS_IOS)
+#include "ui/gl/gl_surface.h"
+#endif
+
namespace {
// Content client that exists only to register chrome-extension:// scheme with
@@ -65,6 +69,10 @@ ExtensionsTestSuite::~ExtensionsTestSuite() {}
void ExtensionsTestSuite::Initialize() {
content::ContentTestSuiteBase::Initialize();
+#if !defined(OS_IOS)
+ gfx::GLSurface::InitializeOneOffForTests();
James Cook 2014/08/13 16:11:36 We need a GL surface for this test? Why? In theo
Yoyo Zhou 2014/08/13 22:53:43 It turns out I don't need it after all. I recall t
+#endif
+
// Register the chrome-extension:// scheme via this circuitous path. Note
// that this does not persistently set up a ContentClient; individual tests
// must use content::SetContentClient().
« extensions/extensions.gyp ('K') | « extensions/extensions.gyp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698