summaryrefslogtreecommitdiffstats
path: root/third_party
diff options
context:
space:
mode:
authorgrunell@chromium.org <grunell@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-07-02 08:23:01 +0000
committergrunell@chromium.org <grunell@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-07-02 08:23:01 +0000
commit91feba4d1ddde3aea8aab96d189acf3db145d0c0 (patch)
tree290829fed86989c769843ac39cd1268f3dc8fdc9 /third_party
parentad2f5dff805493bf49ddd6634682bae4cf1dab87 (diff)
downloadchromium_src-91feba4d1ddde3aea8aab96d189acf3db145d0c0.zip
chromium_src-91feba4d1ddde3aea8aab96d189acf3db145d0c0.tar.gz
chromium_src-91feba4d1ddde3aea8aab96d189acf3db145d0c0.tar.bz2
Fixing conditional including of init_webrtc.h.
Removing conditional code in the same file. BUG=251677 Review URL: https://chromiumcodereview.appspot.com/17831002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@209650 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party')
-rw-r--r--third_party/libjingle/overrides/init_webrtc.h5
1 files changed, 0 insertions, 5 deletions
diff --git a/third_party/libjingle/overrides/init_webrtc.h b/third_party/libjingle/overrides/init_webrtc.h
index e277783..5bba57a 100644
--- a/third_party/libjingle/overrides/init_webrtc.h
+++ b/third_party/libjingle/overrides/init_webrtc.h
@@ -7,10 +7,7 @@
#include "allocator_shim/allocator_stub.h"
#include "base/logging.h"
-
-#if defined(ENABLE_WEBRTC)
#include "third_party/webrtc/system_wrappers/interface/event_tracer.h"
-#endif
class CommandLine;
@@ -45,10 +42,8 @@ typedef bool (*InitializeModuleFunction)(
DellocateFunction dealloc,
#endif
logging::LogMessageHandlerFunction log_handler,
-#if defined(ENABLE_WEBRTC)
webrtc::GetCategoryEnabledPtr trace_get_category_enabled,
webrtc::AddTraceEventPtr trace_add_trace_event,
-#endif
CreateWebRtcMediaEngineFunction* create_media_engine,
DestroyWebRtcMediaEngineFunction* destroy_media_engine);