Index: gin/shell/gin_main.cc |
diff --git a/gin/shell/gin_main.cc b/gin/shell/gin_main.cc |
index 1fff9f5e5a0d0542dbade113b47780e6093c2953..b45afefe567dca4f8a620b998f0426ca6bccb993 100644 |
--- a/gin/shell/gin_main.cc |
+++ b/gin/shell/gin_main.cc |
@@ -5,6 +5,7 @@ |
#include "base/at_exit.h" |
#include "base/bind.h" |
#include "base/command_line.h" |
+#include "base/feature_list.h" |
#include "base/files/file_util.h" |
#include "base/i18n/icu_util.h" |
#include "base/macros.h" |
@@ -68,6 +69,9 @@ int main(int argc, char** argv) { |
base::MessageLoop message_loop; |
+ // Initialize the base::FeatureList since IsolateHolder can depend on it. |
+ base::FeatureList::SetInstance(make_scoped_ptr(new base::FeatureList)); |
+ |
gin::IsolateHolder::Initialize(gin::IsolateHolder::kStrictMode, |
gin::IsolateHolder::kStableV8Extras, |
gin::ArrayBufferAllocator::SharedInstance()); |