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

Side by Side Diff: chrome/browser/policy/cloud/cloud_policy_manager_browsertest.cc

Issue 366813007: Removed InProcessBrowserTest::CleanUpOnMainThread() (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: More merge to ToT. 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 "base/command_line.h" 5 #include "base/command_line.h"
6 #include "base/memory/scoped_ptr.h" 6 #include "base/memory/scoped_ptr.h"
7 #include "base/run_loop.h" 7 #include "base/run_loop.h"
8 #include "chrome/browser/browser_process.h" 8 #include "chrome/browser/browser_process.h"
9 #include "chrome/browser/policy/cloud/test_request_interceptor.h" 9 #include "chrome/browser/policy/cloud/test_request_interceptor.h"
10 #include "chrome/browser/profiles/profile.h" 10 #include "chrome/browser/profiles/profile.h"
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
78 ASSERT_TRUE(policy_manager()); 78 ASSERT_TRUE(policy_manager());
79 policy_manager()->Connect( 79 policy_manager()->Connect(
80 g_browser_process->local_state(), 80 g_browser_process->local_state(),
81 g_browser_process->system_request_context(), 81 g_browser_process->system_request_context(),
82 UserCloudPolicyManager::CreateCloudPolicyClient( 82 UserCloudPolicyManager::CreateCloudPolicyClient(
83 connector->device_management_service(), 83 connector->device_management_service(),
84 g_browser_process->system_request_context()).Pass()); 84 g_browser_process->system_request_context()).Pass());
85 #endif 85 #endif
86 } 86 }
87 87
88 virtual void CleanUpOnMainThread() OVERRIDE { 88 virtual void TearDownOnMainThread() OVERRIDE {
89 // Verify that all the expected requests were handled. 89 // Verify that all the expected requests were handled.
90 EXPECT_EQ(0u, interceptor_->GetPendingSize()); 90 EXPECT_EQ(0u, interceptor_->GetPendingSize());
91 91
92 interceptor_.reset(); 92 interceptor_.reset();
93 } 93 }
94 94
95 #if defined(OS_CHROMEOS) 95 #if defined(OS_CHROMEOS)
96 UserCloudPolicyManagerChromeOS* policy_manager() { 96 UserCloudPolicyManagerChromeOS* policy_manager() {
97 return UserCloudPolicyManagerFactoryChromeOS::GetForProfile( 97 return UserCloudPolicyManagerFactoryChromeOS::GetForProfile(
98 browser()->profile()); 98 browser()->profile());
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after
193 const bool expect_reregister = true; 193 const bool expect_reregister = true;
194 interceptor_->PushJobCallback( 194 interceptor_->PushJobCallback(
195 TestRequestInterceptor::RegisterJob(expected_type, expect_reregister)); 195 TestRequestInterceptor::RegisterJob(expected_type, expect_reregister));
196 196
197 EXPECT_FALSE(policy_manager()->core()->client()->is_registered()); 197 EXPECT_FALSE(policy_manager()->core()->client()->is_registered());
198 ASSERT_NO_FATAL_FAILURE(Register()); 198 ASSERT_NO_FATAL_FAILURE(Register());
199 EXPECT_TRUE(policy_manager()->core()->client()->is_registered()); 199 EXPECT_TRUE(policy_manager()->core()->client()->is_registered());
200 } 200 }
201 201
202 } // namespace policy 202 } // namespace policy
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698