Merge pull request #6941 from deepak1556/blob_data_patch

protocol: provide blob uuid with uploadData

diff --cc atom/common/native_mate_converters/net_converter.cc
index 3106eb0,f9fc12f..d74356e
--- 1/atom/common/native_mate_converters/net_converter.cc
--- 2/atom/common/native_mate_converters/net_converter.cc
+++ b/atom/common/native_mate_converters/net_converter.cc
@@@ -19,9 -20,8 +19,10 @@@
  #include "net/cert/x509_certificate.h"
  #include "net/http/http_response_headers.h"
  #include "net/url_request/url_request.h"
+ #include "storage/browser/blob/upload_blob_element_reader.h"
  
 +#include "atom/common/node_includes.h"
 +
  namespace mate {
  
  // static

diff --cc filenames.gypi
Simple merge