| 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 <memory> | 10 #include <memory> |
| (...skipping 640 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 651 "SiteIsolation.ProxyCountPerBrowsingInstance"), | 651 "SiteIsolation.ProxyCountPerBrowsingInstance"), |
| 652 DependingOnPolicy( | 652 DependingOnPolicy( |
| 653 ElementsAre(Bucket(0, 3)), ElementsAre(Bucket(0, 3)), | 653 ElementsAre(Bucket(0, 3)), ElementsAre(Bucket(0, 3)), |
| 654 ElementsAre(Bucket(12, 1), Bucket(29, 1), Bucket(68, 1)))); | 654 ElementsAre(Bucket(12, 1), Bucket(29, 1), Bucket(68, 1)))); |
| 655 | 655 |
| 656 // This test doesn't navigate to any extensions URLs, so it should not be | 656 // This test doesn't navigate to any extensions URLs, so it should not be |
| 657 // in any of the field trial groups. | 657 // in any of the field trial groups. |
| 658 EXPECT_FALSE(IsInTrial("SiteIsolationExtensionsActive")); | 658 EXPECT_FALSE(IsInTrial("SiteIsolationExtensionsActive")); |
| 659 } | 659 } |
| 660 | 660 |
| 661 // Flaky on Windows. crbug.com/671891 | 661 // Flaky on Windows and Mac. crbug.com/671891 |
| 662 #if defined(OS_WIN) | 662 #if defined(OS_WIN) || defined(OS_MACOSX) |
| 663 #define MAYBE_IsolateExtensions DISABLED_IsolateExtensions | 663 #define MAYBE_IsolateExtensions DISABLED_IsolateExtensions |
| 664 #else | 664 #else |
| 665 #define MAYBE_IsolateExtensions IsolateExtensions | 665 #define MAYBE_IsolateExtensions IsolateExtensions |
| 666 #endif | 666 #endif |
| 667 IN_PROC_BROWSER_TEST_F(SiteDetailsBrowserTest, MAYBE_IsolateExtensions) { | 667 IN_PROC_BROWSER_TEST_F(SiteDetailsBrowserTest, MAYBE_IsolateExtensions) { |
| 668 // We start on "about:blank", which should be credited with a process in this | 668 // We start on "about:blank", which should be credited with a process in this |
| 669 // case. | 669 // case. |
| 670 scoped_refptr<TestMemoryDetails> details = new TestMemoryDetails(); | 670 scoped_refptr<TestMemoryDetails> details = new TestMemoryDetails(); |
| 671 details->StartFetchAndWait(); | 671 details->StartFetchAndWait(); |
| 672 EXPECT_THAT(details->uma()->GetAllSamples( | 672 EXPECT_THAT(details->uma()->GetAllSamples( |
| (...skipping 622 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1295 content::NavigateIframeToURL( | 1295 content::NavigateIframeToURL( |
| 1296 tab, "child-1", extension2->GetResourceURL("/blank_iframe.html")); | 1296 tab, "child-1", extension2->GetResourceURL("/blank_iframe.html")); |
| 1297 details = new TestMemoryDetails(); | 1297 details = new TestMemoryDetails(); |
| 1298 details->StartFetchAndWait(); | 1298 details->StartFetchAndWait(); |
| 1299 EXPECT_THAT(details->uma()->GetAllSamples( | 1299 EXPECT_THAT(details->uma()->GetAllSamples( |
| 1300 "SiteIsolation.SiteInstancesPerBrowsingInstance"), | 1300 "SiteIsolation.SiteInstancesPerBrowsingInstance"), |
| 1301 DependingOnPolicy(ElementsAre(Bucket(1, 2)), | 1301 DependingOnPolicy(ElementsAre(Bucket(1, 2)), |
| 1302 ElementsAre(Bucket(1, 1), Bucket(3, 1)), | 1302 ElementsAre(Bucket(1, 1), Bucket(3, 1)), |
| 1303 ElementsAre(Bucket(1, 1), Bucket(5, 1)))); | 1303 ElementsAre(Bucket(1, 1), Bucket(5, 1)))); |
| 1304 } | 1304 } |
| OLD | NEW |