Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(103)

Issue 1551583002: [gcc_build_error] Fix for multiple friend decl of MalwareReportsToggling (Closed)

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! #

Unified diffs Side-by-side diffs Delta from patch set Stats (+0 lines, -5 lines) Patch
M chrome/browser/safe_browsing/safe_browsing_blocking_page.h View 1 1 chunk +0 lines, -5 lines 0 comments Download

Messages

Total messages: 14 (7 generated)
RaviKasibhatla
PTAL. Found a compilation error with gcc. Not sure if the fix is already under ...
4 years, 12 months ago (2015-12-28 08:52:55 UTC) #4
mattm
https://codereview.chromium.org/1551583002/diff/1/chrome/browser/safe_browsing/safe_browsing_blocking_page.h File chrome/browser/safe_browsing/safe_browsing_blocking_page.h (right): https://codereview.chromium.org/1551583002/diff/1/chrome/browser/safe_browsing/safe_browsing_blocking_page.h#newcode105 chrome/browser/safe_browsing/safe_browsing_blocking_page.h:105: MalwareReportsTransitionDisabled); MalwareReportsTransitionDisabled test doesn't seem to exist anymore, you ...
4 years, 12 months ago (2015-12-28 17:56:31 UTC) #6
RaviKasibhatla
Done. PTAL! https://codereview.chromium.org/1551583002/diff/1/chrome/browser/safe_browsing/safe_browsing_blocking_page.h File chrome/browser/safe_browsing/safe_browsing_blocking_page.h (right): https://codereview.chromium.org/1551583002/diff/1/chrome/browser/safe_browsing/safe_browsing_blocking_page.h#newcode105 chrome/browser/safe_browsing/safe_browsing_blocking_page.h:105: MalwareReportsTransitionDisabled); On 2015/12/28 17:56:30, mattm wrote: > ...
4 years, 12 months ago (2015-12-29 05:35:08 UTC) #7
mattm
lgtm
4 years, 12 months ago (2015-12-29 06:07:26 UTC) #8
commit-bot: I haz the power
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
4 years, 12 months ago (2015-12-29 06:33:53 UTC) #10
commit-bot: I haz the power
Committed patchset #2 (id:20001)
4 years, 12 months ago (2015-12-29 07:13:01 UTC) #12
commit-bot: I haz the power
4 years, 12 months ago (2015-12-29 07:13:51 UTC) #14
Message was sent while issue was closed.
Patchset 2 (id:??) landed as
https://crrev.com/3bc60386c0ebc5145564c18968deac6e4a425ec3
Cr-Commit-Position: refs/heads/master@{#367058}

Powered by Google App Engine
This is Rietveld 408576698