Changes ProviderImpl to use a single DataFetcherFactory

content/browser/device_orientation/provider.cc

Index: content/browser/device_orientation/provider.cc
diff --git a/content/browser/device_orientation/provider.cc b/content/browser/device_orientation/provider.cc
index 659956a7eba31d715b053f49127234fd769b3087..e18c5f15cf1ae7763013a8e744526fb351147d98 100644
--- a/content/browser/device_orientation/provider.cc
+++ b/content/browser/device_orientation/provider.cc
@@ -22,16 +22,15 @@ namespace device_orientation {
 Provider* Provider::GetInstance() {
   if (!instance_) {
     DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
-    const ProviderImpl::DataFetcherFactory default_factories[] = {
+    const ProviderImpl::DataFetcherFactory *default_factory = NULL;

[hans, 2012/08/01 19:08:47]

hmm, I thought DataFetcherFactory was of type "pointer to function that returns
a DataFetcher", so I'm surprised that default_factory is becoming a pointer..

but it also seems to work below :/ i'm confused.

[aousterh, 2012/08/02 10:10:38]

Hmmm I'm not sure why it was working before. But now default_factory is just a
DataFetcherFactory.

+
 #if defined(OS_MACOSX)
-      AccelerometerMac::Create,
+    default_factory = AccelerometerMac::Create;
 #elif defined(OS_ANDROID)
-      DataFetcherImplAndroid::Create,
+    default_factory = DataFetcherImplAndroid::Create;
 #endif
-      NULL
-    };
 
-    instance_ = new ProviderImpl(default_factories);
+    instance_ = new ProviderImpl(default_factory);
   }
   return instance_;
 }