| 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 "base/auto_reset.h" | 5 #include "base/auto_reset.h" |
| 6 #include "base/callback.h" | 6 #include "base/callback.h" |
| 7 #include "base/files/file_util.h" | 7 #include "base/files/file_util.h" |
| 8 #include "base/files/scoped_temp_dir.h" | 8 #include "base/files/scoped_temp_dir.h" |
| 9 #include "base/json/json_writer.h" | 9 #include "base/json/json_writer.h" |
| 10 #include "base/numerics/safe_conversions.h" | 10 #include "base/numerics/safe_conversions.h" |
| (...skipping 419 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 430 runloop.Run(); | 430 runloop.Run(); |
| 431 return preferences; | 431 return preferences; |
| 432 } | 432 } |
| 433 | 433 |
| 434 std::string device_id_; | 434 std::string device_id_; |
| 435 base::ScopedTempDir fake_gallery_temp_dir_; | 435 base::ScopedTempDir fake_gallery_temp_dir_; |
| 436 int test_jpg_size_; | 436 int test_jpg_size_; |
| 437 scoped_ptr<EnsureMediaDirectoriesExists> ensure_media_directories_exists_; | 437 scoped_ptr<EnsureMediaDirectoriesExists> ensure_media_directories_exists_; |
| 438 }; | 438 }; |
| 439 | 439 |
| 440 #if !defined(DISABLE_NACL) | 440 #if !defined(DISABLE_NACL) && !defined(DISABLE_NACL_BROWSERTESTS) |
| 441 class MediaGalleriesPlatformAppPpapiTest | 441 class MediaGalleriesPlatformAppPpapiTest |
| 442 : public MediaGalleriesPlatformAppBrowserTest { | 442 : public MediaGalleriesPlatformAppBrowserTest { |
| 443 protected: | 443 protected: |
| 444 void SetUpCommandLine(base::CommandLine* command_line) override { | 444 void SetUpCommandLine(base::CommandLine* command_line) override { |
| 445 MediaGalleriesPlatformAppBrowserTest::SetUpCommandLine(command_line); | 445 MediaGalleriesPlatformAppBrowserTest::SetUpCommandLine(command_line); |
| 446 command_line->AppendSwitch(switches::kEnablePepperTesting); | 446 command_line->AppendSwitch(switches::kEnablePepperTesting); |
| 447 } | 447 } |
| 448 | 448 |
| 449 void SetUpOnMainThread() override { | 449 void SetUpOnMainThread() override { |
| 450 MediaGalleriesPlatformAppBrowserTest::SetUpOnMainThread(); | 450 MediaGalleriesPlatformAppBrowserTest::SetUpOnMainThread(); |
| (...skipping 226 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 677 | 677 |
| 678 base::ListValue custom_args; | 678 base::ListValue custom_args; |
| 679 #if defined(USE_PROPRIETARY_CODECS) | 679 #if defined(USE_PROPRIETARY_CODECS) |
| 680 custom_args.AppendBoolean(true); | 680 custom_args.AppendBoolean(true); |
| 681 #else | 681 #else |
| 682 custom_args.AppendBoolean(false); | 682 custom_args.AppendBoolean(false); |
| 683 #endif | 683 #endif |
| 684 ASSERT_TRUE(RunMediaGalleriesTestWithArg("media_metadata", custom_args)) | 684 ASSERT_TRUE(RunMediaGalleriesTestWithArg("media_metadata", custom_args)) |
| 685 << message_; | 685 << message_; |
| 686 } | 686 } |
| OLD | NEW |