diff options
| author | atwilson@chromium.org <atwilson@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-08 01:18:50 +0000 |
|---|---|---|
| committer | atwilson@chromium.org <atwilson@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-08 01:18:50 +0000 |
| commit | 8a120898ca82d1f7c7821c05fc834c67b7adc326 (patch) | |
| tree | c0f21b46d3979e12981869e451cc99e27fca862a /chrome/browser/ui/tabs | |
| parent | 9ac2db6956b8a1fb52492c887ea1b827ee97c080 (diff) | |
| download | chromium_src-8a120898ca82d1f7c7821c05fc834c67b7adc326.zip chromium_src-8a120898ca82d1f7c7821c05fc834c67b7adc326.tar.gz chromium_src-8a120898ca82d1f7c7821c05fc834c67b7adc326.tar.bz2 | |
Moved kGoogleServicesUsernamePattern to browser state instead of profile prefs.
BUG=128831
TEST=existing tests suffice
TBR=mirandac@chromium.org, sky@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10533012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@141145 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/tabs')
| -rw-r--r-- | chrome/browser/ui/tabs/pinned_tab_service_unittest.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/chrome/browser/ui/tabs/pinned_tab_service_unittest.cc b/chrome/browser/ui/tabs/pinned_tab_service_unittest.cc index 89e57fd..be65ac9 100644 --- a/chrome/browser/ui/tabs/pinned_tab_service_unittest.cc +++ b/chrome/browser/ui/tabs/pinned_tab_service_unittest.cc @@ -56,9 +56,10 @@ TEST_F(PinnedTabServiceTest, Popup) { new TestBrowserWindow(popup.get())); popup->SetWindowForTesting(popup_window.get()); - // Close the browser. This should trigger saving the tabs. + // Close the browser. This should trigger saving the tabs. No need to destroy + // the browser (this happens automatically in the test destructor). browser()->OnWindowClosing(); - DestroyBrowser(); + std::string result = PinnedTabTestUtils::TabsToString( PinnedTabCodec::ReadPinnedTabs(profile())); EXPECT_EQ("http://www.google.com/::pinned:", result); |