Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(797)

Side by Side Diff: content/browser/media/webrtc_internals_browsertest.cc

Issue 23766035: Re-enabling WebRTC linux content browser tests. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « content/browser/media/webrtc_browsertest.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "base/command_line.h" 5 #include "base/command_line.h"
6 #include "base/json/json_reader.h" 6 #include "base/json/json_reader.h"
7 #include "base/strings/utf_string_conversions.h" 7 #include "base/strings/utf_string_conversions.h"
8 #include "base/time/time.h" 8 #include "base/time/time.h"
9 #include "base/values.h" 9 #include "base/values.h"
10 #include "content/public/common/content_switches.h" 10 #include "content/public/common/content_switches.h"
(...skipping 100 matching lines...) Expand 10 before | Expand all | Expand 10 after
111 std::vector<EventEntry> events_; 111 std::vector<EventEntry> events_;
112 // This is a record of the history of stats value reported for each stats 112 // This is a record of the history of stats value reported for each stats
113 // report id (e.g. ssrc-1234) for each stats name (e.g. framerate). 113 // report id (e.g. ssrc-1234) for each stats name (e.g. framerate).
114 // It a 2-D map with each map entry is a vector of reported values. 114 // It a 2-D map with each map entry is a vector of reported values.
115 // It is used to verify the graph data series. 115 // It is used to verify the graph data series.
116 std::map<string, StatsMap> stats_; 116 std::map<string, StatsMap> stats_;
117 }; 117 };
118 118
119 static const int64 FAKE_TIME_STAMP = 3600000; 119 static const int64 FAKE_TIME_STAMP = 3600000;
120 120
121 #if defined(OS_WIN) || defined(OS_LINUX) 121 #if defined(OS_WIN)
122 // All tests are flaky on Windows: crbug.com/277322. 122 // All tests are flaky on Windows: crbug.com/277322.
123 // All tests are flaky on Linux: crbug.com/281492.
124 #define MAYBE_WebRTCInternalsBrowserTest DISABLED_WebRTCInternalsBrowserTest 123 #define MAYBE_WebRTCInternalsBrowserTest DISABLED_WebRTCInternalsBrowserTest
125 #else 124 #else
126 #define MAYBE_WebRTCInternalsBrowserTest WebRTCInternalsBrowserTest 125 #define MAYBE_WebRTCInternalsBrowserTest WebRTCInternalsBrowserTest
127 #endif 126 #endif
128 127
129 class MAYBE_WebRTCInternalsBrowserTest: public ContentBrowserTest { 128 class MAYBE_WebRTCInternalsBrowserTest: public ContentBrowserTest {
130 public: 129 public:
131 MAYBE_WebRTCInternalsBrowserTest() {} 130 MAYBE_WebRTCInternalsBrowserTest() {}
132 virtual ~MAYBE_WebRTCInternalsBrowserTest() {} 131 virtual ~MAYBE_WebRTCInternalsBrowserTest() {}
133 132
(...skipping 576 matching lines...) Expand 10 before | Expand all | Expand 10 after
710 ASSERT_TRUE(ExecuteScriptAndExtractString( 709 ASSERT_TRUE(ExecuteScriptAndExtractString(
711 shell()->web_contents(), 710 shell()->web_contents(),
712 "window.domAutomationController.send(" 711 "window.domAutomationController.send("
713 "JSON.stringify(peerConnectionDataStore));", 712 "JSON.stringify(peerConnectionDataStore));",
714 &dump_json)); 713 &dump_json));
715 dump.reset(base::JSONReader::Read(dump_json)); 714 dump.reset(base::JSONReader::Read(dump_json));
716 VerifyStatsDump(dump.get(), pc_0, type, id, stats); 715 VerifyStatsDump(dump.get(), pc_0, type, id, stats);
717 } 716 }
718 717
719 } // namespace content 718 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/media/webrtc_browsertest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698