| 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 408 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 419 base::ListValue custom_args; | 419 base::ListValue custom_args; |
| 420 custom_args.AppendInteger(test_jpg_size()); | 420 custom_args.AppendInteger(test_jpg_size()); |
| 421 ASSERT_TRUE(RunMediaGalleriesTestWithArg("picasa", custom_args)) << message_; | 421 ASSERT_TRUE(RunMediaGalleriesTestWithArg("picasa", custom_args)) << message_; |
| 422 } | 422 } |
| 423 | 423 |
| 424 IN_PROC_BROWSER_TEST_F(MediaGalleriesPlatformAppBrowserTest, | 424 IN_PROC_BROWSER_TEST_F(MediaGalleriesPlatformAppBrowserTest, |
| 425 MAYBE_PicasaCustomLocation) { | 425 MAYBE_PicasaCustomLocation) { |
| 426 base::ScopedTempDir custom_picasa_app_data_root; | 426 base::ScopedTempDir custom_picasa_app_data_root; |
| 427 ASSERT_TRUE(custom_picasa_app_data_root.CreateUniqueTempDir()); | 427 ASSERT_TRUE(custom_picasa_app_data_root.CreateUniqueTempDir()); |
| 428 ensure_media_directories_exists()->SetCustomPicasaAppDataPath( | 428 ensure_media_directories_exists()->SetCustomPicasaAppDataPath( |
| 429 custom_picasa_app_data_root.path()); | 429 custom_picasa_app_data_root.GetPath()); |
| 430 PopulatePicasaTestData(custom_picasa_app_data_root.path()); | 430 PopulatePicasaTestData(custom_picasa_app_data_root.GetPath()); |
| 431 | 431 |
| 432 base::ListValue custom_args; | 432 base::ListValue custom_args; |
| 433 custom_args.AppendInteger(test_jpg_size()); | 433 custom_args.AppendInteger(test_jpg_size()); |
| 434 ASSERT_TRUE(RunMediaGalleriesTestWithArg("picasa", custom_args)) << message_; | 434 ASSERT_TRUE(RunMediaGalleriesTestWithArg("picasa", custom_args)) << message_; |
| 435 } | 435 } |
| 436 #endif // defined(OS_WIN) || defined(OS_MACOSX) | 436 #endif // defined(OS_WIN) || defined(OS_MACOSX) |
| 437 | 437 |
| 438 IN_PROC_BROWSER_TEST_F(MediaGalleriesPlatformAppBrowserTest, ToURL) { | 438 IN_PROC_BROWSER_TEST_F(MediaGalleriesPlatformAppBrowserTest, ToURL) { |
| 439 RemoveAllGalleries(); | 439 RemoveAllGalleries(); |
| 440 MediaGalleryPrefId pref_id; | 440 MediaGalleryPrefId pref_id; |
| (...skipping 16 matching lines...) Expand all Loading... |
| 457 | 457 |
| 458 base::ListValue custom_args; | 458 base::ListValue custom_args; |
| 459 #if defined(USE_PROPRIETARY_CODECS) | 459 #if defined(USE_PROPRIETARY_CODECS) |
| 460 custom_args.AppendBoolean(true); | 460 custom_args.AppendBoolean(true); |
| 461 #else | 461 #else |
| 462 custom_args.AppendBoolean(false); | 462 custom_args.AppendBoolean(false); |
| 463 #endif | 463 #endif |
| 464 ASSERT_TRUE(RunMediaGalleriesTestWithArg("media_metadata", custom_args)) | 464 ASSERT_TRUE(RunMediaGalleriesTestWithArg("media_metadata", custom_args)) |
| 465 << message_; | 465 << message_; |
| 466 } | 466 } |
| OLD | NEW |