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/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" |
11 #include "base/path_service.h" | 11 #include "base/path_service.h" |
12 #include "base/strings/string_util.h" | 12 #include "base/strings/string_util.h" |
13 #include "base/strings/utf_string_conversions.h" | 13 #include "base/strings/utf_string_conversions.h" |
14 #include "base/values.h" | 14 #include "base/values.h" |
15 #include "chrome/browser/apps/app_browsertest_util.h" | 15 #include "chrome/browser/apps/app_browsertest_util.h" |
16 #include "chrome/browser/browser_process.h" | 16 #include "chrome/browser/browser_process.h" |
17 #include "chrome/browser/extensions/api/media_galleries/media_galleries_api.h" | 17 #include "chrome/browser/extensions/api/media_galleries/media_galleries_api.h" |
(...skipping 650 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
668 | 668 |
669 base::ListValue custom_args; | 669 base::ListValue custom_args; |
670 #if defined(USE_PROPRIETARY_CODECS) | 670 #if defined(USE_PROPRIETARY_CODECS) |
671 custom_args.AppendBoolean(true); | 671 custom_args.AppendBoolean(true); |
672 #else | 672 #else |
673 custom_args.AppendBoolean(false); | 673 custom_args.AppendBoolean(false); |
674 #endif | 674 #endif |
675 ASSERT_TRUE(RunMediaGalleriesTestWithArg("media_metadata", custom_args)) | 675 ASSERT_TRUE(RunMediaGalleriesTestWithArg("media_metadata", custom_args)) |
676 << message_; | 676 << message_; |
677 } | 677 } |
OLD | NEW |