Revert 110021 - Broke CrOS compile

base/json/json_value_serializer.h

Index: base/json/json_value_serializer.h
===================================================================
--- base/json/json_value_serializer.h	(revision 110026)
+++ base/json/json_value_serializer.h	(working copy)
@@ -39,12 +39,8 @@
   // Attempt to serialize the data structure represented by Value into
   // JSON.  If the return value is true, the result will have been written
   // into the string passed into the constructor.
-  virtual bool Serialize(const Value& root) OVERRIDE;
+  virtual bool Serialize(const Value& root);
 
-  // Equivalent to Serialize(root) except binary values are omitted from the
-  // output.
-  bool SerializeAndOmitBinaryValues(const Value& root);
-
   // Attempt to deserialize the data structure encoded in the string passed
   // in to the constructor into a structure of Value objects.  If the return
   // value is NULL, and if |error_code| is non-null, |error_code| will
@@ -52,8 +48,7 @@
   // If |error_message| is non-null, it will be filled in with a formatted
   // error message including the location of the error if appropriate.
   // The caller takes ownership of the returned value.
-  virtual Value* Deserialize(int* error_code, std::string* error_message)
-      OVERRIDE;
+  virtual Value* Deserialize(int* error_code, std::string* error_message);
 
   void set_pretty_print(bool new_value) { pretty_print_ = new_value; }
   bool pretty_print() { return pretty_print_; }
@@ -63,8 +58,6 @@
   }
 
  private:
-  bool SerializeInternal(const Value& root, bool omit_binary_values);
-
   std::string* json_string_;
   bool initialized_with_const_string_;
   bool pretty_print_;  // If true, serialization will span multiple lines.
@@ -93,12 +86,8 @@
   // Attempt to serialize the data structure represented by Value into
   // JSON.  If the return value is true, the result will have been written
   // into the file whose name was passed into the constructor.
-  virtual bool Serialize(const Value& root) OVERRIDE;
+  virtual bool Serialize(const Value& root);
 
-  // Equivalent to Serialize(root) except binary values are omitted from the
-  // output.
-  bool SerializeAndOmitBinaryValues(const Value& root);
-
   // Attempt to deserialize the data structure encoded in the file passed
   // in to the constructor into a structure of Value objects.  If the return
   // value is NULL, and if |error_code| is non-null, |error_code| will
@@ -106,8 +95,7 @@
   // If |error_message| is non-null, it will be filled in with a formatted
   // error message including the location of the error if appropriate.
   // The caller takes ownership of the returned value.
-  virtual Value* Deserialize(int* error_code, std::string* error_message)
-      OVERRIDE;
+  virtual Value* Deserialize(int* error_code, std::string* error_message);
 
   // This enum is designed to safely overlap with JSONReader::JsonParseError.
   enum JsonFileError {
@@ -129,8 +117,6 @@
   static const char* GetErrorMessageForCode(int error_code);
 
  private:
-  bool SerializeInternal(const Value& root, bool omit_binary_values);
-
   FilePath json_file_path_;
 
   // A wrapper for file_util::ReadFileToString which returns a non-zero