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

Side by Side Diff: chrome/browser/media/media_browsertest.cc

Issue 1755403002: Do not change the case of titles in Utils.setResultInTitle(). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Allow CDM crash tests to pass. Created 4 years, 9 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
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 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 "chrome/browser/media/media_browsertest.h" 5 #include "chrome/browser/media/media_browsertest.h"
6 6
7 #include "base/i18n/time_formatting.h" 7 #include "base/i18n/time_formatting.h"
8 #include "base/strings/utf_string_conversions.h" 8 #include "base/strings/utf_string_conversions.h"
9 #include "base/time/time.h" 9 #include "base/time/time.h"
10 #include "chrome/browser/ui/browser.h" 10 #include "chrome/browser/ui/browser.h"
11 #include "chrome/browser/ui/tabs/tab_strip_model.h" 11 #include "chrome/browser/ui/tabs/tab_strip_model.h"
12 #include "chrome/test/base/ui_test_utils.h" 12 #include "chrome/test/base/ui_test_utils.h"
13 #include "content/public/browser/navigation_controller.h" 13 #include "content/public/browser/navigation_controller.h"
14 #include "content/public/browser/navigation_entry.h" 14 #include "content/public/browser/navigation_entry.h"
15 #include "content/public/browser/web_contents.h" 15 #include "content/public/browser/web_contents.h"
16 #include "content/public/test/browser_test_utils.h" 16 #include "content/public/test/browser_test_utils.h"
17 #include "media/base/test_data_util.h" 17 #include "media/base/test_data_util.h"
18 #include "net/test/embedded_test_server/embedded_test_server.h" 18 #include "net/test/embedded_test_server/embedded_test_server.h"
19 19
20 // Common test results. 20 // Normal failure title.
21 const char MediaBrowserTest::kFailed[] = "FAILED";
22
23 // Capitalized event name set by Utils.installTitleEventHandler().
21 const char MediaBrowserTest::kEnded[] = "ENDED"; 24 const char MediaBrowserTest::kEnded[] = "ENDED";
ddorwin 2016/03/04 19:00:16 Should we make this more unique as well? "TEST_END
sandersd (OOO until July 31) 2016/03/04 19:26:00 We certainly should. I've filed a bug to track the
ddorwin 2016/03/04 20:14:06 FTR, https://bugs.chromium.org/p/chromium/issues/d
ddorwin 2016/03/04 20:14:06 Perhaps this should be kEndedEvent to make it clea
sandersd (OOO until July 31) 2016/03/04 20:40:17 I'm not certain that it is always used to mean tha
22 const char MediaBrowserTest::kError[] = "ERROR"; 25
23 const char MediaBrowserTest::kFailed[] = "FAILED"; 26 // Uncapitalized event name as set by Utils.failTest().
27 // TODO(sandersd): Change the tests to use a more unique message.
28 const char MediaBrowserTest::kError[] = "error";
24 29
25 MediaBrowserTest::MediaBrowserTest() : ignore_plugin_crash_(false) {} 30 MediaBrowserTest::MediaBrowserTest() : ignore_plugin_crash_(false) {}
26 31
27 MediaBrowserTest::~MediaBrowserTest() {} 32 MediaBrowserTest::~MediaBrowserTest() {}
28 33
29 void MediaBrowserTest::RunMediaTestPage(const std::string& html_page, 34 void MediaBrowserTest::RunMediaTestPage(const std::string& html_page,
30 const base::StringPairs& query_params, 35 const base::StringPairs& query_params,
31 const std::string& expected_title, 36 const std::string& expected_title,
32 bool http) { 37 bool http) {
33 GURL gurl; 38 GURL gurl;
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
73 base::ProcessId plugin_pid) { 78 base::ProcessId plugin_pid) {
74 DVLOG(0) << "Plugin crashed: " << plugin_path.value(); 79 DVLOG(0) << "Plugin crashed: " << plugin_path.value();
75 if (ignore_plugin_crash_) 80 if (ignore_plugin_crash_)
76 return; 81 return;
77 ADD_FAILURE() << "Failing test due to plugin crash."; 82 ADD_FAILURE() << "Failing test due to plugin crash.";
78 } 83 }
79 84
80 void MediaBrowserTest::IgnorePluginCrash() { 85 void MediaBrowserTest::IgnorePluginCrash() {
81 ignore_plugin_crash_ = true; 86 ignore_plugin_crash_ = true;
82 } 87 }
OLDNEW
« no previous file with comments | « no previous file | media/test/data/eme_player_js/utils.js » ('j') | media/test/data/eme_player_js/utils.js » ('J')

Powered by Google App Engine
This is Rietveld 408576698