| commit | 4ec9371ae62e51a48c8fe2facd90420821bc00d0 | [log] [tgz] |
|---|---|---|
| author | David Bertoni <[email protected]> | Thu Dec 26 17:14:53 2019 |
| committer | Commit Bot <[email protected]> | Thu Dec 26 17:14:53 2019 |
| tree | f817c65263243c022daa7d659f8cbea5c594d342 | |
| parent | 7ed16d001712eb2026c1d77ff6e4244fe71f0906 [diff] [blame] |
[Extensions] Fix issues with conflicting flag names. The ExtensionBrowserTest and ExtensionApiTest classes have a set of enums for flags that have identical names and, in some cases, conflicting values. This is a problem when a function expecting one set of values is called with the other set of values. This CL removes the overlap between these sets of names and breaks their use into separate function parameters.. Bug: 1031605 Change-Id: Ie8aef41b0cfa0029ebbbb330b80bc4491c5ac5bf Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1954715 Reviewed-by: Vasilii Sukhanov <[email protected]> Reviewed-by: Ben Wells <[email protected]> Reviewed-by: Devlin <[email protected]> Commit-Queue: David Bertoni <[email protected]> Cr-Commit-Position: refs/heads/master@{#727466}
diff --git a/chrome/browser/extensions/window_open_apitest.cc b/chrome/browser/extensions/window_open_apitest.cc index c815445..9929dc2 100644 --- a/chrome/browser/extensions/window_open_apitest.cc +++ b/chrome/browser/extensions/window_open_apitest.cc
@@ -511,7 +511,7 @@ OpenLockedFullscreenWindowNonChromeOS) { const extensions::Extension* extension = LoadExtensionWithFlags( test_data_dir_.AppendASCII("locked_fullscreen/with_permission"), - ExtensionBrowserTest::kFlagIgnoreManifestWarnings); + kFlagIgnoreManifestWarnings); ASSERT_TRUE(extension); EXPECT_EQ(1u, extension->install_warnings().size()); EXPECT_EQ(std::string("'lockWindowFullscreenPrivate' "