Remove blank items from ExternalPopupMenu

Source/web/ExternalPopupMenu.h

 /*
  * Copyright (C) 2010 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 13 matching lines @@
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #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"
 #include "public/platform/WebScrollbar.h"
 #include "public/web/WebExternalPopupMenuClient.h"
 
 namespace blink {
 
 class FloatQuad;
 class LocalFrame;
@@ skipping 22 matching lines @@
 
     // WebExternalPopupClient methods:
     virtual void didChangeSelection(int index) OVERRIDE;
     virtual void didAcceptIndex(int index) OVERRIDE;
     virtual void didAcceptIndices(const WebVector<int>& indices) OVERRIDE;
     virtual void didCancel() OVERRIDE;
 
     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;
     WebViewImpl& m_webView;
     OwnPtr<WebMouseEvent> m_syntheticEvent;
     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
 
 #endif // ExternalPopupMenu_h