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

Side by Side Diff: chrome/test/live_sync/live_sync_test.cc

Issue 2260001: Adding a TearDown() method to class LiveSyncTest. (Closed)
Patch Set: Fixing unintended whitespaces added by Visual Studio. Created 10 years, 7 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
« no previous file with comments | « chrome/test/live_sync/live_sync_test.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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/test/live_sync/live_sync_test.h" 5 #include "chrome/test/live_sync/live_sync_test.h"
6 6
7 #include <vector> 7 #include <vector>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/file_util.h" 10 #include "base/file_util.h"
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
46 const BookmarkNode* node) {} 46 const BookmarkNode* node) {}
47 virtual void BookmarkNodeChildrenReordered(BookmarkModel* model, 47 virtual void BookmarkNodeChildrenReordered(BookmarkModel* model,
48 const BookmarkNode* node) {} 48 const BookmarkNode* node) {}
49 virtual void BookmarkNodeFavIconLoaded(BookmarkModel* model, 49 virtual void BookmarkNodeFavIconLoaded(BookmarkModel* model,
50 const BookmarkNode* node) {} 50 const BookmarkNode* node) {}
51 51
52 private: 52 private:
53 DISALLOW_COPY_AND_ASSIGN(BookmarkLoadObserver); 53 DISALLOW_COPY_AND_ASSIGN(BookmarkLoadObserver);
54 }; 54 };
55 55
56 LiveSyncTest::LiveSyncTest() { 56 LiveSyncTest::LiveSyncTest() : started_local_test_server_(false) {
57 } 57 }
58 58
59 LiveSyncTest::~LiveSyncTest() { 59 LiveSyncTest::~LiveSyncTest() {
60 } 60 }
61 61
62 // static 62 // static
63 void LiveSyncTest::BlockUntilLoaded(BookmarkModel* m) { 63 void LiveSyncTest::BlockUntilLoaded(BookmarkModel* m) {
64 if (m->IsLoaded()) 64 if (m->IsLoaded())
65 return; 65 return;
66 BookmarkLoadObserver observer; 66 BookmarkLoadObserver observer;
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
98 // Without this, running the test case on Linux causes an error as we make an 98 // Without this, running the test case on Linux causes an error as we make an
99 // external DNS lookup of "ocsp.thawte.com". 99 // external DNS lookup of "ocsp.thawte.com".
100 resolver->AllowDirectLookup("*.thawte.com"); 100 resolver->AllowDirectLookup("*.thawte.com");
101 mock_host_resolver_override_.reset( 101 mock_host_resolver_override_.reset(
102 new net::ScopedDefaultHostResolverProc(resolver)); 102 new net::ScopedDefaultHostResolverProc(resolver));
103 } 103 }
104 104
105 void LiveSyncTest::TearDownInProcessBrowserTestFixture() { 105 void LiveSyncTest::TearDownInProcessBrowserTestFixture() {
106 mock_host_resolver_override_.reset(); 106 mock_host_resolver_override_.reset();
107 } 107 }
OLDNEW
« no previous file with comments | « chrome/test/live_sync/live_sync_test.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698