| 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);
|
|
|