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

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

Issue 16408017: Use a direct include of utf_string_conversions.h in content/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 7 years, 6 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') | content/browser/plugin_browsertest.cc » ('j') | 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/time.h" 8 #include "base/time.h"
8 #include "base/utf_string_conversions.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"
11 #include "content/public/test/browser_test_utils.h" 11 #include "content/public/test/browser_test_utils.h"
12 #include "content/shell/shell.h" 12 #include "content/shell/shell.h"
13 #include "content/test/content_browser_test.h" 13 #include "content/test/content_browser_test.h"
14 #include "content/test/content_browser_test_utils.h" 14 #include "content/test/content_browser_test_utils.h"
15 #include "net/test/embedded_test_server/embedded_test_server.h" 15 #include "net/test/embedded_test_server/embedded_test_server.h"
16 16
17 using std::string; 17 using std::string;
18 namespace content { 18 namespace content {
(...skipping 680 matching lines...) Expand 10 before | Expand all | Expand 10 after
699 ASSERT_TRUE(ExecuteScriptAndExtractString( 699 ASSERT_TRUE(ExecuteScriptAndExtractString(
700 shell()->web_contents(), 700 shell()->web_contents(),
701 "window.domAutomationController.send(" 701 "window.domAutomationController.send("
702 "JSON.stringify(peerConnectionDataStore));", 702 "JSON.stringify(peerConnectionDataStore));",
703 &dump_json)); 703 &dump_json));
704 dump.reset(base::JSONReader::Read(dump_json)); 704 dump.reset(base::JSONReader::Read(dump_json));
705 VerifyStatsDump(dump.get(), pc_0, type, id, stats); 705 VerifyStatsDump(dump.get(), pc_0, type, id, stats);
706 } 706 }
707 707
708 } // namespace content 708 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/media/webrtc_browsertest.cc ('k') | content/browser/plugin_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698