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

Side by Side Diff: chrome/browser/chromeos/login/mixin_based_browser_test.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 (c) 2014 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2014 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/login/mixin_based_browser_test.h" 5 #include "chrome/browser/chromeos/login/mixin_based_browser_test.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/containers/adapters.h" 9 #include "base/containers/adapters.h"
10 10
(...skipping 18 matching lines...) Expand all
29 for (const auto& mixin : mixins_) 29 for (const auto& mixin : mixins_)
30 mixin->SetUpInProcessBrowserTestFixture(); 30 mixin->SetUpInProcessBrowserTestFixture();
31 31
32 InProcessBrowserTest::SetUpInProcessBrowserTestFixture(); 32 InProcessBrowserTest::SetUpInProcessBrowserTestFixture();
33 } 33 }
34 34
35 void MixinBasedBrowserTest::SetUpOnMainThread() { 35 void MixinBasedBrowserTest::SetUpOnMainThread() {
36 setup_was_launched_ = true; 36 setup_was_launched_ = true;
37 for (const auto& mixin : mixins_) 37 for (const auto& mixin : mixins_)
38 mixin->SetUpOnMainThread(); 38 mixin->SetUpOnMainThread();
39
40 InProcessBrowserTest::SetUpOnMainThread();
41 } 39 }
42 40
43 void MixinBasedBrowserTest::TearDownOnMainThread() { 41 void MixinBasedBrowserTest::TearDownOnMainThread() {
44 InProcessBrowserTest::TearDownOnMainThread(); 42 InProcessBrowserTest::TearDownOnMainThread();
45 for (const auto& mixin : base::Reversed(mixins_)) 43 for (const auto& mixin : base::Reversed(mixins_))
46 mixin->TearDownInProcessBrowserTestFixture(); 44 mixin->TearDownInProcessBrowserTestFixture();
47 } 45 }
48 void MixinBasedBrowserTest::TearDownInProcessBrowserTestFixture() { 46 void MixinBasedBrowserTest::TearDownInProcessBrowserTestFixture() {
49 InProcessBrowserTest::TearDownInProcessBrowserTestFixture(); 47 InProcessBrowserTest::TearDownInProcessBrowserTestFixture();
50 for (const auto& mixin : base::Reversed(mixins_)) 48 for (const auto& mixin : base::Reversed(mixins_))
51 mixin->TearDownInProcessBrowserTestFixture(); 49 mixin->TearDownInProcessBrowserTestFixture();
52 } 50 }
53 51
54 void MixinBasedBrowserTest::AddMixin(std::unique_ptr<Mixin> mixin) { 52 void MixinBasedBrowserTest::AddMixin(std::unique_ptr<Mixin> mixin) {
55 CHECK(!setup_was_launched_) 53 CHECK(!setup_was_launched_)
56 << "You are trying to add a mixin after setting up has already started."; 54 << "You are trying to add a mixin after setting up has already started.";
57 mixins_.push_back(std::move(mixin)); 55 mixins_.push_back(std::move(mixin));
58 } 56 }
59 57
60 } // namespace chromeos 58 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698