diff options
| author | jochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-22 14:20:55 +0000 |
|---|---|---|
| committer | jochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-22 14:20:55 +0000 |
| commit | f04b0e97b29c20ff2119a5e842f766b0e604b44d (patch) | |
| tree | 28054151d219e77632f96e5499cc5c59957689af /gin/test | |
| parent | f269dc3c19468e46e36de8a7fd91ecd7f6de1f9d (diff) | |
| download | chromium_src-f04b0e97b29c20ff2119a5e842f766b0e604b44d.zip chromium_src-f04b0e97b29c20ff2119a5e842f766b0e604b44d.tar.gz chromium_src-f04b0e97b29c20ff2119a5e842f766b0e604b44d.tar.bz2 | |
[gin] add support for non-gin managed isolates in gin.
BUG=317398
R=abarth@chromium.org,aa@chromium.org
Review URL: https://codereview.chromium.org/82963002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@236766 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gin/test')
| -rw-r--r-- | gin/test/file_runner.cc | 4 | ||||
| -rw-r--r-- | gin/test/v8_test.cc | 4 | ||||
| -rw-r--r-- | gin/test/v8_test.h | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/gin/test/file_runner.cc b/gin/test/file_runner.cc index ff5ac5d..0c60c4b 100644 --- a/gin/test/file_runner.cc +++ b/gin/test/file_runner.cc @@ -8,9 +8,9 @@ #include "base/message_loop/message_loop.h" #include "base/path_service.h" #include "gin/converter.h" -#include "gin/gin.h" #include "gin/modules/console.h" #include "gin/modules/module_registry.h" +#include "gin/public/isolate_holder.h" #include "gin/test/gtest.h" #include "gin/try_catch.h" #include "testing/gtest/include/gtest/gtest.h" @@ -51,7 +51,7 @@ void RunTestFromFile(const base::FilePath& path, FileRunnerDelegate* delegate) { base::MessageLoop message_loop; - gin::Gin instance; + gin::IsolateHolder instance; gin::Runner runner(delegate, instance.isolate()); { gin::Runner::Scope scope(&runner); diff --git a/gin/test/v8_test.cc b/gin/test/v8_test.cc index b09930e..95f4e74 100644 --- a/gin/test/v8_test.cc +++ b/gin/test/v8_test.cc @@ -4,7 +4,7 @@ #include "gin/test/v8_test.h" -#include "gin/gin.h" +#include "gin/public/isolate_holder.h" using v8::Context; using v8::Local; @@ -19,7 +19,7 @@ V8Test::~V8Test() { } void V8Test::SetUp() { - instance_.reset(new gin::Gin); + instance_.reset(new gin::IsolateHolder); instance_->isolate()->Enter(); HandleScope handle_scope(instance_->isolate()); context_.Reset(instance_->isolate(), Context::New(instance_->isolate())); diff --git a/gin/test/v8_test.h b/gin/test/v8_test.h index e7f93a6..6ad52d6 100644 --- a/gin/test/v8_test.h +++ b/gin/test/v8_test.h @@ -13,7 +13,7 @@ namespace gin { -class Gin; +class IsolateHolder; // A base class for tests that use v8. class V8Test : public testing::Test { @@ -25,7 +25,7 @@ class V8Test : public testing::Test { virtual void TearDown() OVERRIDE; protected: - scoped_ptr<Gin> instance_; + scoped_ptr<IsolateHolder> instance_; v8::Persistent<v8::Context> context_; private: |