Add Query() support to FileRef

ppapi/tests/test_utils.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef PPAPI_TESTS_TEST_UTILS_H_
 #define PPAPI_TESTS_TEST_UTILS_H_
 
 #include <string>
 
 #include "ppapi/c/dev/ppb_testing_dev.h"
@@ skipping 172 matching lines @@
   TestCompletionCallbackWithOutput(PP_Instance instance,
                                    CallbackType callback_type) :
     TestCompletionCallback(instance, callback_type) {
   }
 
   pp::CompletionCallbackWithOutput<OutputT> GetCallbackWithOutput();
   operator pp::CompletionCallbackWithOutput<OutputT>() {
     return GetCallbackWithOutput();
   }
 
-  const OutputT& output() { return output_storage_.output(); }
+  OutputT output() {
+    return pp::internal::CallbackOutputTraits<OutputT>::StorageToPluginArg(
+        output_storage_);
+  }
 
   typename pp::CompletionCallbackWithOutput<OutputT>::OutputStorageType
       output_storage_;
 };
 
 template <typename OutputT>
 pp::CompletionCallbackWithOutput<OutputT>
 TestCompletionCallbackWithOutput<OutputT>::GetCallbackWithOutput() {
   Reset();
   if (callback_type_ == PP_BLOCKING) {
-    pp::CompletionCallbackWithOutput<OutputT> cc(
-        &TestCompletionCallback::Handler,
-        this,
-        &output_storage_);
+    pp::CompletionCallbackWithOutput<OutputT> cc(&output_storage_);
     return cc;
   }
 
   target_loop_ = pp::MessageLoop::GetCurrent();
   pp::CompletionCallbackWithOutput<OutputT> cc(
         &TestCompletionCallback::Handler,
         this,
         &output_storage_);
   if (callback_type_ == PP_OPTIONAL)
     cc.set_flags(PP_COMPLETIONCALLBACK_FLAG_OPTIONAL);
   return cc;
 }
 
 
 // Verifies that the callback didn't record any errors. If the callback is run
 // in an unexpected way (e.g., if it's invoked asynchronously when the call
 // should have blocked), this returns an appropriate error string.
 #define CHECK_CALLBACK_BEHAVIOR(callback) \
 do { \
   if ((callback).failed()) \
-    return (callback).errors(); \
+    return MakeFailureMessage(__FILE__, __LINE__, \
+                              (callback).errors().c_str()); \

[dmichael (off chromium), 2013/03/27 22:13:55]

sweet, thanks

 } while (false)
 
 /*
  * A set of macros to use for platform detection. These were largely copied
  * from chromium's build_config.h.
  */
 #if defined(__APPLE__)
 #define PPAPI_OS_MACOSX 1
 #elif defined(ANDROID)
 #define PPAPI_OS_ANDROID 1
@@ skipping 13 matching lines @@
 #error Please add support for your platform in ppapi/tests/test_utils.h
 #endif
 
 /* These are used to determine POSIX-like implementations vs Windows. */
 #if defined(__linux__) || defined(__APPLE__) || defined(__FreeBSD__) || \
     defined(__OpenBSD__) || defined(__sun) || defined(__native_client__)
 #define PPAPI_POSIX 1
 #endif
 
 #endif  // PPAPI_TESTS_TEST_UTILS_H_