[Sync] Fix test support targets + duplicate namespaces.

components/sync/device_info/device_info_service.h

 // Copyright 2015 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 COMPONENTS_SYNC_DEVICE_INFO_DEVICE_INFO_SERVICE_H_
 #define COMPONENTS_SYNC_DEVICE_INFO_DEVICE_INFO_SERVICE_H_
 
 #include <stdint.h>
 
 #include <map>
 #include <memory>
 #include <string>
 #include <vector>
 
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "base/observer_list.h"
 #include "base/time/time.h"
 #include "base/timer/timer.h"
 #include "components/sync/device_info/device_info_tracker.h"
 #include "components/sync/device_info/local_device_info_provider.h"
 #include "components/sync/model/model_type_service.h"
 #include "components/sync/model/model_type_store.h"
 #include "components/sync/model/simple_metadata_change_list.h"
 
-namespace syncer {
-class SyncError;
-}  // namespace syncer
-
-namespace syncer {
-class ModelTypeChangeProcessor;
-}  // namespace syncer
-
 namespace sync_pb {
 class DeviceInfoSpecifics;
 }  // namespace sync_pb
 
 namespace syncer {
 
+class ModelTypeChangeProcessor;
+class SyncError;
+
 // USS service implementation for DEVICE_INFO model type. Handles storage of
 // device info and associated sync metadata, applying/merging foreign changes,
 // and allows public read access.
 class DeviceInfoService : public ModelTypeService, public DeviceInfoTracker {
  public:
   typedef base::Callback<void(const ModelTypeStore::InitCallback& callback)>
       StoreFactoryFunction;
 
   DeviceInfoService(LocalDeviceInfoProvider* local_device_info_provider,
                     const StoreFactoryFunction& callback,
@@ skipping 119 matching lines @@
 
   // Used to update our local device info once every pulse interval.
   base::OneShotTimer pulse_timer_;
 
   DISALLOW_COPY_AND_ASSIGN(DeviceInfoService);
 };
 
 }  // namespace syncer
 
 #endif  // COMPONENTS_SYNC_DEVICE_INFO_DEVICE_INFO_SERVICE_H_