diff options
author | skrul@chromium.org <skrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-30 17:45:46 +0000 |
---|---|---|
committer | skrul@chromium.org <skrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-30 17:45:46 +0000 |
commit | 4772b07c4021b482abb25babd8a8da2ed526f9e4 (patch) | |
tree | 7b70f6838df1cb15522dc5e2392863fa8336a0e5 /chrome/browser/dom_ui | |
parent | d7b4ad3d7900f0c9f6081e9ae57a2bde4d26381b (diff) | |
download | chromium_src-4772b07c4021b482abb25babd8a8da2ed526f9e4.zip chromium_src-4772b07c4021b482abb25babd8a8da2ed526f9e4.tar.gz chromium_src-4772b07c4021b482abb25babd8a8da2ed526f9e4.tar.bz2 |
Fix sync leaks and some more good stuff.
This is a continuation of zork's change http://codereview.chromium.org/1354001 that adds some preventitive DCHECKs througout the sync code to make sure stuff happens on the UI thread.
This also includes a leak fix in the ProfileSyncServiceTypedUrlTest.
The final change is changing the TestingProfile to return a ProfileSyncServiceMock rather than a real ProfileSyncService. This should help prevent random test failes due to other tests that need to use the PSS.
BUG=38490,38487
Review URL: http://codereview.chromium.org/1383002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@43102 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/dom_ui')
-rw-r--r-- | chrome/browser/dom_ui/dom_ui_unittest.cc | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/chrome/browser/dom_ui/dom_ui_unittest.cc b/chrome/browser/dom_ui/dom_ui_unittest.cc index 678229d4..0172837 100644 --- a/chrome/browser/dom_ui/dom_ui_unittest.cc +++ b/chrome/browser/dom_ui/dom_ui_unittest.cc @@ -84,9 +84,6 @@ class DOMUITest : public RenderViewHostTestHarness { // TabContents when we first navigate to a DOM UI page, then to a standard // non-DOM-UI page. TEST_F(DOMUITest, DOMUIToStandard) { - // The sync service must be created to host the sync NTP advertisement. - profile_->CreateProfileSyncService(); - DoNavigationTest(contents(), 1); // Test the case where we're not doing the initial navigation. This is @@ -99,9 +96,6 @@ TEST_F(DOMUITest, DOMUIToStandard) { } TEST_F(DOMUITest, DOMUIToDOMUI) { - // The sync service must be created to host the sync NTP advertisement. - profile_->CreateProfileSyncService(); - // Do a load (this state is tested above). GURL new_tab_url(chrome::kChromeUINewTabURL); controller().LoadURL(new_tab_url, GURL(), PageTransition::LINK); @@ -137,9 +131,6 @@ TEST_F(DOMUITest, StandardToDOMUI) { EXPECT_FALSE(contents()->ShouldShowBookmarkBar()); EXPECT_FALSE(contents()->FocusLocationBarByDefault()); - // The sync service must be created to host the sync NTP advertisement. - profile_->CreateProfileSyncService(); - // Start a pending load for a DOMUI. GURL new_tab_url(chrome::kChromeUINewTabURL); controller().LoadURL(new_tab_url, GURL(), PageTransition::LINK); @@ -172,7 +163,6 @@ TEST_F(DOMUITest, FocusOnNavigate) { tc->controller().CopyStateFrom(controller()); scoped_ptr<TestTabContents> tc_scoped_ptr(tc); contents_.swap(tc_scoped_ptr); - profile_->CreateProfileSyncService(); int page_id = 200; // Load the NTP. |