Revert 184352

chrome/browser/sync/glue/synced_device_tracker.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/sync/glue/synced_device_tracker.h"
 
 #include "base/stringprintf.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/sync/glue/device_info.h"
 #include "sync/internal_api/public/base/model_type.h"
@@ skipping 81 matching lines @@
   specifics.set_chrome_version(info.chrome_version());
   specifics.set_sync_user_agent(info.sync_user_agent());
   specifics.set_device_type(info.device_type());
 
   syncer::WriteTransaction trans(FROM_HERE, user_share_);
   syncer::WriteNode node(&trans);
 
   if (node.InitByClientTagLookup(syncer::DEVICE_INFO, local_device_info_tag_) ==
       syncer::BaseNode::INIT_OK) {
     node.SetDeviceInfoSpecifics(specifics);
-    node.SetTitle(base::ASCIIToWide(specifics.client_name()));
+    node.SetTitle(ASCIIToWide(specifics.client_name()));
   } else {
     syncer::ReadNode type_root(&trans);
     syncer::BaseNode::InitByLookupResult type_root_lookup_result =
         type_root.InitByTagLookup(ModelTypeToRootTag(syncer::DEVICE_INFO));
     DCHECK_EQ(syncer::BaseNode::INIT_OK, type_root_lookup_result);
 
     syncer::WriteNode new_node(&trans);
     syncer::WriteNode::InitUniqueByCreationResult create_result =
         new_node.InitUniqueByCreation(syncer::DEVICE_INFO,
                                       type_root,
                                       local_device_info_tag_);
     DCHECK_EQ(syncer::WriteNode::INIT_SUCCESS, create_result);
     new_node.SetDeviceInfoSpecifics(specifics);
-    new_node.SetTitle(base::ASCIIToWide(specifics.client_name()));
+    new_node.SetTitle(ASCIIToWide(specifics.client_name()));
   }
 }
 
 }  // namespace browser_sync