Even more test cleanup. Some fixes to non-test code.

chrome/browser/geolocation/arbitrator_dependency_factories_for_test.h

Index: chrome/browser/geolocation/arbitrator_dependency_factories_for_test.h
diff --git a/chrome/browser/geolocation/arbitrator_dependency_factories_for_test.h b/chrome/browser/geolocation/arbitrator_dependency_factories_for_test.h
index 1f9ae75116a1d2405ed10c1f2987ad9b65bec7f9..f66aaa4be09fa65297c63c4ba38479c9ec73a437 100644
--- a/chrome/browser/geolocation/arbitrator_dependency_factories_for_test.h
+++ b/chrome/browser/geolocation/arbitrator_dependency_factories_for_test.h
@@ -14,21 +14,16 @@ class GeolocationArbitratorDependencyFactoryWithLocationProvider
   typedef LocationProviderBase* (*LocationProviderFactoryFunction)(void);
 
   GeolocationArbitratorDependencyFactoryWithLocationProvider(
-      LocationProviderFactoryFunction factory_function)
-      : factory_function_(factory_function) {
-  }
+      LocationProviderFactoryFunction factory_function);
+  virtual ~GeolocationArbitratorDependencyFactoryWithLocationProvider();
 
   virtual LocationProviderBase* NewNetworkLocationProvider(
       AccessTokenStore* access_token_store,
       URLRequestContextGetter* context,
       const GURL& url,
-      const string16& access_token) {
-    return factory_function_();
-  }
+      const string16& access_token);
 
-  virtual LocationProviderBase* NewSystemLocationProvider() {
-    return NULL;
-  }
+  virtual LocationProviderBase* NewSystemLocationProvider();
 
  protected:
   LocationProviderFactoryFunction factory_function_;