| Index: extensions/browser/extension_function.h
 | 
| diff --git a/extensions/browser/extension_function.h b/extensions/browser/extension_function.h
 | 
| index 3428ee7ddc0fdfbb96639e3535d75e27abc61bf3..5200d268e8be59971f4d35f556ee0eeeb38626aa 100644
 | 
| --- a/extensions/browser/extension_function.h
 | 
| +++ b/extensions/browser/extension_function.h
 | 
| @@ -295,22 +295,17 @@
 | 
|    //
 | 
|    // Success, no arguments to pass to caller.
 | 
|    ResponseValue NoArguments();
 | 
| -  // Success, a single argument |arg| to pass to caller. TAKES OWNERSHIP - a
 | 
| -  // raw pointer for convenience, since callers usually construct the argument
 | 
| -  // to this by hand.
 | 
| -  ResponseValue OneArgument(base::Value* arg);
 | 
|    // Success, a single argument |arg| to pass to caller.
 | 
|    ResponseValue OneArgument(std::unique_ptr<base::Value> arg);
 | 
| -  // Success, two arguments |arg1| and |arg2| to pass to caller. TAKES
 | 
| -  // OWNERSHIP - raw pointers for convenience, since callers usually construct
 | 
| -  // the argument to this by hand. Note that use of this function may imply you
 | 
| +  // Success, two arguments |arg1| and |arg2| to pass to caller.
 | 
| +  // Note that use of this function may imply you
 | 
|    // should be using the generated Result struct and ArgumentList.
 | 
| -  ResponseValue TwoArguments(base::Value* arg1, base::Value* arg2);
 | 
| -  // Success, a list of arguments |results| to pass to caller. TAKES OWNERSHIP
 | 
| +  ResponseValue TwoArguments(std::unique_ptr<base::Value> arg1,
 | 
| +                             std::unique_ptr<base::Value> arg2);
 | 
| +  // Success, a list of arguments |results| to pass to caller.
 | 
|    // - a std::unique_ptr<> for convenience, since callers usually get this from
 | 
| -  // the
 | 
| -  // result of a Create(...) call on the generated Results struct, for example,
 | 
| -  // alarms::Get::Results::Create(alarm).
 | 
| +  //   the result of a Create(...) call on the generated Results struct. For
 | 
| +  //   example, alarms::Get::Results::Create(alarm).
 | 
|    ResponseValue ArgumentList(std::unique_ptr<base::ListValue> results);
 | 
|    // Error. chrome.runtime.lastError.message will be set to |error|.
 | 
|    ResponseValue Error(const std::string& error);
 | 
| @@ -326,7 +321,7 @@
 | 
|                        const std::string& s1,
 | 
|                        const std::string& s2,
 | 
|                        const std::string& s3);
 | 
| -  // Error with a list of arguments |args| to pass to caller. TAKES OWNERSHIP.
 | 
| +  // Error with a list of arguments |args| to pass to caller.
 | 
|    // Using this ResponseValue indicates something is wrong with the API.
 | 
|    // It shouldn't be possible to have both an error *and* some arguments.
 | 
|    // Some legacy APIs do rely on it though, like webstorePrivate.
 | 
| 
 |