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

Side by Side Diff: chrome/browser/media/encrypted_media_supported_types_browsertest.cc

Issue 1550593002: Switch to standard integer types in chrome/browser/, part 2 of 4. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 12 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
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 <stddef.h>
6
5 #include <string> 7 #include <string>
6 #include <vector> 8 #include <vector>
7 9
8 #include "base/base_switches.h" 10 #include "base/base_switches.h"
9 #include "base/command_line.h" 11 #include "base/command_line.h"
10 #include "base/files/file_path.h" 12 #include "base/files/file_path.h"
11 #include "base/path_service.h" 13 #include "base/path_service.h"
12 #include "base/strings/utf_string_conversions.h" 14 #include "base/strings/utf_string_conversions.h"
13 #include "base/threading/platform_thread.h" 15 #include "base/threading/platform_thread.h"
14 #include "base/time/time.h" 16 #include "base/time/time.h"
17 #include "build/build_config.h"
15 #include "chrome/browser/ui/browser.h" 18 #include "chrome/browser/ui/browser.h"
16 #include "chrome/browser/ui/tabs/tab_strip_model.h" 19 #include "chrome/browser/ui/tabs/tab_strip_model.h"
17 #include "chrome/common/chrome_paths.h" 20 #include "chrome/common/chrome_paths.h"
18 #include "chrome/test/base/in_process_browser_test.h" 21 #include "chrome/test/base/in_process_browser_test.h"
19 #include "chrome/test/base/ui_test_utils.h" 22 #include "chrome/test/base/ui_test_utils.h"
20 #include "content/public/common/content_switches.h" 23 #include "content/public/common/content_switches.h"
21 #include "content/public/test/browser_test_utils.h" 24 #include "content/public/test/browser_test_utils.h"
22 #include "media/base/test_data_util.h" 25 #include "media/base/test_data_util.h"
23 #include "net/test/embedded_test_server/embedded_test_server.h" 26 #include "net/test/embedded_test_server/embedded_test_server.h"
24 #include "url/gurl.h" 27 #include "url/gurl.h"
(...skipping 663 matching lines...) Expand 10 before | Expand all | Expand 10 after
688 691
689 // Clear Key should still be registered. 692 // Clear Key should still be registered.
690 EXPECT_SUCCESS(AreCodecsSupportedByKeySystem( 693 EXPECT_SUCCESS(AreCodecsSupportedByKeySystem(
691 kVideoWebMMimeType, no_codecs(), kClearKey)); 694 kVideoWebMMimeType, no_codecs(), kClearKey));
692 } 695 }
693 #endif // !defined(WIDEVINE_CDM_AVAILABLE) || 696 #endif // !defined(WIDEVINE_CDM_AVAILABLE) ||
694 // defined(WIDEVINE_CDM_IS_COMPONENT) 697 // defined(WIDEVINE_CDM_IS_COMPONENT)
695 #endif // defined(ENABLE_PEPPER_CDMS) 698 #endif // defined(ENABLE_PEPPER_CDMS)
696 699
697 } // namespace chrome 700 } // namespace chrome
OLDNEW
« no previous file with comments | « chrome/browser/media/encrypted_media_browsertest.cc ('k') | chrome/browser/media/media_capture_devices_dispatcher.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698