Revert 285657 "Move variations component code to variations name..."

trunk/src/chrome/browser/metrics/variations/variations_service.h

 // 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.
 
 #ifndef CHROME_BROWSER_METRICS_VARIATIONS_VARIATIONS_SERVICE_H_
 #define CHROME_BROWSER_METRICS_VARIATIONS_VARIATIONS_SERVICE_H_
 
 #include <string>
 
 #include "base/compiler_specific.h"
@@ skipping 23 matching lines @@
 }
 
 namespace metrics {
 class MetricsStateManager;
 }
 
 namespace user_prefs {
 class PrefRegistrySyncable;
 }
 
-namespace variations {
-class VariationsSeed;
-}
-
 namespace chrome_variations {
 
+class VariationsSeed;
+
 // Used to setup field trials based on stored variations seed data, and fetch
 // new seed data from the variations server.
 class VariationsService
     : public net::URLFetcherDelegate,
       public ResourceRequestAllowedNotifier::Observer {
  public:
   class Observer {
    public:
     // How critical a detected experiment change is. Whether it should be
     // handled on a "best-effort" basis or, for a more critical change, if it
@@ skipping 97 matching lines @@
   FRIEND_TEST_ALL_PREFIXES(VariationsServiceTest, Observer);
   FRIEND_TEST_ALL_PREFIXES(VariationsServiceTest, SeedStoredWhenOKStatus);
   FRIEND_TEST_ALL_PREFIXES(VariationsServiceTest, SeedNotStoredWhenNonOKStatus);
   FRIEND_TEST_ALL_PREFIXES(VariationsServiceTest, SeedDateUpdatedOn304Status);
 
   // Checks if prerequisites for fetching the Variations seed are met, and if
   // so, performs the actual fetch using |DoActualFetch|.
   void FetchVariationsSeed();
 
   // Notify any observers of this service based on the simulation |result|.
-  void NotifyObservers(
-      const variations::VariationsSeedSimulator::Result& result);
+  void NotifyObservers(const VariationsSeedSimulator::Result& result);
 
   // net::URLFetcherDelegate implementation:
   virtual void OnURLFetchComplete(const net::URLFetcher* source) OVERRIDE;
 
   // ResourceRequestAllowedNotifier::Observer implementation:
   virtual void OnResourceRequestsAllowed() OVERRIDE;
 
   // Performs a variations seed simulation with the given |seed| and |version|
   // and logs the simulation results as histograms.
-  void PerformSimulationWithVersion(scoped_ptr<variations::VariationsSeed> seed,
+  void PerformSimulationWithVersion(scoped_ptr<VariationsSeed> seed,
                                     const base::Version& version);
 
   // Record the time of the most recent successful fetch.
   void RecordLastFetchTime();
 
   // The pref service used to store persist the variations seed.
   PrefService* local_state_;
 
   // Used for instantiating entropy providers for variations seed simulation.
   // Weak pointer.
@@ skipping 41 matching lines @@
 #endif
 
   base::WeakPtrFactory<VariationsService> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(VariationsService);
 };
 
 }  // namespace chrome_variations
 
 #endif  // CHROME_BROWSER_METRICS_VARIATIONS_VARIATIONS_SERVICE_H_