Make delayed-permission-denied-for-multiple-requests pass

webkit/tools/test_shell/test_geolocation_service.h

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef WEBKIT_TOOLS_TEST_SHELL_TEST_GEOLOCATION_SERVICE_H_
 #define WEBKIT_TOOLS_TEST_SHELL_TEST_GEOLOCATION_SERVICE_H_
 
 #include "base/id_map.h"
 #include "base/timer.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebGeolocationService.h"
@@ skipping 27 matching lines @@
 
   void SetGeolocationPermission(bool allowed);
 
   virtual void requestPermissionForFrame(int bridgeId,
                                          const WebKit::WebURL& url);
 
   virtual int attachBridge(WebKit::WebGeolocationServiceBridge* bridge);
   virtual void detachBridge(int bridgeId);
 
  private:
+  void TryToSendPermissions();
   void SendPermission();
 
+  // Holds the value of |allowed| in most recent SetGeolocationPermission call.
   bool allowed_;
+  // Remains false until the first SetGeolocationPermission call.
+  bool permission_set_;
 
   IDMap<WebKit::WebGeolocationServiceBridge> bridges_map_;
 
   base::OneShotTimer<TestGeolocationService> permission_timer_;
 
-  std::vector<std::pair<int, bool> > pending_permissions_;
+  // In-order vector of pending bridge IDs. Is not pumped by
+  // TryToSendPermissions until the first call to SetGeolocationPermission.
+  std::vector<int> pending_permissions_;
 
   DISALLOW_COPY_AND_ASSIGN(TestGeolocationService);
 };
 
 #endif  // WEBKIT_TOOLS_TEST_SHELL_TEST_GEOLOCATION_SERVICE_H_