Merge branch 'api_content_tracing_patch' of https://github.com/deepak1556/atom-shell...

diff --cc atom/browser/api/atom_api_content_tracing.cc
index b5d9cb6,7ebca44..a3299e4
--- 1/atom/browser/api/atom_api_content_tracing.cc
--- 2/atom/browser/api/atom_api_content_tracing.cc
+++ b/atom/browser/api/atom_api_content_tracing.cc
@@@ -17,25 -17,11 +17,11 @@@ using content::TracingController
  
  namespace mate {
  
- template<typename T>
- struct Converter<std::set<T> > {
-   static v8::Handle<v8::Value> ToV8(v8::Isolate* isolate,
-                                     const std::set<T>& val) {
-     v8::Handle<v8::Array> result = v8::Array::New(
-         isolate, static_cast<int>(val.size()));
-     typename std::set<T>::const_iterator it;
-     int i;
-     for (i = 0, it = val.begin(); it != val.end(); ++it, ++i)
-       result->Set(i, Converter<T>::ToV8(isolate, *it));
-     return result;
-   }
- };
- 
  template<>
 -struct Converter<base::debug::CategoryFilter> {
 +struct Converter<base::trace_event::CategoryFilter> {
    static bool FromV8(v8::Isolate* isolate,
                       v8::Handle<v8::Value> val,
 -                     base::debug::CategoryFilter* out) {
 +                     base::trace_event::CategoryFilter* out) {
      std::string filter;
      if (!ConvertFromV8(isolate, val, &filter))
        return false;