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

Side by Side Diff: content/browser/media/encrypted_media_browsertest.cc

Issue 12213066: Use base namespace for FilePath in content/browser (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 10 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 | Annotate | Revision Log
« no previous file with comments | « content/browser/media/audio_browsertest.cc ('k') | content/browser/media/media_browsertest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/basictypes.h" 5 #include "base/basictypes.h"
6 #include "base/command_line.h" 6 #include "base/command_line.h"
7 #include "base/file_util.h" 7 #include "base/file_util.h"
8 #include "base/path_service.h" 8 #include "base/path_service.h"
9 #include "base/string16.h" 9 #include "base/string16.h"
10 #include "base/string_util.h" 10 #include "base/string_util.h"
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after
85 } 85 }
86 } 86 }
87 87
88 protected: 88 protected:
89 // Registers any CDM plugins not registered by default. 89 // Registers any CDM plugins not registered by default.
90 virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { 90 virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
91 command_line->AppendSwitch(switches::kDisableAudio); 91 command_line->AppendSwitch(switches::kDisableAudio);
92 command_line->AppendSwitch(switches::kPpapiOutOfProcess); 92 command_line->AppendSwitch(switches::kPpapiOutOfProcess);
93 93
94 // Append the switch to register the Clear Key CDM plugin. 94 // Append the switch to register the Clear Key CDM plugin.
95 FilePath plugin_dir; 95 base::FilePath plugin_dir;
96 EXPECT_TRUE(PathService::Get(base::DIR_MODULE, &plugin_dir)); 96 EXPECT_TRUE(PathService::Get(base::DIR_MODULE, &plugin_dir));
97 FilePath plugin_lib = plugin_dir.Append(kLibraryName); 97 base::FilePath plugin_lib = plugin_dir.Append(kLibraryName);
98 EXPECT_TRUE(file_util::PathExists(plugin_lib)); 98 EXPECT_TRUE(file_util::PathExists(plugin_lib));
99 FilePath::StringType pepper_plugin = plugin_lib.value(); 99 base::FilePath::StringType pepper_plugin = plugin_lib.value();
100 pepper_plugin.append(FILE_PATH_LITERAL( 100 pepper_plugin.append(FILE_PATH_LITERAL(
101 "#Clear Key CDM#Clear Key CDM 0.1.0.0#0.1.0.0;")); 101 "#Clear Key CDM#Clear Key CDM 0.1.0.0#0.1.0.0;"));
102 #if defined(OS_WIN) 102 #if defined(OS_WIN)
103 pepper_plugin.append(ASCIIToWide( 103 pepper_plugin.append(ASCIIToWide(
104 webkit_media::GetPluginType(kExternalClearKeyKeySystem))); 104 webkit_media::GetPluginType(kExternalClearKeyKeySystem)));
105 #else 105 #else
106 pepper_plugin.append( 106 pepper_plugin.append(
107 webkit_media::GetPluginType(kExternalClearKeyKeySystem)); 107 webkit_media::GetPluginType(kExternalClearKeyKeySystem));
108 #endif 108 #endif
109 command_line->AppendSwitchNative(switches::kRegisterPepperPlugins, 109 command_line->AppendSwitchNative(switches::kRegisterPepperPlugins,
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
164 #define MAYBE_FrameChangeVideo DISABLED_FrameChangeVideo 164 #define MAYBE_FrameChangeVideo DISABLED_FrameChangeVideo
165 #else 165 #else
166 #define MAYBE_FrameChangeVideo FrameChangeVideo 166 #define MAYBE_FrameChangeVideo FrameChangeVideo
167 #endif 167 #endif
168 IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, MAYBE_FrameChangeVideo) { 168 IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, MAYBE_FrameChangeVideo) {
169 const string16 kExpected = ASCIIToUTF16("ENDED"); 169 const string16 kExpected = ASCIIToUTF16("ENDED");
170 ASSERT_NO_FATAL_FAILURE(TestFrameSizeChange(GetParam(), kExpected)); 170 ASSERT_NO_FATAL_FAILURE(TestFrameSizeChange(GetParam(), kExpected));
171 } 171 }
172 172
173 } // namespace content 173 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/media/audio_browsertest.cc ('k') | content/browser/media/media_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698