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

Side by Side Diff: ios/web/test/web_test.mm

Issue 1962333002: [ios] Do not lock schemes registry in WebTest. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 7 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2012 The Chromium Authors. All rights reserved. 1 // Copyright 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 #import "ios/web/test/web_test.h" 5 #import "ios/web/test/web_test.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/base64.h" 9 #include "base/base64.h"
10 #include "base/memory/ptr_util.h" 10 #include "base/memory/ptr_util.h"
(...skipping 23 matching lines...) Expand all
34 } 34 }
35 @end 35 @end
36 36
37 namespace web { 37 namespace web {
38 38
39 #pragma mark - 39 #pragma mark -
40 40
41 WebTest::WebTest() : web_client_(base::WrapUnique(new TestWebClient)) { 41 WebTest::WebTest() : web_client_(base::WrapUnique(new TestWebClient)) {
42 static dispatch_once_t onceToken; 42 static dispatch_once_t onceToken;
43 dispatch_once(&onceToken, ^{ 43 dispatch_once(&onceToken, ^{
44 RegisterWebSchemes(true); 44 RegisterWebSchemes(false);
45 }); 45 });
46 } 46 }
47 47
48 WebTest::~WebTest() {} 48 WebTest::~WebTest() {}
49 49
50 void WebTest::SetUp() { 50 void WebTest::SetUp() {
51 PlatformTest::SetUp(); 51 PlatformTest::SetUp();
52 BrowserState::GetActiveStateManager(&browser_state_)->SetActive(true); 52 BrowserState::GetActiveStateManager(&browser_state_)->SetActive(true);
53 } 53 }
54 54
(...skipping 163 matching lines...) Expand 10 before | Expand all | Expand 10 after
218 } 218 }
219 return false; 219 return false;
220 } 220 }
221 221
222 NSString* WebTestWithWebController::CreateLoadCheck() { 222 NSString* WebTestWithWebController::CreateLoadCheck() {
223 return [NSString stringWithFormat:@"<p style=\"display: none;\">%d</p>", 223 return [NSString stringWithFormat:@"<p style=\"display: none;\">%d</p>",
224 s_html_load_count++]; 224 s_html_load_count++];
225 } 225 }
226 226
227 } // namespace web 227 } // namespace web
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698