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

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

Issue 819133004: Make callers of CommandLine use it via the base:: namespace. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix Created 5 years, 12 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 "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/files/file_util.h" 8 #include "base/files/file_util.h"
9 #include "base/files/scoped_temp_dir.h" 9 #include "base/files/scoped_temp_dir.h"
10 #include "base/message_loop/message_loop.h" 10 #include "base/message_loop/message_loop.h"
(...skipping 167 matching lines...) Expand 10 before | Expand all | Expand 10 after
178 ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); 178 ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
179 // Stop IO thread here because no threads are allowed while 179 // Stop IO thread here because no threads are allowed while
180 // spawning sandbox host process. See crbug.com/322732. 180 // spawning sandbox host process. See crbug.com/322732.
181 embedded_test_server()->StopThread(); 181 embedded_test_server()->StopThread();
182 182
183 ASSERT_TRUE(temp_dir_.CreateUniqueTempDir()); 183 ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
184 184
185 InProcessBrowserTest::SetUp(); 185 InProcessBrowserTest::SetUp();
186 } 186 }
187 187
188 virtual void SetUpCommandLine(CommandLine* command_line) override { 188 virtual void SetUpCommandLine(base::CommandLine* command_line) override {
189 InProcessBrowserTest::SetUpCommandLine(command_line); 189 InProcessBrowserTest::SetUpCommandLine(command_line);
190 190
191 // Initialize fake_cws_ to setup web store gallery. 191 // Initialize fake_cws_ to setup web store gallery.
192 fake_cws_->Init(embedded_test_server()); 192 fake_cws_->Init(embedded_test_server());
193 } 193 }
194 194
195 virtual void SetUpOnMainThread() override { 195 virtual void SetUpOnMainThread() override {
196 InProcessBrowserTest::SetUpOnMainThread(); 196 InProcessBrowserTest::SetUpOnMainThread();
197 197
198 // Restart the thread as the sandbox host process has already been spawned. 198 // Restart the thread as the sandbox host process has already been spawned.
(...skipping 484 matching lines...) Expand 10 before | Expand all | Expand 10 after
683 manager()->GetConsumerKioskAutoLaunchStatus( 683 manager()->GetConsumerKioskAutoLaunchStatus(
684 base::Bind(&ConsumerKioskAutoLaunchStatusCheck, 684 base::Bind(&ConsumerKioskAutoLaunchStatusCheck,
685 status.get(), 685 status.get(),
686 runner3->QuitClosure())); 686 runner3->QuitClosure()));
687 runner3->Run(); 687 runner3->Run();
688 EXPECT_EQ(*status.get(), 688 EXPECT_EQ(*status.get(),
689 KioskAppManager::CONSUMER_KIOSK_AUTO_LAUNCH_DISABLED); 689 KioskAppManager::CONSUMER_KIOSK_AUTO_LAUNCH_DISABLED);
690 } 690 }
691 691
692 } // namespace chromeos 692 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/app_mode/fake_cws.cc ('k') | chrome/browser/chromeos/app_mode/kiosk_app_update_service_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698