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

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

Issue 2957983002: Remove pointless InProcessBrowserTest calls. (Closed)
Patch Set: build 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) 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 "chrome/browser/chromeos/policy/device_policy_cros_browser_test.h" 5 #include "chrome/browser/chromeos/policy/device_policy_cros_browser_test.h"
6 6
7 #include <stdint.h> 7 #include <stdint.h>
8 8
9 #include <string> 9 #include <string>
10 10
(...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after
97 DevicePolicyCrosBrowserTest::~DevicePolicyCrosBrowserTest() { 97 DevicePolicyCrosBrowserTest::~DevicePolicyCrosBrowserTest() {
98 } 98 }
99 99
100 void DevicePolicyCrosBrowserTest::SetUpInProcessBrowserTestFixture() { 100 void DevicePolicyCrosBrowserTest::SetUpInProcessBrowserTestFixture() {
101 InstallOwnerKey(); 101 InstallOwnerKey();
102 MarkOwnership(); 102 MarkOwnership();
103 dbus_setter_ = chromeos::DBusThreadManager::GetSetterForTesting(); 103 dbus_setter_ = chromeos::DBusThreadManager::GetSetterForTesting();
104 dbus_setter_->SetSessionManagerClient( 104 dbus_setter_->SetSessionManagerClient(
105 std::unique_ptr<chromeos::SessionManagerClient>( 105 std::unique_ptr<chromeos::SessionManagerClient>(
106 fake_session_manager_client_)); 106 fake_session_manager_client_));
107 InProcessBrowserTest::SetUpInProcessBrowserTestFixture();
108 }
109
110 void DevicePolicyCrosBrowserTest::TearDownInProcessBrowserTestFixture() {
111 InProcessBrowserTest::TearDownInProcessBrowserTestFixture();
112 } 107 }
113 108
114 void DevicePolicyCrosBrowserTest::MarkOwnership() { 109 void DevicePolicyCrosBrowserTest::MarkOwnership() {
115 MarkAsEnterpriseOwned(); 110 MarkAsEnterpriseOwned();
116 } 111 }
117 112
118 void DevicePolicyCrosBrowserTest::MarkAsEnterpriseOwned() { 113 void DevicePolicyCrosBrowserTest::MarkAsEnterpriseOwned() {
119 test_helper_.MarkAsEnterpriseOwned(); 114 test_helper_.MarkAsEnterpriseOwned();
120 } 115 }
121 116
122 void DevicePolicyCrosBrowserTest::InstallOwnerKey() { 117 void DevicePolicyCrosBrowserTest::InstallOwnerKey() {
123 test_helper_.InstallOwnerKey(); 118 test_helper_.InstallOwnerKey();
124 } 119 }
125 120
126 void DevicePolicyCrosBrowserTest::RefreshDevicePolicy() { 121 void DevicePolicyCrosBrowserTest::RefreshDevicePolicy() {
127 // Reset the key to its original state. 122 // Reset the key to its original state.
128 device_policy()->SetDefaultSigningKey(); 123 device_policy()->SetDefaultSigningKey();
129 device_policy()->Build(); 124 device_policy()->Build();
130 session_manager_client()->set_device_policy(device_policy()->GetBlob()); 125 session_manager_client()->set_device_policy(device_policy()->GetBlob());
131 session_manager_client()->OnPropertyChangeComplete(true); 126 session_manager_client()->OnPropertyChangeComplete(true);
132 } 127 }
133 128
134 } // namespace policy 129 } // namespace policy
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698