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

Side by Side Diff: chrome/browser/chromeos/app_mode/kiosk_app_manager_browsertest.cc

Issue 2952163002: Remove InProcessBrowserTest::SetUpOnMainThread() calls. (Closed)
Patch Set: rebase Created 3 years, 5 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 "chrome/browser/chromeos/app_mode/kiosk_app_manager.h" 5 #include "chrome/browser/chromeos/app_mode/kiosk_app_manager.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <memory> 9 #include <memory>
10 #include <utility> 10 #include <utility>
(...skipping 232 matching lines...) Expand 10 before | Expand all | Expand 10 after
243 } 243 }
244 244
245 void SetUpCommandLine(base::CommandLine* command_line) override { 245 void SetUpCommandLine(base::CommandLine* command_line) override {
246 InProcessBrowserTest::SetUpCommandLine(command_line); 246 InProcessBrowserTest::SetUpCommandLine(command_line);
247 247
248 // Initialize fake_cws_ to setup web store gallery. 248 // Initialize fake_cws_ to setup web store gallery.
249 fake_cws_->Init(embedded_test_server()); 249 fake_cws_->Init(embedded_test_server());
250 } 250 }
251 251
252 void SetUpOnMainThread() override { 252 void SetUpOnMainThread() override {
253 InProcessBrowserTest::SetUpOnMainThread();
254
255 host_resolver()->AddRule("*", "127.0.0.1"); 253 host_resolver()->AddRule("*", "127.0.0.1");
256 254
257 // Start the accept thread as the sandbox host process has already been 255 // Start the accept thread as the sandbox host process has already been
258 // spawned. 256 // spawned.
259 embedded_test_server()->StartAcceptingConnections(); 257 embedded_test_server()->StartAcceptingConnections();
260 258
261 settings_helper_.ReplaceProvider(kAccountsPrefDeviceLocalAccounts); 259 settings_helper_.ReplaceProvider(kAccountsPrefDeviceLocalAccounts);
262 owner_settings_service_ = 260 owner_settings_service_ =
263 settings_helper_.CreateOwnerSettingsService(browser()->profile()); 261 settings_helper_.CreateOwnerSettingsService(browser()->profile());
264 } 262 }
(...skipping 672 matching lines...) Expand 10 before | Expand all | Expand 10 after
937 MakeKioskApp("App Name", "1.0", kNoneAutoLaucnhedAppId, 935 MakeKioskApp("App Name", "1.0", kNoneAutoLaucnhedAppId,
938 kTestCases[i].required_platform_version); 936 kTestCases[i].required_platform_version);
939 EXPECT_TRUE(manager()->IsPlatformCompliantWithApp(app.get())) 937 EXPECT_TRUE(manager()->IsPlatformCompliantWithApp(app.get()))
940 << "Test case for non auto launch app: " << i 938 << "Test case for non auto launch app: " << i
941 << ", required_platform_version=" 939 << ", required_platform_version="
942 << kTestCases[i].required_platform_version; 940 << kTestCases[i].required_platform_version;
943 } 941 }
944 } 942 }
945 943
946 } // namespace chromeos 944 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698