summaryrefslogtreecommitdiffstats
path: root/ppapi/cpp
diff options
context:
space:
mode:
authoryzshen@chromium.org <yzshen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-05-03 18:19:49 +0000
committeryzshen@chromium.org <yzshen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-05-03 18:19:49 +0000
commitdba9eb05de97710caf483f8c3f6358a25f1ed8e2 (patch)
tree9cd5fa5583aae061ea3f6028de6278fb57d336da /ppapi/cpp
parentcfec4e0927f49fb492e061b1914a6774cdb6d0bf (diff)
downloadchromium_src-dba9eb05de97710caf483f8c3f6358a25f1ed8e2.zip
chromium_src-dba9eb05de97710caf483f8c3f6358a25f1ed8e2.tar.gz
chromium_src-dba9eb05de97710caf483f8c3f6358a25f1ed8e2.tar.bz2
Revert 198126 - Reland: Add Pepper API tests for chrome.socket.
This CL also refactors the gyp definitions for building NaCl testing modules. The original CL is https://codereview.chromium.org/13811036/ (The four reviewers on the TBR line have LG-ed it.) BUG=226303 TEST=None TBR=bradnelson@google.com Review URL: https://codereview.chromium.org/14236010 TBR=yzshen@chromium.org Review URL: https://codereview.chromium.org/14869004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@198140 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi/cpp')
-rw-r--r--ppapi/cpp/extensions/dict_field.h10
1 files changed, 4 insertions, 6 deletions
diff --git a/ppapi/cpp/extensions/dict_field.h b/ppapi/cpp/extensions/dict_field.h
index 5a085c3a..1a01e44 100644
--- a/ppapi/cpp/extensions/dict_field.h
+++ b/ppapi/cpp/extensions/dict_field.h
@@ -28,9 +28,8 @@ class DictField {
const std::string& key() const { return key_; }
- // Returns the value.
- T& operator()() { return value_; }
- const T& operator()() const { return value_; }
+ T& value() { return value_; }
+ const T& value() const { return value_; }
// Adds this field to the dictionary var.
bool AddTo(VarDictionary_Dev* dict) const {
@@ -67,9 +66,8 @@ class OptionalDictField {
const std::string& key() const { return key_; }
- // Returns the value.
- Optional<T>& operator()() { return value_; }
- const Optional<T>& operator()() const { return value_; }
+ Optional<T>& value() { return value_; }
+ const Optional<T>& value() const { return value_; }
// Adds this field to the dictionary var, if |value| has been set.
bool MayAddTo(VarDictionary_Dev* dict) const {