Changes ProviderImpl to use a single DataFetcherFactory

content/browser/device_orientation/provider.cc

 // Copyright (c) 2012 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.
 
 #include "content/browser/device_orientation/provider.h"
 
 #include "base/logging.h"
 #include "content/browser/device_orientation/data_fetcher.h"
 #include "content/browser/device_orientation/provider_impl.h"
 #include "content/public/browser/browser_thread.h"
 
 #if defined(OS_MACOSX)
 #include "content/browser/device_orientation/accelerometer_mac.h"
 #elif defined(OS_ANDROID)
 #include "content/browser/device_orientation/data_fetcher_impl_android.h"
 #endif
 
 using content::BrowserThread;
 
 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_;
 }
 
 void Provider::SetInstanceForTests(Provider* provider) {
   DCHECK(!instance_);
   instance_ = provider;
 }
 
 Provider* Provider::GetInstanceForTests() {
   return instance_;
 }
 
 Provider::Provider() {
 }
 
 Provider::~Provider() {
   DCHECK(instance_ == this);
   instance_ = NULL;
 }
 
 Provider* Provider::instance_ = NULL;
 
 } //  namespace device_orientation