SyncFS: Clean up callbacks in v1 tests

chrome/browser/sync_file_system/sync_file_system_test_util.h

Index: chrome/browser/sync_file_system/sync_file_system_test_util.h
diff --git a/chrome/browser/sync_file_system/sync_file_system_test_util.h b/chrome/browser/sync_file_system/sync_file_system_test_util.h
index 572cc325390fc79e317cc53525024495a0b43dee..85d8273882facc93ca99de1c13a75e2013f3038c 100644
--- a/chrome/browser/sync_file_system/sync_file_system_test_util.h
+++ b/chrome/browser/sync_file_system/sync_file_system_test_util.h
@@ -27,6 +27,18 @@ void ReceiveResult2(bool* done,
   *arg2_out = base::internal::CallbackForward(arg2);
 }
 
+template <typename Arg1, typename Arg2>
+void ReceiveResultConst2(bool* done,

[tzik, 2013/11/22 04:48:16]

This looks not clean to me...
And to make this cleaner, we need to do some template magic like
boost::call_traits::param_type.

For now, can we leave them as is?

+                         Arg1* arg1_out,
+                         Arg2* arg2_out,
+                         Arg1 arg1,
+                         const Arg2& arg2) {
+  EXPECT_FALSE(*done);
+  *done = true;
+  *arg1_out = base::internal::CallbackForward(arg1);
+  *arg2_out = base::internal::CallbackForward(arg2);
+}
+
 template <typename R>
 void AssignAndQuit(base::RunLoop* run_loop, R* result_out, R result);
 
@@ -44,6 +56,14 @@ base::Callback<void(Arg1, Arg2)> CreateResultReceiver(Arg1* arg1_out,
                     arg1_out, arg2_out);
 }

[kinuko, 2013/11/22 04:52:41]

Is it reasonable to specify we always use const & for some types?  Like:



template <typename T> struct ParamTraits {
  typedef T Type;
};
template <typename T> struct ParamTraits<std::vector<T> > {
  typedef const std::vector<T>& Type;
};
template <> struct ParamTraits<fileapi::FileSystemURL> {
  typedef const fileapi::FileSystemURL& Type;
};

template <typename Arg1, typename Arg2, typename A1, typename A2>
void ReceiveResult2(bool* done,
                    Arg1* arg1_out,
                    Arg2* arg2_out,
                    A1 arg1,
                    A2 arg2) {
  EXPECT_FALSE(*done);
  *done = true;
  *arg1_out = base::internal::CallbackForward(arg1);
  *arg2_out = base::internal::CallbackForward(arg2);
}

template <typename Arg1, typename Arg2, 
          typename A1 = typename ParamTraits<Arg1>::Type,
          typename A2 = typename ParamTraits<Arg2>::Type>
base::Callback<void(A1, A2)>
CreateResultReceiver(Arg1* arg1_out, Arg2* arg2_out) {
  return base::Bind(&ReceiveResult2<Arg1, Arg2, A1, A2>,
                    base::Owned(new bool(false)),
                    arg1_out, arg2_out);
}

 
+template <typename Arg1, typename Arg2>
+base::Callback<void(Arg1, const Arg2&)> CreateResultReceiverConst(
+    Arg1* arg1_out, Arg2* arg2_out) {
+  return base::Bind(&ReceiveResultConst2<Arg1, Arg2>,
+                    base::Owned(new bool(false)),
+                    arg1_out, arg2_out);
+}
+
 }  // namespace sync_file_system
 
 #endif  // CHROME_BROWSER_SYNC_FILE_SYSTEM_SYNC_FILE_SYSTEM_TEST_UTIL_H_