Convert resources to take an instance key instead of an Instance*.

Review URL: https://chromiumcodereview.appspot.com/9381010

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@123795 0039d316-1c4b-4281-b951-d872f2087c98

11 files changed, 27 insertions, 27 deletions

diff --git a/ppapi/tests/test_case.cc b/ppapi/tests/test_case.cc
index 6ffe53e..90e7d72 100644
--- a/ppapi/tests/test_case.cc
+++ b/ppapi/tests/test_case.cc
@@ -126,7 +126,7 @@ std::string TestCase::CheckResourcesAndVars() {
              << kVarsToPrint <<"):<p>";
       errors += output.str();
       for (uint32_t i = 0; i < std::min(tracked_vars, kVarsToPrint); ++i) {
-        pp::Var leaked_var(pp::Var::PassRef(), vars[i]);
+        pp::Var leaked_var(pp::PASS_REF, vars[i]);
 #if (defined __native_client__)
         errors += leaked_var.DebugString() + "<p>";
 #else
diff --git a/ppapi/tests/test_char_set.cc b/ppapi/tests/test_char_set.cc
index dfff9ed..5056c2c 100644
--- a/ppapi/tests/test_char_set.cc
+++ b/ppapi/tests/test_char_set.cc
@@ -352,11 +352,11 @@ std::string TestCharSet::TestCharSetToUTF16() {
 
 std::string TestCharSet::TestGetDefaultCharSet() {
   // Test invalid instance.
-  pp::Var result(pp::Var::PassRef(), char_set_interface_->GetDefaultCharSet(0));
+  pp::Var result(pp::PASS_REF, char_set_interface_->GetDefaultCharSet(0));
   ASSERT_TRUE(result.is_undefined());
 
   // Just make sure the default char set is a nonempty string.
-  result = pp::Var(pp::Var::PassRef(),
+  result = pp::Var(pp::PASS_REF,
       char_set_interface_->GetDefaultCharSet(instance_->pp_instance()));
   ASSERT_TRUE(result.is_string());
   ASSERT_FALSE(result.AsString().empty());
diff --git a/ppapi/tests/test_flash.cc b/ppapi/tests/test_flash.cc
index 9f666a8..debbc49 100644
--- a/ppapi/tests/test_flash.cc
+++ b/ppapi/tests/test_flash.cc
@@ -41,27 +41,27 @@ std::string TestFlash::TestSetInstanceAlwaysOnTop() {
 }
 
 std::string TestFlash::TestGetProxyForURL() {
-  Var result(Var::PassRef(),
+  Var result(pp::PASS_REF,
              flash_interface_->GetProxyForURL(instance_->pp_instance(),
                                               "http://127.0.0.1/foobar/"));
   ASSERT_TRUE(result.is_string());
   // Assume no one configures a proxy for localhost.
   ASSERT_EQ("DIRECT", result.AsString());
 
-  result = Var(Var::PassRef(),
+  result = Var(pp::PASS_REF,
                flash_interface_->GetProxyForURL(instance_->pp_instance(),
                                                 "http://www.google.com"));
   // Don't know what the proxy might be, but it should be a valid result.
   ASSERT_TRUE(result.is_string());
 
-  result = Var(Var::PassRef(),
+  result = Var(pp::PASS_REF,
                flash_interface_->GetProxyForURL(instance_->pp_instance(),
                                                 "file:///tmp"));
   ASSERT_TRUE(result.is_string());
   // Should get "DIRECT" for file:// URLs.
   ASSERT_EQ("DIRECT", result.AsString());
 
-  result = Var(Var::PassRef(),
+  result = Var(pp::PASS_REF,
                flash_interface_->GetProxyForURL(instance_->pp_instance(),
                                                 "this_isnt_an_url"));
   // Should be an error.
@@ -91,7 +91,7 @@ std::string TestFlash::TestGetLocalTimeZoneOffset() {
 }
 
 std::string TestFlash::TestGetCommandLineArgs() {
-  Var result(Var::PassRef(),
+  Var result(pp::PASS_REF,
              flash_interface_->GetCommandLineArgs(
                  pp::Module::Get()->pp_module()));
   ASSERT_TRUE(result.is_string());
diff --git a/ppapi/tests/test_flash_clipboard.cc b/ppapi/tests/test_flash_clipboard.cc
index 09e4000..0f44247 100644
--- a/ppapi/tests/test_flash_clipboard.cc
+++ b/ppapi/tests/test_flash_clipboard.cc
@@ -54,7 +54,7 @@ std::string TestFlashClipboard::ReadStringVar(
     PP_Flash_Clipboard_Format format) {
   std::string result_str;
   pp::Var result_var(
-      pp::Var::PassRef(),
+      pp::PASS_REF,
       clipboard_interface_->ReadData(instance_->pp_instance(),
                                      PP_FLASH_CLIPBOARD_TYPE_STANDARD,
                                      format));
diff --git a/ppapi/tests/test_input_event.cc b/ppapi/tests/test_input_event.cc
index c9f1736..73b7635 100644
--- a/ppapi/tests/test_input_event.cc
+++ b/ppapi/tests/test_input_event.cc
@@ -212,9 +212,9 @@ bool TestInputEvent::AreEquivalentEvents(PP_Resource received,
       return
           keyboard_input_event_interface_->GetKeyCode(received) ==
           keyboard_input_event_interface_->GetKeyCode(expected) &&
-          pp::Var(pp::Var::PassRef(),
+          pp::Var(pp::PASS_REF,
               keyboard_input_event_interface_->GetCharacterText(received)) ==
-          pp::Var(pp::Var::PassRef(),
+          pp::Var(pp::PASS_REF,
               keyboard_input_event_interface_->GetCharacterText(expected));
 
     default:
diff --git a/ppapi/tests/test_scrollbar.cc b/ppapi/tests/test_scrollbar.cc
index b005db7..83c8365 100644
--- a/ppapi/tests/test_scrollbar.cc
+++ b/ppapi/tests/test_scrollbar.cc
@@ -18,7 +18,7 @@ REGISTER_TEST_CASE(Scrollbar);
 TestScrollbar::TestScrollbar(TestingInstance* instance)
     : TestCase(instance),
       WidgetClient_Dev(instance),
-      scrollbar_(*instance, true),
+      scrollbar_(instance, true),
       scrollbar_value_changed_(false) {
 }
 
diff --git a/ppapi/tests/test_tcp_socket_private.cc b/ppapi/tests/test_tcp_socket_private.cc
index 1de1fa8..bcd749d 100644
--- a/ppapi/tests/test_tcp_socket_private.cc
+++ b/ppapi/tests/test_tcp_socket_private.cc
@@ -49,7 +49,7 @@ bool TestTCPSocketPrivate::Init() {
     return false;
 
   PP_URLComponents_Dev components;
-  pp::Var pp_url = pp::URLUtil_Dev::Get()->GetDocumentURL(*instance_,
+  pp::Var pp_url = pp::URLUtil_Dev::Get()->GetDocumentURL(instance_,
                                                           &components);
   if (!pp_url.is_string())
     return false;
diff --git a/ppapi/tests/test_url_loader.cc b/ppapi/tests/test_url_loader.cc
index 2b0a66b..984fee0 100644
--- a/ppapi/tests/test_url_loader.cc
+++ b/ppapi/tests/test_url_loader.cc
@@ -169,7 +169,7 @@ std::string TestURLLoader::LoadAndCompareBody(
     const std::string& expected_body) {
   TestCompletionCallback callback(instance_->pp_instance(), force_async_);
 
-  pp::URLLoader loader(*instance_);
+  pp::URLLoader loader(instance_);
   int32_t rv = loader.Open(request, callback);
   if (force_async_ && rv != PP_OK_COMPLETIONPENDING)
     return ReportError("URLLoader::Open force_async", rv);
@@ -251,7 +251,7 @@ std::string TestURLLoader::GetReachableAbsoluteURL(
   // Get the absolute page URL and replace the test case file name
   // with the given one.
   pp::Var document_url(
-      pp::Var::PassRef(),
+      pp::PASS_REF,
       testing_interface_->GetDocumentURL(instance_->pp_instance(),
                                          NULL));
   std::string url(document_url.AsString());
@@ -306,7 +306,7 @@ int32_t TestURLLoader::OpenTrusted(const pp::URLRequestInfo& request) {
 
 int32_t TestURLLoader::Open(const pp::URLRequestInfo& request,
                             bool trusted) {
-  pp::URLLoader loader(*instance_);
+  pp::URLLoader loader(instance_);
   if (trusted)
     url_loader_trusted_interface_->GrantUniversalAccess(loader.pp_resource());
   TestCompletionCallback callback(instance_->pp_instance(), force_async_);
@@ -439,7 +439,7 @@ std::string TestURLLoader::TestStreamToFile() {
 
   TestCompletionCallback callback(instance_->pp_instance(), force_async_);
 
-  pp::URLLoader loader(*instance_);
+  pp::URLLoader loader(instance_);
   int32_t rv = loader.Open(request, callback);
   if (force_async_ && rv != PP_OK_COMPLETIONPENDING)
     return ReportError("URLLoader::Open force_async", rv);
@@ -728,7 +728,7 @@ std::string TestURLLoader::TestAuditURLRedirect() {
 
   TestCompletionCallback callback(instance_->pp_instance(), force_async_);
 
-  pp::URLLoader loader(*instance_);
+  pp::URLLoader loader(instance_);
   int32_t rv = loader.Open(request, callback);
   if (force_async_ && rv != PP_OK_COMPLETIONPENDING)
     return ReportError("URLLoader::Open force_async", rv);
@@ -777,7 +777,7 @@ std::string TestURLLoader::TestAbortCalls() {
   // Abort |Open()|.
   {
     callback.reset_run_count();
-    rv = pp::URLLoader(*instance_).Open(request, callback);
+    rv = pp::URLLoader(instance_).Open(request, callback);
     if (force_async_ && rv != PP_OK_COMPLETIONPENDING)
       return ReportError("URLLoader::Open force_async", rv);
     if (callback.run_count() > 0)
@@ -795,7 +795,7 @@ std::string TestURLLoader::TestAbortCalls() {
   {
     char buf[2] = { 0 };
     {
-      pp::URLLoader loader(*instance_);
+      pp::URLLoader loader(instance_);
       rv = loader.Open(request, callback);
       if (force_async_ && rv != PP_OK_COMPLETIONPENDING)
         return ReportError("URLLoader::Open force_async", rv);
@@ -836,7 +836,7 @@ std::string TestURLLoader::TestUntendedLoad() {
   request.SetRecordDownloadProgress(true);
   TestCompletionCallback callback(instance_->pp_instance(), force_async_);
 
-  pp::URLLoader loader(*instance_);
+  pp::URLLoader loader(instance_);
   int32_t rv = loader.Open(request, callback);
   if (force_async_ && rv != PP_OK_COMPLETIONPENDING)
     return ReportError("URLLoader::Open force_async", rv);
diff --git a/ppapi/tests/test_url_util.cc b/ppapi/tests/test_url_util.cc
index 179aeeb..5de683f 100644
--- a/ppapi/tests/test_url_util.cc
+++ b/ppapi/tests/test_url_util.cc
@@ -108,18 +108,18 @@ std::string TestURLUtil::TestIsSameSecurityOrigin() {
 std::string TestURLUtil::TestDocumentCanRequest() {
   // This is hard to test, but we can at least verify we can't request
   // some random domain.
-  ASSERT_FALSE(util_->DocumentCanRequest(*instance_, "http://evil.com/"));
+  ASSERT_FALSE(util_->DocumentCanRequest(instance_, "http://evil.com/"));
   PASS();
 }
 
 std::string TestURLUtil::TestDocumentCanAccessDocument() {
   // This is hard to test, but we can at least verify we can access ourselves.
-  ASSERT_TRUE(util_->DocumentCanAccessDocument(*instance_, *instance_));
+  ASSERT_TRUE(util_->DocumentCanAccessDocument(instance_, instance_));
   PASS();
 }
 
 std::string TestURLUtil::TestGetDocumentURL() {
-  pp::Var url = util_->GetDocumentURL(*instance_);
+  pp::Var url = util_->GetDocumentURL(instance_);
   ASSERT_TRUE(url.is_string());
   pp::VarPrivate window = instance_->GetWindowObject();
   pp::Var href = window.GetProperty("location").GetProperty("href");
@@ -130,7 +130,7 @@ std::string TestURLUtil::TestGetDocumentURL() {
 }
 
 std::string TestURLUtil::TestGetPluginInstanceURL() {
-  pp::Var url = util_->GetPluginInstanceURL(*instance_);
+  pp::Var url = util_->GetPluginInstanceURL(instance_);
   ASSERT_TRUE(url.is_string());
   // see test_case.html
   ASSERT_EQ(url.AsString(), "http://a.b.c/test");
diff --git a/ppapi/tests/test_utils.cc b/ppapi/tests/test_utils.cc
index a98c693..449b64c 100644
--- a/ppapi/tests/test_utils.cc
+++ b/ppapi/tests/test_utils.cc
@@ -50,7 +50,7 @@ bool GetLocalHostPort(PP_Instance instance, std::string* host, uint16_t* port) {
     return false;
 
   PP_URLComponents_Dev components;
-  pp::Var pp_url(pp::Var::PassRef(),
+  pp::Var pp_url(pp::PASS_REF,
                  testing->GetDocumentURL(instance, &components));
   if (!pp_url.is_string())
     return false;
diff --git a/ppapi/tests/test_websocket.cc b/ppapi/tests/test_websocket.cc
index 8eeeac2..b705ad5 100644
--- a/ppapi/tests/test_websocket.cc
+++ b/ppapi/tests/test_websocket.cc
@@ -584,7 +584,7 @@ std::string TestWebSocket::TestCcInterfaces() {
   for (uint32_t i = 0; i < binary_length; ++i)
     binary_message[i] = i;
   result = ws.SendMessage(pp::Var(
-      pp::Var::PassRef(), CreateVarBinary(binary_message, binary_length)));
+      pp::PASS_REF, CreateVarBinary(binary_message, binary_length)));
   ASSERT_EQ(PP_OK, result);
 
   pp::Var text_receive_var;