Revert of Delete base/prefs and update callers to use components.

components/prefs/pref_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 <stddef.h>
 #include <stdint.h>
 
 #include <string>
 
 #include "base/macros.h"
@@ skipping 266 matching lines @@
     last_write_flags_ = flags;
   }
 
   bool last_write_flags_set_ = false;
   uint32_t last_write_flags_ = WriteablePrefStore::DEFAULT_PREF_WRITE_FLAGS;
 };
 
 TEST(PrefServiceTest, WriteablePrefStoreFlags) {
   scoped_refptr<WriteFlagChecker> flag_checker(new WriteFlagChecker);
   scoped_refptr<PrefRegistrySimple> registry(new PrefRegistrySimple);
-  PrefServiceFactory factory;
+  base::PrefServiceFactory factory;
   factory.set_user_prefs(flag_checker);
   scoped_ptr<PrefService> prefs(factory.Create(registry.get()));
 
   // The first 8 bits of write flags are reserved for subclasses. Create a
   // custom flag in this range
   uint32_t kCustomRegistrationFlag = 1 << 2;
 
   // A map of the registration flags that will be tested and the write flags
   // they are expected to convert to.
   struct RegistrationToWriteFlags {
@@ skipping 123 matching lines @@
 
   EXPECT_CALL(observer_, OnPreferenceChanged(_)).Times(0);
   prefs_.Set(kName, new_value);
   Mock::VerifyAndClearExpectations(&observer_);
 
   base::ListValue empty;
   observer_.Expect(kName, &empty);
   prefs_.Set(kName, empty);
   Mock::VerifyAndClearExpectations(&observer_);
 }