Consolidate constructormagic macros with Chromium version and remove Chromium override.

talk/media/base/streamparams.h

 /*
  * libjingle
  * Copyright 2011 Google Inc.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
  *
  *  1. Redistributions of source code must retain the above copyright notice,
  *     this list of conditions and the following disclaimer.
  *  2. Redistributions in binary form must reproduce the above copyright notice,
@@ skipping 31 matching lines @@
 
 #ifndef TALK_MEDIA_BASE_STREAMPARAMS_H_
 #define TALK_MEDIA_BASE_STREAMPARAMS_H_
 
 #include <algorithm>
 #include <set>
 #include <string>
 #include <vector>
 
 #include "webrtc/base/basictypes.h"
+#include "webrtc/base/constructormagic.h"
 
 namespace cricket {
 
 extern const char kFecSsrcGroupSemantics[];
 extern const char kFidSsrcGroupSemantics[];
 extern const char kSimSsrcGroupSemantics[];
 
 struct SsrcGroup {
   SsrcGroup(const std::string& usage, const std::vector<uint32>& ssrcs)
       : semantics(usage), ssrcs(ssrcs) {
@@ skipping 276 matching lines @@
 bool IsOneSsrcStream(const StreamParams& sp);
 
 // Checks if |sp| defines parameters for one Simulcast stream. There may be RTX
 // streams associated with the simulcast streams. Leaving as non-static so we
 // can test this function.
 bool IsSimulcastStream(const StreamParams& sp);
 
 }  // namespace cricket
 
 #endif  // TALK_MEDIA_BASE_STREAMPARAMS_H_