|
|
Created:
4 years, 12 months ago by r.kasibhatla Modified:
4 years, 12 months ago CC:
chromium-reviews, grt+watch_chromium.org Base URL:
https://chromium.googlesource.com/chromium/src.git@master Target Ref:
refs/pending/heads/master Project:
chromium Visibility:
Public. |
Description[gcc_build_error] Fix for multiple friend decl of MalwareReportsToggling
Linux desktop gcc build is failing with below error:
In file included from ../../chrome/browser/ui/webui/interstitials/interstitial_ui.cc:12:0:
../../chrome/browser/safe_browsing/safe_browsing_blocking_page.h:143:16:
error: ‘safe_browsing::SafeBrowsingBlockingPageTest_MalwareReportsToggling_Test’
is already a friend of ‘safe_browsing::SafeBrowsingBlockingPage’ [-Werror]
FRIEND_TEST_ALL_PREFIXES(SafeBrowsingBlockingPageTest,
../../chrome/browser/safe_browsing/safe_browsing_blocking_page.h:143:87:
error: ‘safe_browsing::SafeBrowsingBlockingPageTest_DISABLED_MalwareReportsToggling_Test’
is already a friend of ‘safe_browsing::SafeBrowsingBlockingPage’ [-Werror]
FRIEND_TEST_ALL_PREFIXES(SafeBrowsingBlockingPageTest,
../../chrome/browser/safe_browsing/safe_browsing_blocking_page.h:143:167:
error: ‘safe_browsing::SafeBrowsingBlockingPageTest_FLAKY_MalwareReportsToggling_Test’
is already a friend of ‘safe_browsing::SafeBrowsingBlockingPage’ [-Werror]
FRIEND_TEST_ALL_PREFIXES(SafeBrowsingBlockingPageTest,
Android build had no issues.
BUG=NONE
TESTS=NONE
Committed: https://crrev.com/3bc60386c0ebc5145564c18968deac6e4a425ec3
Cr-Commit-Position: refs/heads/master@{#367058}
Patch Set 1 #
Total comments: 2
Patch Set 2 : Comments Addressed! #Messages
Total messages: 14 (7 generated)
Description was changed from ========== [gcc_build_fix] Fix for multiple friend decl of MalwareReportsToggling gcc build is failing with below error: In file included from ../../chrome/browser/ui/webui/interstitials/interstitial_ui.cc:12:0: ../../chrome/browser/safe_browsing/safe_browsing_blocking_page.h:143:16: error: ‘safe_browsing::SafeBrowsingBlockingPageTest_MalwareReportsToggling_Test’ is already a friend of ‘safe_browsing::SafeBrowsingBlockingPage’ [-Werror] FRIEND_TEST_ALL_PREFIXES(SafeBrowsingBlockingPageTest, ../../chrome/browser/safe_browsing/safe_browsing_blocking_page.h:143:87: error: ‘safe_browsing::SafeBrowsingBlockingPageTest_DISABLED_MalwareReportsToggling_Test’ is already a friend of ‘safe_browsing::SafeBrowsingBlockingPage’ [-Werror] FRIEND_TEST_ALL_PREFIXES(SafeBrowsingBlockingPageTest, ../../chrome/browser/safe_browsing/safe_browsing_blocking_page.h:143:167: error: ‘safe_browsing::SafeBrowsingBlockingPageTest_FLAKY_MalwareReportsToggling_Test’ is already a friend of ‘safe_browsing::SafeBrowsingBlockingPage’ [-Werror] FRIEND_TEST_ALL_PREFIXES(SafeBrowsingBlockingPageTest, BUG=NONE TESTS=NONE ========== to ========== [gcc_build_fix] Fix for multiple friend decl of MalwareReportsToggling gcc build is failing with below error: In file included from ../../chrome/browser/ui/webui/interstitials/interstitial_ui.cc:12:0: ../../chrome/browser/safe_browsing/safe_browsing_blocking_page.h:143:16: error: ‘safe_browsing::SafeBrowsingBlockingPageTest_MalwareReportsToggling_Test’ is already a friend of ‘safe_browsing::SafeBrowsingBlockingPage’ [-Werror] FRIEND_TEST_ALL_PREFIXES(SafeBrowsingBlockingPageTest, ../../chrome/browser/safe_browsing/safe_browsing_blocking_page.h:143:87: error: ‘safe_browsing::SafeBrowsingBlockingPageTest_DISABLED_MalwareReportsToggling_Test’ is already a friend of ‘safe_browsing::SafeBrowsingBlockingPage’ [-Werror] FRIEND_TEST_ALL_PREFIXES(SafeBrowsingBlockingPageTest, ../../chrome/browser/safe_browsing/safe_browsing_blocking_page.h:143:167: error: ‘safe_browsing::SafeBrowsingBlockingPageTest_FLAKY_MalwareReportsToggling_Test’ is already a friend of ‘safe_browsing::SafeBrowsingBlockingPage’ [-Werror] FRIEND_TEST_ALL_PREFIXES(SafeBrowsingBlockingPageTest, BUG=NONE TESTS=NONE ==========
kphanee@chromium.org changed reviewers: + mattm@chromium.org, nparker@chromium.org, shess@chromium.org
kphanee@chromium.org changed reviewers: + kphanee@chromium.org
PTAL. Found a compilation error with gcc. Not sure if the fix is already under review or not.
Description was changed from ========== [gcc_build_fix] Fix for multiple friend decl of MalwareReportsToggling gcc build is failing with below error: In file included from ../../chrome/browser/ui/webui/interstitials/interstitial_ui.cc:12:0: ../../chrome/browser/safe_browsing/safe_browsing_blocking_page.h:143:16: error: ‘safe_browsing::SafeBrowsingBlockingPageTest_MalwareReportsToggling_Test’ is already a friend of ‘safe_browsing::SafeBrowsingBlockingPage’ [-Werror] FRIEND_TEST_ALL_PREFIXES(SafeBrowsingBlockingPageTest, ../../chrome/browser/safe_browsing/safe_browsing_blocking_page.h:143:87: error: ‘safe_browsing::SafeBrowsingBlockingPageTest_DISABLED_MalwareReportsToggling_Test’ is already a friend of ‘safe_browsing::SafeBrowsingBlockingPage’ [-Werror] FRIEND_TEST_ALL_PREFIXES(SafeBrowsingBlockingPageTest, ../../chrome/browser/safe_browsing/safe_browsing_blocking_page.h:143:167: error: ‘safe_browsing::SafeBrowsingBlockingPageTest_FLAKY_MalwareReportsToggling_Test’ is already a friend of ‘safe_browsing::SafeBrowsingBlockingPage’ [-Werror] FRIEND_TEST_ALL_PREFIXES(SafeBrowsingBlockingPageTest, BUG=NONE TESTS=NONE ========== to ========== [gcc_build_error] Fix for multiple friend decl of MalwareReportsToggling Linux desktop gcc build is failing with below error: In file included from ../../chrome/browser/ui/webui/interstitials/interstitial_ui.cc:12:0: ../../chrome/browser/safe_browsing/safe_browsing_blocking_page.h:143:16: error: ‘safe_browsing::SafeBrowsingBlockingPageTest_MalwareReportsToggling_Test’ is already a friend of ‘safe_browsing::SafeBrowsingBlockingPage’ [-Werror] FRIEND_TEST_ALL_PREFIXES(SafeBrowsingBlockingPageTest, ../../chrome/browser/safe_browsing/safe_browsing_blocking_page.h:143:87: error: ‘safe_browsing::SafeBrowsingBlockingPageTest_DISABLED_MalwareReportsToggling_Test’ is already a friend of ‘safe_browsing::SafeBrowsingBlockingPage’ [-Werror] FRIEND_TEST_ALL_PREFIXES(SafeBrowsingBlockingPageTest, ../../chrome/browser/safe_browsing/safe_browsing_blocking_page.h:143:167: error: ‘safe_browsing::SafeBrowsingBlockingPageTest_FLAKY_MalwareReportsToggling_Test’ is already a friend of ‘safe_browsing::SafeBrowsingBlockingPage’ [-Werror] FRIEND_TEST_ALL_PREFIXES(SafeBrowsingBlockingPageTest, Android build had no issues. BUG=NONE TESTS=NONE ==========
https://codereview.chromium.org/1551583002/diff/1/chrome/browser/safe_browsin... File chrome/browser/safe_browsing/safe_browsing_blocking_page.h (right): https://codereview.chromium.org/1551583002/diff/1/chrome/browser/safe_browsin... chrome/browser/safe_browsing/safe_browsing_blocking_page.h:105: MalwareReportsTransitionDisabled); MalwareReportsTransitionDisabled test doesn't seem to exist anymore, you could just remove this.
Done. PTAL! https://codereview.chromium.org/1551583002/diff/1/chrome/browser/safe_browsin... File chrome/browser/safe_browsing/safe_browsing_blocking_page.h (right): https://codereview.chromium.org/1551583002/diff/1/chrome/browser/safe_browsin... chrome/browser/safe_browsing/safe_browsing_blocking_page.h:105: MalwareReportsTransitionDisabled); On 2015/12/28 17:56:30, mattm wrote: > MalwareReportsTransitionDisabled test doesn't seem to exist anymore, you could > just remove this. Done.
lgtm
The CQ bit was checked by kphanee@chromium.org
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/1551583002/20001 View timeline at https://chromium-cq-status.appspot.com/patch-timeline/1551583002/20001
Message was sent while issue was closed.
Description was changed from ========== [gcc_build_error] Fix for multiple friend decl of MalwareReportsToggling Linux desktop gcc build is failing with below error: In file included from ../../chrome/browser/ui/webui/interstitials/interstitial_ui.cc:12:0: ../../chrome/browser/safe_browsing/safe_browsing_blocking_page.h:143:16: error: ‘safe_browsing::SafeBrowsingBlockingPageTest_MalwareReportsToggling_Test’ is already a friend of ‘safe_browsing::SafeBrowsingBlockingPage’ [-Werror] FRIEND_TEST_ALL_PREFIXES(SafeBrowsingBlockingPageTest, ../../chrome/browser/safe_browsing/safe_browsing_blocking_page.h:143:87: error: ‘safe_browsing::SafeBrowsingBlockingPageTest_DISABLED_MalwareReportsToggling_Test’ is already a friend of ‘safe_browsing::SafeBrowsingBlockingPage’ [-Werror] FRIEND_TEST_ALL_PREFIXES(SafeBrowsingBlockingPageTest, ../../chrome/browser/safe_browsing/safe_browsing_blocking_page.h:143:167: error: ‘safe_browsing::SafeBrowsingBlockingPageTest_FLAKY_MalwareReportsToggling_Test’ is already a friend of ‘safe_browsing::SafeBrowsingBlockingPage’ [-Werror] FRIEND_TEST_ALL_PREFIXES(SafeBrowsingBlockingPageTest, Android build had no issues. BUG=NONE TESTS=NONE ========== to ========== [gcc_build_error] Fix for multiple friend decl of MalwareReportsToggling Linux desktop gcc build is failing with below error: In file included from ../../chrome/browser/ui/webui/interstitials/interstitial_ui.cc:12:0: ../../chrome/browser/safe_browsing/safe_browsing_blocking_page.h:143:16: error: ‘safe_browsing::SafeBrowsingBlockingPageTest_MalwareReportsToggling_Test’ is already a friend of ‘safe_browsing::SafeBrowsingBlockingPage’ [-Werror] FRIEND_TEST_ALL_PREFIXES(SafeBrowsingBlockingPageTest, ../../chrome/browser/safe_browsing/safe_browsing_blocking_page.h:143:87: error: ‘safe_browsing::SafeBrowsingBlockingPageTest_DISABLED_MalwareReportsToggling_Test’ is already a friend of ‘safe_browsing::SafeBrowsingBlockingPage’ [-Werror] FRIEND_TEST_ALL_PREFIXES(SafeBrowsingBlockingPageTest, ../../chrome/browser/safe_browsing/safe_browsing_blocking_page.h:143:167: error: ‘safe_browsing::SafeBrowsingBlockingPageTest_FLAKY_MalwareReportsToggling_Test’ is already a friend of ‘safe_browsing::SafeBrowsingBlockingPage’ [-Werror] FRIEND_TEST_ALL_PREFIXES(SafeBrowsingBlockingPageTest, Android build had no issues. BUG=NONE TESTS=NONE ==========
Message was sent while issue was closed.
Committed patchset #2 (id:20001)
Message was sent while issue was closed.
Description was changed from ========== [gcc_build_error] Fix for multiple friend decl of MalwareReportsToggling Linux desktop gcc build is failing with below error: In file included from ../../chrome/browser/ui/webui/interstitials/interstitial_ui.cc:12:0: ../../chrome/browser/safe_browsing/safe_browsing_blocking_page.h:143:16: error: ‘safe_browsing::SafeBrowsingBlockingPageTest_MalwareReportsToggling_Test’ is already a friend of ‘safe_browsing::SafeBrowsingBlockingPage’ [-Werror] FRIEND_TEST_ALL_PREFIXES(SafeBrowsingBlockingPageTest, ../../chrome/browser/safe_browsing/safe_browsing_blocking_page.h:143:87: error: ‘safe_browsing::SafeBrowsingBlockingPageTest_DISABLED_MalwareReportsToggling_Test’ is already a friend of ‘safe_browsing::SafeBrowsingBlockingPage’ [-Werror] FRIEND_TEST_ALL_PREFIXES(SafeBrowsingBlockingPageTest, ../../chrome/browser/safe_browsing/safe_browsing_blocking_page.h:143:167: error: ‘safe_browsing::SafeBrowsingBlockingPageTest_FLAKY_MalwareReportsToggling_Test’ is already a friend of ‘safe_browsing::SafeBrowsingBlockingPage’ [-Werror] FRIEND_TEST_ALL_PREFIXES(SafeBrowsingBlockingPageTest, Android build had no issues. BUG=NONE TESTS=NONE ========== to ========== [gcc_build_error] Fix for multiple friend decl of MalwareReportsToggling Linux desktop gcc build is failing with below error: In file included from ../../chrome/browser/ui/webui/interstitials/interstitial_ui.cc:12:0: ../../chrome/browser/safe_browsing/safe_browsing_blocking_page.h:143:16: error: ‘safe_browsing::SafeBrowsingBlockingPageTest_MalwareReportsToggling_Test’ is already a friend of ‘safe_browsing::SafeBrowsingBlockingPage’ [-Werror] FRIEND_TEST_ALL_PREFIXES(SafeBrowsingBlockingPageTest, ../../chrome/browser/safe_browsing/safe_browsing_blocking_page.h:143:87: error: ‘safe_browsing::SafeBrowsingBlockingPageTest_DISABLED_MalwareReportsToggling_Test’ is already a friend of ‘safe_browsing::SafeBrowsingBlockingPage’ [-Werror] FRIEND_TEST_ALL_PREFIXES(SafeBrowsingBlockingPageTest, ../../chrome/browser/safe_browsing/safe_browsing_blocking_page.h:143:167: error: ‘safe_browsing::SafeBrowsingBlockingPageTest_FLAKY_MalwareReportsToggling_Test’ is already a friend of ‘safe_browsing::SafeBrowsingBlockingPage’ [-Werror] FRIEND_TEST_ALL_PREFIXES(SafeBrowsingBlockingPageTest, Android build had no issues. BUG=NONE TESTS=NONE Committed: https://crrev.com/3bc60386c0ebc5145564c18968deac6e4a425ec3 Cr-Commit-Position: refs/heads/master@{#367058} ==========
Message was sent while issue was closed.
Patchset 2 (id:??) landed as https://crrev.com/3bc60386c0ebc5145564c18968deac6e4a425ec3 Cr-Commit-Position: refs/heads/master@{#367058} |