Remove dependencies of ResourceRequestAllowedNotifier on chrome/

chrome/browser/metrics/variations/variations_service_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 "chrome/browser/metrics/variations/variations_service.h"
 
 #include <vector>
 
 #include "base/base64.h"
 #include "base/prefs/testing_pref_service.h"
@@ skipping 248 matching lines @@
 
 TEST_F(VariationsServiceTest, RequestsInitiallyNotAllowed) {
   base::MessageLoopForUI message_loop;
   content::TestBrowserThread ui_thread(content::BrowserThread::UI,
                                        &message_loop);
   TestingPrefServiceSimple prefs;
   VariationsService::RegisterPrefs(prefs.registry());
 
   // Pass ownership to TestVariationsService, but keep a weak pointer to
   // manipulate it for this test.
-  TestRequestAllowedNotifier* test_notifier = new TestRequestAllowedNotifier;
+  TestRequestAllowedNotifier* test_notifier =
+      new TestRequestAllowedNotifier(&prefs);
   TestVariationsService test_service(test_notifier, &prefs);
 
   // Force the notifier to initially disallow requests.
   test_notifier->SetRequestsAllowedOverride(false);
   test_service.StartRepeatedVariationsSeedFetch();
   EXPECT_FALSE(test_service.fetch_attempted());
 
   test_notifier->NotifyObserver();
   EXPECT_TRUE(test_service.fetch_attempted());
 }
 
 TEST_F(VariationsServiceTest, RequestsInitiallyAllowed) {
   base::MessageLoopForUI message_loop;
   content::TestBrowserThread ui_thread(content::BrowserThread::UI,
                                        &message_loop);
   TestingPrefServiceSimple prefs;
   VariationsService::RegisterPrefs(prefs.registry());
 
   // Pass ownership to TestVariationsService, but keep a weak pointer to
   // manipulate it for this test.
-  TestRequestAllowedNotifier* test_notifier = new TestRequestAllowedNotifier;
+  TestRequestAllowedNotifier* test_notifier =
+      new TestRequestAllowedNotifier(&prefs);
   TestVariationsService test_service(test_notifier, &prefs);
 
   test_notifier->SetRequestsAllowedOverride(true);
   test_service.StartRepeatedVariationsSeedFetch();
   EXPECT_TRUE(test_service.fetch_attempted());
 }
 
 TEST_F(VariationsServiceTest, SeedStoredWhenOKStatus) {
   base::MessageLoop message_loop;
   content::TestBrowserThread io_thread(content::BrowserThread::IO,
                                        &message_loop);
   TestingPrefServiceSimple prefs;
   VariationsService::RegisterPrefs(prefs.registry());
 
-  TestVariationsService service(new TestRequestAllowedNotifier, &prefs);
+  TestVariationsService service(new TestRequestAllowedNotifier(&prefs), &prefs);
   const GURL url = VariationsService::GetVariationsServerURL(&prefs);
   service.variations_server_url_ = url;
   service.set_intercepts_fetch(false);
 
   net::TestURLFetcherFactory factory;
   service.DoActualFetch();
 
   net::TestURLFetcher* fetcher = factory.GetFetcherByID(0);
   SimulateServerResponse(net::HTTP_OK, fetcher);
   fetcher->SetResponseString(SerializeSeed(CreateTestSeed()));
@@ skipping 11 matching lines @@
     net::HTTP_INTERNAL_SERVER_ERROR,
     net::HTTP_SERVICE_UNAVAILABLE,
   };
 
   base::MessageLoop message_loop;
   content::TestBrowserThread io_thread(content::BrowserThread::IO,
                                        &message_loop);
   TestingPrefServiceSimple prefs;
   VariationsService::RegisterPrefs(prefs.registry());
 
-  VariationsService service(new TestRequestAllowedNotifier, &prefs, NULL);
+  VariationsService service(new TestRequestAllowedNotifier(&prefs), &prefs,
+                            NULL);
   const GURL url = VariationsService::GetVariationsServerURL(&prefs);
   service.variations_server_url_ = url;
   for (size_t i = 0; i < arraysize(non_ok_status_codes); ++i) {
     net::TestURLFetcherFactory factory;
     service.DoActualFetch();
     EXPECT_TRUE(prefs.FindPreference(prefs::kVariationsSeed)->IsDefaultValue());
 
     net::TestURLFetcher* fetcher = factory.GetFetcherByID(0);
     SimulateServerResponse(non_ok_status_codes[i], fetcher);
     service.OnURLFetchComplete(fetcher);
 
     EXPECT_TRUE(prefs.FindPreference(prefs::kVariationsSeed)->IsDefaultValue());
   }
 }
 
 TEST_F(VariationsServiceTest, SeedDateUpdatedOn304Status) {
   base::MessageLoop message_loop;
   content::TestBrowserThread io_thread(content::BrowserThread::IO,
                                        &message_loop);
   TestingPrefServiceSimple prefs;
   VariationsService::RegisterPrefs(prefs.registry());
 
   net::TestURLFetcherFactory factory;
-  VariationsService service(new TestRequestAllowedNotifier, &prefs, NULL);
+  VariationsService service(new TestRequestAllowedNotifier(&prefs), &prefs,
+                            NULL);
   const GURL url = VariationsService::GetVariationsServerURL(&prefs);
   service.variations_server_url_ = url;
   service.DoActualFetch();
   EXPECT_TRUE(
       prefs.FindPreference(prefs::kVariationsSeedDate)->IsDefaultValue());
 
   net::TestURLFetcher* fetcher = factory.GetFetcherByID(0);
   SimulateServerResponse(net::HTTP_NOT_MODIFIED, fetcher);
   service.OnURLFetchComplete(fetcher);
   EXPECT_FALSE(
       prefs.FindPreference(prefs::kVariationsSeedDate)->IsDefaultValue());
 }
 
 TEST_F(VariationsServiceTest, Observer) {
   TestingPrefServiceSimple prefs;
   VariationsService::RegisterPrefs(prefs.registry());
-  VariationsService service(new TestRequestAllowedNotifier, &prefs, NULL);
+  VariationsService service(new TestRequestAllowedNotifier(&prefs), &prefs,
+                            NULL);
 
   struct {
     int normal_count;
     int best_effort_count;
     int critical_count;
     int expected_best_effort_notifications;
     int expected_crtical_notifications;
   } cases[] = {
       {0, 0, 0, 0, 0},
       {1, 0, 0, 0, 0},
@@ skipping 21 matching lines @@
     EXPECT_EQ(cases[i].expected_best_effort_notifications,
               observer.best_effort_changes_notified()) << i;
     EXPECT_EQ(cases[i].expected_crtical_notifications,
               observer.crticial_changes_notified()) << i;
 
     service.RemoveObserver(&observer);
   }
 }
 
 }  // namespace chrome_variations