Changes ProviderImpl to use a single DataFetcherFactory

content/browser/device_orientation/provider_unittest.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 <queue>
 
 #include "base/message_loop.h"
 #include "base/synchronization/lock.h"
 #include "content/browser/device_orientation/data_fetcher.h"
 #include "content/browser/device_orientation/orientation.h"
@@ skipping 147 matching lines @@
     provider_ = NULL;
 
     // Make sure it is really gone.
     EXPECT_FALSE(Provider::GetInstanceForTests());
 
     // Clean up in any case, so as to not break subsequent test.
     Provider::SetInstanceForTests(NULL);
   }
 
   // Initialize the test fixture with a ProviderImpl that uses the
-  // DataFetcherFactories in the null-terminated factories array.
-  void Init(ProviderImpl::DataFetcherFactory* factories) {
-    provider_ = new ProviderImpl(factories);
-    Provider::SetInstanceForTests(provider_);
-  }
-
-  // Initialize the test fixture with a ProviderImpl that uses the
   // DataFetcherFactory factory.
   void Init(ProviderImpl::DataFetcherFactory factory) {
-    ProviderImpl::DataFetcherFactory factories[] = { factory, NULL };
-    Init(factories);
+    provider_ = new ProviderImpl(&factory);

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

here too i think it's just the value that should be passed in, not a pointer to
it

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

Done.

+    Provider::SetInstanceForTests(provider_);
   }
 
  protected:
   // Number of pending expectations.
   int pending_expectations_;
 
   // Provider instance under test.
   scoped_refptr<Provider> provider_;
 
   // Message loop for the test thread.
@@ skipping 273 matching lines @@
   MessageLoop::current()->Run();
 
   provider_->RemoveObserver(checker_a.get());
   provider_->RemoveObserver(checker_b.get());
   MockOrientationFactory::SetCurInstance(NULL);
 }
 
 }  // namespace
 
 }  // namespace device_orientation