Merge 66886 - 2010-09-07 Jonathan Dixon <joth@chromium.org>...

WebKit/chromium/src/WebGeolocationServiceMock.cpp

 /*
  * 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 16 matching lines @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "config.h"
 #include "WebGeolocationServiceMock.h"
 
 #include "GeolocationService.h"
 #include "GeolocationServiceChromium.h"
 #include "GeolocationServiceMock.h"
+#include "WebGeolocationServiceBridge.h"
 #include "WebString.h"
 #include <wtf/CurrentTime.h>
 #include <wtf/HashMap.h>
 
 #if ENABLE(GEOLOCATION)
 
 using WebCore::Coordinates;
 using WebCore::Frame;
 using WebCore::Geolocation;
 using WebCore::GeolocationServiceBridge;
@@ skipping 132 matching lines @@
 }
 
 void WebGeolocationServiceMockImpl::detachBridge(int bridgeId)
 {
     m_idToBridgeMap.remove(bridgeId);
 }
 
 } // namespace WebKit
 
 #endif // ENABLE(GEOLOCATION)