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

Side by Side Diff: chrome/browser/chromeos/policy/device_local_account_browsertest.cc

Issue 366813007: Removed InProcessBrowserTest::CleanUpOnMainThread() (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Removed superfluous override. Created 6 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 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 <map> 5 #include <map>
6 #include <string> 6 #include <string>
7 7
8 #include "apps/app_window_registry.h" 8 #include "apps/app_window_registry.h"
9 #include "apps/ui/native_app_window.h" 9 #include "apps/ui/native_app_window.h"
10 #include "ash/shell.h" 10 #include "ash/shell.h"
(...skipping 323 matching lines...) Expand 10 before | Expand all | Expand 10 after
334 argv.erase(argv.begin() + argv.size() - command_line->GetArgs().size(), 334 argv.erase(argv.begin() + argv.size() - command_line->GetArgs().size(),
335 argv.end()); 335 argv.end());
336 command_line->InitFromArgv(argv); 336 command_line->InitFromArgv(argv);
337 337
338 InstallOwnerKey(); 338 InstallOwnerKey();
339 MarkAsEnterpriseOwned(); 339 MarkAsEnterpriseOwned();
340 340
341 InitializePolicy(); 341 InitializePolicy();
342 } 342 }
343 343
344 virtual void CleanUpOnMainThread() OVERRIDE { 344 virtual void TearDownOnMainThread() OVERRIDE {
345 BrowserList::RemoveObserver(this); 345 BrowserList::RemoveObserver(this);
346 346
347 // This shuts down the login UI. 347 // This shuts down the login UI.
348 base::MessageLoop::current()->PostTask(FROM_HERE, 348 base::MessageLoop::current()->PostTask(FROM_HERE,
349 base::Bind(&chrome::AttemptExit)); 349 base::Bind(&chrome::AttemptExit));
350 base::RunLoop().RunUntilIdle(); 350 base::RunLoop().RunUntilIdle();
351 } 351 }
352 352
353 virtual void LocalStateChanged(chromeos::UserManager* user_manager) OVERRIDE { 353 virtual void LocalStateChanged(chromeos::UserManager* user_manager) OVERRIDE {
354 if (run_loop_) 354 if (run_loop_)
(...skipping 1029 matching lines...) Expand 10 before | Expand all | Expand 10 after
1384 if (!IsSessionStarted()) { 1384 if (!IsSessionStarted()) {
1385 content::WindowedNotificationObserver(chrome::NOTIFICATION_SESSION_STARTED, 1385 content::WindowedNotificationObserver(chrome::NOTIFICATION_SESSION_STARTED,
1386 base::Bind(IsSessionStarted)).Wait(); 1386 base::Bind(IsSessionStarted)).Wait();
1387 } 1387 }
1388 } 1388 }
1389 1389
1390 INSTANTIATE_TEST_CASE_P(TermsOfServiceTestInstance, 1390 INSTANTIATE_TEST_CASE_P(TermsOfServiceTestInstance,
1391 TermsOfServiceTest, testing::Bool()); 1391 TermsOfServiceTest, testing::Bool());
1392 1392
1393 } // namespace policy 1393 } // namespace policy
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698