OLD | NEW |
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 <stdint.h> | 5 #include <stdint.h> |
6 | 6 |
7 #include "base/auto_reset.h" | 7 #include "base/auto_reset.h" |
8 #include "base/callback.h" | 8 #include "base/callback.h" |
9 #include "base/files/file_util.h" | 9 #include "base/files/file_util.h" |
10 #include "base/files/scoped_temp_dir.h" | 10 #include "base/files/scoped_temp_dir.h" |
(...skipping 246 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
257 browser()->profile()); | 257 browser()->profile()); |
258 base::RunLoop runloop; | 258 base::RunLoop runloop; |
259 preferences->EnsureInitialized(runloop.QuitClosure()); | 259 preferences->EnsureInitialized(runloop.QuitClosure()); |
260 runloop.Run(); | 260 runloop.Run(); |
261 return preferences; | 261 return preferences; |
262 } | 262 } |
263 | 263 |
264 std::string device_id_; | 264 std::string device_id_; |
265 base::ScopedTempDir fake_gallery_temp_dir_; | 265 base::ScopedTempDir fake_gallery_temp_dir_; |
266 int test_jpg_size_; | 266 int test_jpg_size_; |
267 scoped_ptr<EnsureMediaDirectoriesExists> ensure_media_directories_exists_; | 267 std::unique_ptr<EnsureMediaDirectoriesExists> |
| 268 ensure_media_directories_exists_; |
268 }; | 269 }; |
269 | 270 |
270 #if !defined(DISABLE_NACL) | 271 #if !defined(DISABLE_NACL) |
271 class MediaGalleriesPlatformAppPpapiTest | 272 class MediaGalleriesPlatformAppPpapiTest |
272 : public MediaGalleriesPlatformAppBrowserTest { | 273 : public MediaGalleriesPlatformAppBrowserTest { |
273 protected: | 274 protected: |
274 void SetUpCommandLine(base::CommandLine* command_line) override { | 275 void SetUpCommandLine(base::CommandLine* command_line) override { |
275 MediaGalleriesPlatformAppBrowserTest::SetUpCommandLine(command_line); | 276 MediaGalleriesPlatformAppBrowserTest::SetUpCommandLine(command_line); |
276 command_line->AppendSwitch(switches::kEnablePepperTesting); | 277 command_line->AppendSwitch(switches::kEnablePepperTesting); |
277 } | 278 } |
(...skipping 178 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
456 | 457 |
457 base::ListValue custom_args; | 458 base::ListValue custom_args; |
458 #if defined(USE_PROPRIETARY_CODECS) | 459 #if defined(USE_PROPRIETARY_CODECS) |
459 custom_args.AppendBoolean(true); | 460 custom_args.AppendBoolean(true); |
460 #else | 461 #else |
461 custom_args.AppendBoolean(false); | 462 custom_args.AppendBoolean(false); |
462 #endif | 463 #endif |
463 ASSERT_TRUE(RunMediaGalleriesTestWithArg("media_metadata", custom_args)) | 464 ASSERT_TRUE(RunMediaGalleriesTestWithArg("media_metadata", custom_args)) |
464 << message_; | 465 << message_; |
465 } | 466 } |
OLD | NEW |