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

Side by Side Diff: chrome/browser/extensions/api/networking_private/networking_private_service_client_apitest.cc

Issue 2692153002: Enable SiteIsolationExtensions trial for developers. (Closed)
Patch Set: Fix failing test classes subclassing ExtensionApiTest. Created 3 years, 10 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 <memory> 5 #include <memory>
6 #include <utility> 6 #include <utility>
7 7
8 #include "base/bind.h" 8 #include "base/bind.h"
9 #include "base/callback.h" 9 #include "base/callback.h"
10 #include "base/command_line.h" 10 #include "base/command_line.h"
(...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after
97 97
98 void SetUpOnMainThread() override { 98 void SetUpOnMainThread() override {
99 ExtensionApiTest::SetUpOnMainThread(); 99 ExtensionApiTest::SetUpOnMainThread();
100 content::RunAllPendingInMessageLoop(); 100 content::RunAllPendingInMessageLoop();
101 NetworkingPrivateDelegateFactory::GetInstance()->SetTestingFactory( 101 NetworkingPrivateDelegateFactory::GetInstance()->SetTestingFactory(
102 profile(), &CreateNetworkingPrivateServiceClient); 102 profile(), &CreateNetworkingPrivateServiceClient);
103 } 103 }
104 104
105 void TearDownOnMainThread() override { 105 void TearDownOnMainThread() override {
106 content::RunAllPendingInMessageLoop(); 106 content::RunAllPendingInMessageLoop();
107 ExtensionApiTest::SetUpOnMainThread(); 107 ExtensionApiTest::TearDownOnMainThread();
Devlin 2017/02/15 19:24:34 Heh not the first time I've seen this. It'd be gr
nasko 2017/02/15 19:34:57 Acknowledged.
108 } 108 }
109 109
110 protected: 110 protected:
111 DISALLOW_COPY_AND_ASSIGN(NetworkingPrivateServiceClientApiTest); 111 DISALLOW_COPY_AND_ASSIGN(NetworkingPrivateServiceClientApiTest);
112 }; 112 };
113 113
114 // Place each subtest into a separate browser test so that the stub networking 114 // Place each subtest into a separate browser test so that the stub networking
115 // library state is reset for each subtest run. This way they won't affect each 115 // library state is reset for each subtest run. This way they won't affect each
116 // other. 116 // other.
117 117
(...skipping 95 matching lines...) Expand 10 before | Expand all | Expand 10 after
213 VerifyAndEncryptCredentials) { 213 VerifyAndEncryptCredentials) {
214 EXPECT_TRUE(RunNetworkingSubtest("verifyAndEncryptCredentials")) << message_; 214 EXPECT_TRUE(RunNetworkingSubtest("verifyAndEncryptCredentials")) << message_;
215 } 215 }
216 216
217 IN_PROC_BROWSER_TEST_F(NetworkingPrivateServiceClientApiTest, 217 IN_PROC_BROWSER_TEST_F(NetworkingPrivateServiceClientApiTest,
218 VerifyAndEncryptData) { 218 VerifyAndEncryptData) {
219 EXPECT_TRUE(RunNetworkingSubtest("verifyAndEncryptData")) << message_; 219 EXPECT_TRUE(RunNetworkingSubtest("verifyAndEncryptData")) << message_;
220 } 220 }
221 221
222 } // namespace 222 } // namespace
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698