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

Side by Side Diff: chrome/browser/apps/guest_view/extension_view/extension_view_browsertest.cc

Issue 2910843002: [Cleanup] Move all browsertests to use ScopedFeatureList to modify features
Patch Set: rebase update Created 3 years, 6 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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/strings/stringprintf.h" 5 #include "base/strings/stringprintf.h"
6 #include "base/test/scoped_feature_list.h" 6 #include "base/test/scoped_feature_list.h"
7 #include "chrome/browser/apps/app_browsertest_util.h" 7 #include "chrome/browser/apps/app_browsertest_util.h"
8 #include "chrome/test/base/ui_test_utils.h" 8 #include "chrome/test/base/ui_test_utils.h"
9 #include "components/guest_view/browser/guest_view_manager.h" 9 #include "components/guest_view/browser/guest_view_manager.h"
10 #include "components/guest_view/browser/guest_view_manager_delegate.h" 10 #include "components/guest_view/browser/guest_view_manager_delegate.h"
11 #include "components/guest_view/browser/guest_view_manager_factory.h" 11 #include "components/guest_view/browser/guest_view_manager_factory.h"
12 #include "components/guest_view/browser/test_guest_view_manager.h" 12 #include "components/guest_view/browser/test_guest_view_manager.h"
13 #include "content/public/common/content_features.h" 13 #include "content/public/common/content_features.h"
14 #include "content/public/common/content_switches.h"
Ilya Sherman 2017/06/12 21:50:29 This change seems unrelated. Could you please spl
chaopeng 2017/06/28 19:21:22 Removed.
15 #include "content/public/test/browser_test_utils.h" 14 #include "content/public/test/browser_test_utils.h"
16 #include "extensions/browser/api/extensions_api_client.h" 15 #include "extensions/browser/api/extensions_api_client.h"
17 #include "extensions/test/extension_test_message_listener.h" 16 #include "extensions/test/extension_test_message_listener.h"
18 #include "testing/gtest/include/gtest/gtest.h" 17 #include "testing/gtest/include/gtest/gtest.h"
19 18
20 using extensions::ExtensionsAPIClient; 19 using extensions::ExtensionsAPIClient;
21 using guest_view::GuestViewManager; 20 using guest_view::GuestViewManager;
22 using guest_view::TestGuestViewManager; 21 using guest_view::TestGuestViewManager;
23 using guest_view::TestGuestViewManagerFactory; 22 using guest_view::TestGuestViewManagerFactory;
24 23
(...skipping 111 matching lines...) Expand 10 before | Expand all | Expand 10 after
136 // load function. 135 // load function.
137 IN_PROC_BROWSER_TEST_P(ExtensionViewTest, DISABLED_QueuedLoadAPICall) { 136 IN_PROC_BROWSER_TEST_P(ExtensionViewTest, DISABLED_QueuedLoadAPICall) {
138 const extensions::Extension* skeleton_app = 137 const extensions::Extension* skeleton_app =
139 InstallPlatformApp("extension_view/skeleton"); 138 InstallPlatformApp("extension_view/skeleton");
140 const extensions::Extension* skeleton_app_two = 139 const extensions::Extension* skeleton_app_two =
141 InstallPlatformApp("extension_view/skeleton_two"); 140 InstallPlatformApp("extension_view/skeleton_two");
142 TestHelper("testQueuedLoadAPIFunction", "extension_view/load_api", 141 TestHelper("testQueuedLoadAPIFunction", "extension_view/load_api",
143 skeleton_app->id(), 142 skeleton_app->id(),
144 skeleton_app_two->id()); 143 skeleton_app_two->id());
145 } 144 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698