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

Side by Side Diff: chrome/browser/sync/test/integration/sync_test.cc

Issue 10797017: base: Make ScopedVector::clear() destroy elements. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: update location_bar_view_mac.mm Created 8 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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/sync/test/integration/sync_test.h" 5 #include "chrome/browser/sync/test/integration/sync_test.h"
6 6
7 #include <vector> 7 #include <vector>
8 8
9 #include "base/basictypes.h" 9 #include "base/basictypes.h"
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 332 matching lines...) Expand 10 before | Expand all | Expand 10 after
343 } 343 }
344 344
345 void SyncTest::CleanUpOnMainThread() { 345 void SyncTest::CleanUpOnMainThread() {
346 // Close all browser windows. 346 // Close all browser windows.
347 browser::CloseAllBrowsers(); 347 browser::CloseAllBrowsers();
348 ui_test_utils::RunAllPendingInMessageLoop(); 348 ui_test_utils::RunAllPendingInMessageLoop();
349 349
350 // All browsers should be closed at this point, or else we could see memory 350 // All browsers should be closed at this point, or else we could see memory
351 // corruption in QuitBrowser(). 351 // corruption in QuitBrowser().
352 CHECK_EQ(0U, BrowserList::size()); 352 CHECK_EQ(0U, BrowserList::size());
353 clients_.reset(); 353 clients_.clear();
354 } 354 }
355 355
356 void SyncTest::SetUpInProcessBrowserTestFixture() { 356 void SyncTest::SetUpInProcessBrowserTestFixture() {
357 // We don't take a reference to |resolver|, but mock_host_resolver_override_ 357 // We don't take a reference to |resolver|, but mock_host_resolver_override_
358 // does, so effectively assumes ownership. 358 // does, so effectively assumes ownership.
359 net::RuleBasedHostResolverProc* resolver = 359 net::RuleBasedHostResolverProc* resolver =
360 new net::RuleBasedHostResolverProc(host_resolver()); 360 new net::RuleBasedHostResolverProc(host_resolver());
361 resolver->AllowDirectLookup("*.google.com"); 361 resolver->AllowDirectLookup("*.google.com");
362 // On Linux, we use Chromium's NSS implementation which uses the following 362 // On Linux, we use Chromium's NSS implementation which uses the following
363 // hosts for certificate verification. Without these overrides, running the 363 // hosts for certificate verification. Without these overrides, running the
(...skipping 421 matching lines...) Expand 10 before | Expand all | Expand 10 after
785 785
786 void SyncTest::SetProxyConfig(net::URLRequestContextGetter* context_getter, 786 void SyncTest::SetProxyConfig(net::URLRequestContextGetter* context_getter,
787 const net::ProxyConfig& proxy_config) { 787 const net::ProxyConfig& proxy_config) {
788 base::WaitableEvent done(false, false); 788 base::WaitableEvent done(false, false);
789 BrowserThread::PostTask( 789 BrowserThread::PostTask(
790 BrowserThread::IO, FROM_HERE, 790 BrowserThread::IO, FROM_HERE,
791 base::Bind(&SetProxyConfigCallback, &done, 791 base::Bind(&SetProxyConfigCallback, &done,
792 make_scoped_refptr(context_getter), proxy_config)); 792 make_scoped_refptr(context_getter), proxy_config));
793 done.Wait(); 793 done.Wait();
794 } 794 }
OLDNEW
« no previous file with comments | « chrome/browser/prerender/prerender_manager.cc ('k') | chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698