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

Side by Side Diff: chrome/browser/permissions/permission_request_manager_browsertest.cc

Issue 2768923003: Fix gn_all build on gcc 4.8 (Closed)
Patch Set: Created 3 years, 9 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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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 "chrome/browser/permissions/permission_request_manager.h" 5 #include "chrome/browser/permissions/permission_request_manager.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/metrics/field_trial.h" 8 #include "base/metrics/field_trial.h"
9 #include "build/build_config.h" 9 #include "build/build_config.h"
10 #include "chrome/browser/custom_handlers/protocol_handler_registry_factory.h" 10 #include "chrome/browser/custom_handlers/protocol_handler_registry_factory.h"
(...skipping 11 matching lines...) Expand all
22 #include "chrome/test/base/in_process_browser_test.h" 22 #include "chrome/test/base/in_process_browser_test.h"
23 #include "chrome/test/base/ui_test_utils.h" 23 #include "chrome/test/base/ui_test_utils.h"
24 #include "components/content_settings/core/common/content_settings_types.h" 24 #include "components/content_settings/core/common/content_settings_types.h"
25 #include "components/variations/variations_associated_data.h" 25 #include "components/variations/variations_associated_data.h"
26 #include "content/public/test/browser_test_utils.h" 26 #include "content/public/test/browser_test_utils.h"
27 #include "content/public/test/test_utils.h" 27 #include "content/public/test/test_utils.h"
28 #include "net/test/embedded_test_server/embedded_test_server.h" 28 #include "net/test/embedded_test_server/embedded_test_server.h"
29 29
30 namespace test { 30 namespace test {
31 class MediaStreamDevicesControllerTestApi 31 class MediaStreamDevicesControllerTestApi
32 : public MediaStreamDevicesController::PermissionPromptDelegate { 32 : public internal::PermissionPromptDelegate {
33 public: 33 public:
34 static void AddRequestToManager( 34 static void AddRequestToManager(
35 PermissionRequestManager* manager, 35 PermissionRequestManager* manager,
36 content::WebContents* web_contents, 36 content::WebContents* web_contents,
37 const content::MediaStreamRequest& request, 37 const content::MediaStreamRequest& request,
38 const content::MediaResponseCallback& callback) { 38 const content::MediaResponseCallback& callback) {
39 MediaStreamDevicesControllerTestApi delegate(manager); 39 MediaStreamDevicesControllerTestApi delegate(manager);
40 MediaStreamDevicesController::RequestPermissionsWithDelegate( 40 MediaStreamDevicesController::RequestPermissionsWithDelegate(
41 web_contents, request, callback, &delegate); 41 web_contents, request, callback, &delegate);
42 } 42 }
(...skipping 448 matching lines...) Expand 10 before | Expand all | Expand 10 after
491 #define MAYBE_InvokeDialog_protected_media InvokeDialog_protected_media 491 #define MAYBE_InvokeDialog_protected_media InvokeDialog_protected_media
492 #else 492 #else
493 #define MAYBE_InvokeDialog_protected_media DISABLED_InvokeDialog_protected_media 493 #define MAYBE_InvokeDialog_protected_media DISABLED_InvokeDialog_protected_media
494 #endif 494 #endif
495 IN_PROC_BROWSER_TEST_F(PermissionDialogTest, 495 IN_PROC_BROWSER_TEST_F(PermissionDialogTest,
496 MAYBE_InvokeDialog_protected_media) { 496 MAYBE_InvokeDialog_protected_media) {
497 RunDialog(); 497 RunDialog();
498 } 498 }
499 499
500 } // anonymous namespace 500 } // anonymous namespace
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698