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

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

Issue 687803005: [content/browser/media] Convert VLOGs to DVLOGs (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 1 month 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/strings/utf_string_conversions.h" 7 #include "base/strings/utf_string_conversions.h"
8 #include "chrome/browser/ui/browser.h" 8 #include "chrome/browser/ui/browser.h"
9 #include "chrome/browser/ui/tabs/tab_strip_model.h" 9 #include "chrome/browser/ui/tabs/tab_strip_model.h"
10 #include "chrome/test/base/ui_test_utils.h" 10 #include "chrome/test/base/ui_test_utils.h"
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
65 65
66 void MediaBrowserTest::AddWaitForTitles(content::TitleWatcher* title_watcher) { 66 void MediaBrowserTest::AddWaitForTitles(content::TitleWatcher* title_watcher) {
67 title_watcher->AlsoWaitForTitle(base::ASCIIToUTF16(kEnded)); 67 title_watcher->AlsoWaitForTitle(base::ASCIIToUTF16(kEnded));
68 title_watcher->AlsoWaitForTitle(base::ASCIIToUTF16(kError)); 68 title_watcher->AlsoWaitForTitle(base::ASCIIToUTF16(kError));
69 title_watcher->AlsoWaitForTitle(base::ASCIIToUTF16(kFailed)); 69 title_watcher->AlsoWaitForTitle(base::ASCIIToUTF16(kFailed));
70 title_watcher->AlsoWaitForTitle(base::ASCIIToUTF16(kPluginCrashed)); 70 title_watcher->AlsoWaitForTitle(base::ASCIIToUTF16(kPluginCrashed));
71 } 71 }
72 72
73 void MediaBrowserTest::PluginCrashed(const base::FilePath& plugin_path, 73 void MediaBrowserTest::PluginCrashed(const base::FilePath& plugin_path,
74 base::ProcessId plugin_pid) { 74 base::ProcessId plugin_pid) {
75 VLOG(0) << "Plugin crashed: " << plugin_path.value(); 75 DVLOG(0) << "Plugin crashed: " << plugin_path.value();
76 if (ignore_plugin_crash_) 76 if (ignore_plugin_crash_)
77 return; 77 return;
78 // Update document title to quit TitleWatcher early. 78 // Update document title to quit TitleWatcher early.
79 web_contents()->GetController().GetActiveEntry() 79 web_contents()->GetController().GetActiveEntry()
80 ->SetTitle(base::ASCIIToUTF16(kPluginCrashed)); 80 ->SetTitle(base::ASCIIToUTF16(kPluginCrashed));
81 ADD_FAILURE() << "Failing test due to plugin crash."; 81 ADD_FAILURE() << "Failing test due to plugin crash.";
82 } 82 }
83 83
84 void MediaBrowserTest::IgnorePluginCrash() { 84 void MediaBrowserTest::IgnorePluginCrash() {
85 ignore_plugin_crash_ = true; 85 ignore_plugin_crash_ = true;
86 } 86 }
87 87
OLDNEW
« no previous file with comments | « chrome/browser/media/encrypted_media_browsertest.cc ('k') | chrome/browser/media/test_license_server.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698