Remove blank items from ExternalPopupMenu

Source/web/ExternalPopupMenu.h

Index: Source/web/ExternalPopupMenu.h
diff --git a/Source/web/ExternalPopupMenu.h b/Source/web/ExternalPopupMenu.h
index 893cf0b6c5031ba200b075f3121a732c5d16b9ea..d3761a79c54f0fb085c4bc9fc2963c32e19ae84d 100644
--- a/Source/web/ExternalPopupMenu.h
+++ b/Source/web/ExternalPopupMenu.h
@@ -31,6 +31,7 @@
 #ifndef ExternalPopupMenu_h
 #define ExternalPopupMenu_h
 
+#include "base/gtest_prod_util.h"

[tkent, 2014/08/21 00:53:33]

Remove this.  Blink must not include base/ files.
Presubmit task must have shown an error when you uploaded this patch.

[spartha, 2014/08/21 06:33:23]

It did give me a DEPS error. Other than that, it did not crib about anything
else. Reason for inclusion is to use the FRIEND_TEST_XXX macros to test the
private member functions. I see there are no helpers on the same lines available
in blink. Will adding something similar be a good idea?

[tkent, 2014/08/21 06:40:05]

We can use FRIEND_TEST defined in gtest/gtest_prod.h, or make the static
functions public.

[spartha, 2014/08/21 07:07:26]

I see that FRIEND_TEST is not encouraged to be used. presubmit.py has a check
against using FRIEND_TEST. Is it ok to make the members public only for testing?

[tkent, 2014/08/21 07:09:31]

Oh, I see.  Then, making them public is the only way.
Please add comments like "// This is public for testing."

[spartha, 2014/08/21 07:18:57]

Done. Would it not be useful if gtest_prod_util.h is available in blink?

[tkent, 2014/08/21 07:49:01]

It would be useful, but I don't think we should do anything for it now.  We'll
merge Blink repo into Chromium repo in some months, then we'll allow base/
includes in Blink.

 #include "platform/PopupMenu.h"
 #include "platform/Timer.h"
 #include "public/platform/WebCanvas.h"
@@ -73,9 +74,9 @@ private:
     void dispatchEvent(Timer<ExternalPopupMenu>*);
     // Fills |info| with the popup menu information contained in the
     // PopupMenuClient associated with this ExternalPopupMenu.
-    void getPopupMenuInfo(WebPopupMenuInfo* info);
-    int toPopupMenuItemIndex(int index);
-    int toExternalPopupMenuItemIndex(int index);
+    static void getPopupMenuInfo(WebPopupMenuInfo*, PopupMenuClient*);

[tkent, 2014/08/21 00:53:33]

PopupMenuClient argument should be |PopupMenuClient&| because it must not be
null.

[spartha, 2014/08/21 10:05:43]

Done.

+    static int toPopupMenuItemIndex(int index, PopupMenuClient*);

[tkent, 2014/08/21 00:53:33]

Ditto.

[spartha, 2014/08/21 10:05:43]

Done.

+    static int toExternalPopupMenuItemIndex(int index, PopupMenuClient*);

[tkent, 2014/08/21 00:53:33]

Ditto.

[spartha, 2014/08/21 10:05:43]

Done.

 
     PopupMenuClient* m_popupMenuClient;
     RefPtr<FrameView> m_frameView;
@@ -84,6 +85,9 @@ private:
     Timer<ExternalPopupMenu> m_dispatchEventTimer;
     // The actual implementor of the show menu.
     WebExternalPopupMenu* m_webExternalPopupMenu;
+
+    FRIEND_TEST_ALL_PREFIXES(ExternalPopupMenuDisplayNoneItemsTest, PopupMenuInfoSizeTest);
+    FRIEND_TEST_ALL_PREFIXES(ExternalPopupMenuDisplayNoneItemsTest, IndexMappingTest);
 };
 
 } // namespace blink