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

Side by Side Diff: chrome/browser/policy/cloud_policy_subsystem_unittest.cc

Issue 7744039: Switch ChromeTestSuite to the same convention as ContentTestSuite: (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: more fixing Created 9 years, 3 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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 <vector> 5 #include <vector>
6 6
7 #include "base/memory/scoped_ptr.h" 7 #include "base/memory/scoped_ptr.h"
8 #include "base/message_loop.h" 8 #include "base/message_loop.h"
9 #include "base/scoped_temp_dir.h" 9 #include "base/scoped_temp_dir.h"
10 #include "base/values.h" 10 #include "base/values.h"
(...skipping 210 matching lines...) Expand 10 before | Expand all | Expand 10 after
221 221
222 // Length and max number of requests for the subsequent intervals. 222 // Length and max number of requests for the subsequent intervals.
223 length = 60*60*1000; // 60 minutes 223 length = 60*60*1000; // 60 minutes
224 limit = 12; // maxminum nr of requests in the next 60 minutes 224 limit = 12; // maxminum nr of requests in the next 60 minutes
225 } 225 }
226 226
227 EXPECT_GE(count, 11) 227 EXPECT_GE(count, 11)
228 << "No enough requests were fired during the test run."; 228 << "No enough requests were fired during the test run.";
229 } 229 }
230 230
231 ScopedTestingBrowserProcess browser_process_;
232
233 ScopedTempDir temp_user_data_dir_; 231 ScopedTempDir temp_user_data_dir_;
234 232
235 MessageLoop loop_; 233 MessageLoop loop_;
236 BrowserThread ui_thread_; 234 BrowserThread ui_thread_;
237 BrowserThread io_thread_; 235 BrowserThread io_thread_;
238 236
239 scoped_ptr<EventLogger> logger_; 237 scoped_ptr<EventLogger> logger_;
240 scoped_ptr<CloudPolicyDataStore> data_store_; 238 scoped_ptr<CloudPolicyDataStore> data_store_;
241 scoped_ptr<CloudPolicySubsystem> cloud_policy_subsystem_; 239 scoped_ptr<CloudPolicySubsystem> cloud_policy_subsystem_;
242 scoped_ptr<PrefService> prefs_; 240 scoped_ptr<PrefService> prefs_;
(...skipping 140 matching lines...) Expand 10 before | Expand all | Expand 10 after
383 ExecuteTest(); 381 ExecuteTest();
384 VerifyTest("http://www.youtube.com"); 382 VerifyTest("http://www.youtube.com");
385 } 383 }
386 384
387 INSTANTIATE_TEST_CASE_P( 385 INSTANTIATE_TEST_CASE_P(
388 CloudPolicySubsystemPolicyReregisterTestInstance, 386 CloudPolicySubsystemPolicyReregisterTestInstance,
389 CloudPolicySubsystemPolicyReregisterTest, 387 CloudPolicySubsystemPolicyReregisterTest,
390 testing::Values(401, 403, 410)); 388 testing::Values(401, 403, 410));
391 389
392 } // policy 390 } // policy
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698