| OLD | NEW |
| 1 // Copyright 2012 The Chromium Authors. All rights reserved. | 1 // Copyright 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 "base/macros.h" | 5 #include "base/macros.h" |
| 6 #include "base/test/histogram_tester.h" | 6 #include "base/test/histogram_tester.h" |
| 7 #include "chrome/browser/sessions/session_service.h" | 7 #include "chrome/browser/sessions/session_service.h" |
| 8 #include "chrome/browser/sync/test/integration/profile_sync_service_harness.h" | 8 #include "chrome/browser/sync/test/integration/profile_sync_service_harness.h" |
| 9 #include "chrome/browser/sync/test/integration/sessions_helper.h" | 9 #include "chrome/browser/sync/test/integration/sessions_helper.h" |
| 10 #include "chrome/browser/sync/test/integration/sync_test.h" | 10 #include "chrome/browser/sync/test/integration/sync_test.h" |
| (...skipping 131 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 142 for (auto it3 = (*it2)->navigations.begin(); | 142 for (auto it3 = (*it2)->navigations.begin(); |
| 143 it3 != (*it2)->navigations.end(); ++it3) { | 143 it3 != (*it2)->navigations.end(); ++it3) { |
| 144 EXPECT_EQ(200, it3->http_status_code()); | 144 EXPECT_EQ(200, it3->http_status_code()); |
| 145 ++found_navigations; | 145 ++found_navigations; |
| 146 } | 146 } |
| 147 } | 147 } |
| 148 } | 148 } |
| 149 ASSERT_EQ(1, found_navigations); | 149 ASSERT_EQ(1, found_navigations); |
| 150 } | 150 } |
| 151 | 151 |
| 152 IN_PROC_BROWSER_TEST_F(SingleClientSessionsSyncTest, CookieJarMismatch) { | 152 IN_PROC_BROWSER_TEST_F(SingleClientSessionsSyncTest, |
| 153 DISABLED_CookieJarMismatch) { |
| 153 ASSERT_TRUE(SetupSync()) << "SetupSync() failed."; | 154 ASSERT_TRUE(SetupSync()) << "SetupSync() failed."; |
| 154 | 155 |
| 155 ASSERT_TRUE(CheckInitialState(0)); | 156 ASSERT_TRUE(CheckInitialState(0)); |
| 156 | 157 |
| 157 // Add a new session to client 0 and wait for it to sync. | 158 // Add a new session to client 0 and wait for it to sync. |
| 158 base::HistogramTester histogram_tester; | 159 base::HistogramTester histogram_tester; |
| 159 ScopedWindowMap old_windows; | 160 ScopedWindowMap old_windows; |
| 160 GURL url = GURL("http://127.0.0.1/bubba"); | 161 GURL url = GURL("http://127.0.0.1/bubba"); |
| 161 ASSERT_TRUE(OpenTabAndGetLocalWindows(0, url, &old_windows)); | 162 ASSERT_TRUE(OpenTabAndGetLocalWindows(0, url, &old_windows)); |
| 162 TriggerSyncForModelTypes(0, syncer::ModelTypeSet(syncer::SESSIONS)); | 163 TriggerSyncForModelTypes(0, syncer::ModelTypeSet(syncer::SESSIONS)); |
| (...skipping 29 matching lines...) Expand all Loading... |
| 192 // Verify the cookie jar mismatch bool is set to false. | 193 // Verify the cookie jar mismatch bool is set to false. |
| 193 ASSERT_TRUE(GetFakeServer()->GetLastCommitMessage(&message)); | 194 ASSERT_TRUE(GetFakeServer()->GetLastCommitMessage(&message)); |
| 194 ASSERT_FALSE(message.commit().config_params().cookie_jar_mismatch()); | 195 ASSERT_FALSE(message.commit().config_params().cookie_jar_mismatch()); |
| 195 | 196 |
| 196 // Verify the histograms were recorded properly. | 197 // Verify the histograms were recorded properly. |
| 197 histogram_tester.ExpectTotalCount("Sync.CookieJarMatchOnNavigation", 2); | 198 histogram_tester.ExpectTotalCount("Sync.CookieJarMatchOnNavigation", 2); |
| 198 histogram_tester.ExpectBucketCount("Sync.CookieJarMatchOnNavigation", true, | 199 histogram_tester.ExpectBucketCount("Sync.CookieJarMatchOnNavigation", true, |
| 199 1); | 200 1); |
| 200 histogram_tester.ExpectUniqueSample("Sync.CookieJarEmptyOnMismatch", true, 1); | 201 histogram_tester.ExpectUniqueSample("Sync.CookieJarEmptyOnMismatch", true, 1); |
| 201 } | 202 } |
| OLD | NEW |