| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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/site_details.h" | 5 #include "chrome/browser/site_details.h" |
| 6 | 6 |
| 7 #include <stddef.h> | 7 #include <stddef.h> |
| 8 #include <stdint.h> | 8 #include <stdint.h> |
| 9 | 9 |
| 10 #include <utility> | 10 #include <utility> |
| (...skipping 638 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 649 "SiteIsolation.ProxyCountPerBrowsingInstance"), | 649 "SiteIsolation.ProxyCountPerBrowsingInstance"), |
| 650 DependingOnPolicy( | 650 DependingOnPolicy( |
| 651 ElementsAre(Bucket(0, 3)), ElementsAre(Bucket(0, 3)), | 651 ElementsAre(Bucket(0, 3)), ElementsAre(Bucket(0, 3)), |
| 652 ElementsAre(Bucket(12, 1), Bucket(29, 1), Bucket(68, 1)))); | 652 ElementsAre(Bucket(12, 1), Bucket(29, 1), Bucket(68, 1)))); |
| 653 | 653 |
| 654 // This test doesn't navigate to any extensions URLs, so it should not be | 654 // This test doesn't navigate to any extensions URLs, so it should not be |
| 655 // in any of the field trial groups. | 655 // in any of the field trial groups. |
| 656 EXPECT_FALSE(IsInTrial("SiteIsolationExtensionsActive")); | 656 EXPECT_FALSE(IsInTrial("SiteIsolationExtensionsActive")); |
| 657 } | 657 } |
| 658 | 658 |
| 659 IN_PROC_BROWSER_TEST_F(SiteDetailsBrowserTest, IsolateExtensions) { | 659 // Flaky on Windows. crbug.com/671891 |
| 660 #if defined(OS_WIN) |
| 661 #define MAYBE_IsolateExtensions DISABLED_IsolateExtensions |
| 662 #else |
| 663 #define MAYBE_IsolateExtensions IsolateExtensions |
| 664 #endif |
| 665 IN_PROC_BROWSER_TEST_F(SiteDetailsBrowserTest, MAYBE_IsolateExtensions) { |
| 660 // We start on "about:blank", which should be credited with a process in this | 666 // We start on "about:blank", which should be credited with a process in this |
| 661 // case. | 667 // case. |
| 662 scoped_refptr<TestMemoryDetails> details = new TestMemoryDetails(); | 668 scoped_refptr<TestMemoryDetails> details = new TestMemoryDetails(); |
| 663 details->StartFetchAndWait(); | 669 details->StartFetchAndWait(); |
| 664 EXPECT_THAT(details->uma()->GetAllSamples( | 670 EXPECT_THAT(details->uma()->GetAllSamples( |
| 665 "SiteIsolation.CurrentRendererProcessCount"), | 671 "SiteIsolation.CurrentRendererProcessCount"), |
| 666 HasOneSample(GetRenderProcessCount())); | 672 HasOneSample(GetRenderProcessCount())); |
| 667 EXPECT_THAT(details->uma()->GetAllSamples( | 673 EXPECT_THAT(details->uma()->GetAllSamples( |
| 668 "SiteIsolation.IsolateNothingProcessCountEstimate"), | 674 "SiteIsolation.IsolateNothingProcessCountEstimate"), |
| 669 HasOneSample(1)); | 675 HasOneSample(1)); |
| (...skipping 617 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1287 content::NavigateIframeToURL( | 1293 content::NavigateIframeToURL( |
| 1288 tab, "child-1", extension2->GetResourceURL("/blank_iframe.html")); | 1294 tab, "child-1", extension2->GetResourceURL("/blank_iframe.html")); |
| 1289 details = new TestMemoryDetails(); | 1295 details = new TestMemoryDetails(); |
| 1290 details->StartFetchAndWait(); | 1296 details->StartFetchAndWait(); |
| 1291 EXPECT_THAT(details->uma()->GetAllSamples( | 1297 EXPECT_THAT(details->uma()->GetAllSamples( |
| 1292 "SiteIsolation.SiteInstancesPerBrowsingInstance"), | 1298 "SiteIsolation.SiteInstancesPerBrowsingInstance"), |
| 1293 DependingOnPolicy(ElementsAre(Bucket(1, 2)), | 1299 DependingOnPolicy(ElementsAre(Bucket(1, 2)), |
| 1294 ElementsAre(Bucket(1, 1), Bucket(3, 1)), | 1300 ElementsAre(Bucket(1, 1), Bucket(3, 1)), |
| 1295 ElementsAre(Bucket(1, 1), Bucket(5, 1)))); | 1301 ElementsAre(Bucket(1, 1), Bucket(5, 1)))); |
| 1296 } | 1302 } |
| OLD | NEW |