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

Unified Diff: chrome/browser/dom_ui/mediaplayer_browsertest.cc

Issue 5025001: Removed Labs section from Chrome OS settings page. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixed RegisterPref call Created 10 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/dom_ui/filebrowse_ui.cc ('k') | chrome/browser/dom_ui/mediaplayer_ui.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/dom_ui/mediaplayer_browsertest.cc
diff --git a/chrome/browser/dom_ui/mediaplayer_browsertest.cc b/chrome/browser/dom_ui/mediaplayer_browsertest.cc
index 1dcbfae70ef40ee8948d1351f4b36a5828a0da12..c90784a3b8c6cf6a275701183c2edeca46a32635 100644
--- a/chrome/browser/dom_ui/mediaplayer_browsertest.cc
+++ b/chrome/browser/dom_ui/mediaplayer_browsertest.cc
@@ -2,16 +2,16 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include "base/command_line.h"
#include "base/ref_counted.h"
#include "base/utf_string_conversions.h"
#include "chrome/test/automation/dom_element_proxy.h"
#include "chrome/browser/browser.h"
#include "chrome/browser/browser_list.h"
#include "chrome/browser/dom_ui/mediaplayer_ui.h"
-#include "chrome/browser/prefs/pref_service.h"
#include "chrome/browser/profile.h"
#include "chrome/browser/tab_contents/tab_contents.h"
-#include "chrome/common/pref_names.h"
+#include "chrome/common/chrome_switches.h"
#include "chrome/common/url_constants.h"
#include "chrome/test/in_process_browser_test.h"
#include "chrome/test/ui_test_utils.h"
@@ -22,6 +22,10 @@ class MediaPlayerBrowserTest : public InProcessBrowserTest {
public:
MediaPlayerBrowserTest() {}
+ virtual void SetUpCommandLine(CommandLine* command_line) {
+ command_line->AppendSwitch(switches::kEnableMediaPlayer);
+ }
+
GURL GetMusicTestURL() {
return GURL("http://localhost:1337/files/plugin/sample_mp3.mp3");
}
@@ -66,9 +70,6 @@ IN_PROC_BROWSER_TEST_F(MediaPlayerBrowserTest, Popup) {
ui_test_utils::NavigateToURL(browser(),
GURL("chrome://downloads"));
- PrefService* pref_service = browser()->profile()->GetPrefs();
- pref_service->SetBoolean(prefs::kLabsMediaplayerEnabled, true);
-
MediaPlayer* player = MediaPlayer::Get();
// Check that its not currently visible
ASSERT_FALSE(IsPlayerVisible());
@@ -85,9 +86,6 @@ IN_PROC_BROWSER_TEST_F(MediaPlayerBrowserTest, PopupPlaylist) {
GURL("chrome://downloads"));
- PrefService* pref_service = browser()->profile()->GetPrefs();
- pref_service->SetBoolean(prefs::kLabsMediaplayerEnabled, true);
-
MediaPlayer* player = MediaPlayer::Get();
player->EnqueueMediaURL(GetMusicTestURL(), NULL);
« no previous file with comments | « chrome/browser/dom_ui/filebrowse_ui.cc ('k') | chrome/browser/dom_ui/mediaplayer_ui.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698