Fix the failed case ValueStoreTest.DotsInKeyNamesWithDicts for Android

base/json/json_parser.cc

 // 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.
 
 #include "base/json/json_parser.h"
 
 #include "base/float_util.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/string_number_conversions.h"
@@ skipping 190 matching lines @@
       error_line_(0),
       error_column_(0) {
 }
 
 JSONParser::~JSONParser() {
 }
 
 Value* JSONParser::Parse(const StringPiece& input) {
   // TODO(rsesek): Windows has problems with StringPiece/hidden roots. Fix
   // <http://crbug.com/126107> when my Windows box arrives.
-#if defined(OS_WIN)
+  // For Android, swapping string doesn't mean swapping internal pointers
+  // but swapping contents. Since it can't provide the performance gain,
+  // set the below flag to disable the optimization and make it work.
+#if defined(OS_WIN) || defined(OS_ANDROID)
   options_ |= JSON_DETACHABLE_CHILDREN;
 #endif
 
   std::string input_copy;
   // If the children of a JSON root can be detached, then hidden roots cannot
   // be used, so do not bother copying the input because StringPiece will not
   // be used anywhere.
   if (!(options_ & JSON_DETACHABLE_CHILDREN)) {
     input_copy = input.as_string();
     start_pos_ = input_copy.data();
@@ skipping 739 matching lines @@
                                            const std::string& description) {
   if (line || column) {
     return StringPrintf("Line: %i, column: %i, %s",
         line, column, description.c_str());
   }
   return description;
 }
 
 }  // namespace internal
 }  // namespace base