| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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/memory/ref_counted.h" | 6 #include "base/memory/ref_counted.h" |
| 7 #include "base/utf_string_conversions.h" | 7 #include "base/utf_string_conversions.h" |
| 8 #include "chrome/browser/chromeos/media/media_player.h" | 8 #include "chrome/browser/chromeos/media/media_player.h" |
| 9 #include "chrome/browser/ui/browser.h" | 9 #include "chrome/browser/ui/browser.h" |
| 10 #include "chrome/browser/ui/browser_list.h" | 10 #include "chrome/browser/ui/browser_list.h" |
| 11 #include "chrome/common/chrome_switches.h" | 11 #include "chrome/common/chrome_switches.h" |
| 12 #include "chrome/common/url_constants.h" | 12 #include "chrome/common/url_constants.h" |
| 13 #include "chrome/test/automation/dom_element_proxy.h" | 13 #include "chrome/test/automation/dom_element_proxy.h" |
| 14 #include "chrome/test/in_process_browser_test.h" | 14 #include "chrome/test/base/in_process_browser_test.h" |
| 15 #include "chrome/test/ui_test_utils.h" | 15 #include "chrome/test/base/ui_test_utils.h" |
| 16 #include "content/browser/tab_contents/tab_contents.h" | 16 #include "content/browser/tab_contents/tab_contents.h" |
| 17 | 17 |
| 18 class MediaPlayerBrowserTest : public InProcessBrowserTest { | 18 class MediaPlayerBrowserTest : public InProcessBrowserTest { |
| 19 public: | 19 public: |
| 20 MediaPlayerBrowserTest() {} | 20 MediaPlayerBrowserTest() {} |
| 21 | 21 |
| 22 GURL GetMusicTestURL() { | 22 GURL GetMusicTestURL() { |
| 23 return GURL("http://localhost:1337/files/plugin/sample_mp3.mp3"); | 23 return GURL("http://localhost:1337/files/plugin/sample_mp3.mp3"); |
| 24 } | 24 } |
| 25 | 25 |
| (...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 69 | 69 |
| 70 player->EnqueueMediaFileUrl(GetMusicTestURL(), NULL); | 70 player->EnqueueMediaFileUrl(GetMusicTestURL(), NULL); |
| 71 | 71 |
| 72 EXPECT_FALSE(IsPlaylistVisible()); | 72 EXPECT_FALSE(IsPlaylistVisible()); |
| 73 | 73 |
| 74 player->TogglePlaylistWindowVisible(); | 74 player->TogglePlaylistWindowVisible(); |
| 75 | 75 |
| 76 EXPECT_TRUE(IsPlaylistVisible()); | 76 EXPECT_TRUE(IsPlaylistVisible()); |
| 77 } | 77 } |
| 78 | 78 |
| OLD | NEW |