DM: move ext into key

dm/DMJsonWriter.cpp

 /*
  * Copyright 2014 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "DMJsonWriter.h"
 
 #include "SkCommonFlags.h"
@@ skipping 36 matching lines @@
         root["key"][FLAGS_key[i-1]] = FLAGS_key[i];
     }
 
     {
         SkAutoMutexAcquire lock(&gBitmapResultLock);
         for (int i = 0; i < gBitmapResults.count(); i++) {
             Json::Value result;
             result["key"]["name"]        = gBitmapResults[i].name.c_str();
             result["key"]["config"]      = gBitmapResults[i].config.c_str();
             result["key"]["source_type"] = gBitmapResults[i].sourceType.c_str();
-            result["ext"]                = gBitmapResults[i].ext.c_str();
+            result["options"]["ext"]     = gBitmapResults[i].ext.c_str();
             result["md5"]                = gBitmapResults[i].md5.c_str();
 
             root["results"].append(result);
         }
     }
 
     {
         SkAutoMutexAcquire lock(gFailureLock);
         for (int i = 0; i < gFailures.count(); i++) {
             Json::Value result;
@@ skipping 26 matching lines @@
         return false;
     }
 
     const Json::Value& results = root["results"];
     BitmapResult br;
     for (unsigned i = 0; i < results.size(); i++) {
         const Json::Value& r = results[i];
         br.name       = r["key"]["name"].asCString();
         br.config     = r["key"]["config"].asCString();
         br.sourceType = r["key"]["source_type"].asCString();
-        br.ext        = r["ext"].asCString();
+        br.ext        = r["options"]["ext"].asCString();
         br.md5        = r["md5"].asCString();
         callback(br);
     }
     return true;
 }
 
 } // namespace DM