String cleanup in sync code

chrome/browser/sync/engine/auth_watcher.cc

 // Copyright (c) 2006-2009 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/engine/auth_watcher.h"
 
 #include "base/file_util.h"
 #include "base/string_util.h"
 #include "chrome/browser/sync/engine/all_status.h"
 #include "chrome/browser/sync/engine/authenticator.h"
 #include "chrome/browser/sync/engine/net/gaia_authenticator.h"
 #include "chrome/browser/sync/engine/net/server_connection_manager.h"
 #include "chrome/browser/sync/notifier/listener/talk_mediator.h"
 #include "chrome/browser/sync/syncable/directory_manager.h"
 #include "chrome/browser/sync/syncable/syncable.h"
-#include "chrome/browser/sync/util/character_set_converters.h"
 #include "chrome/browser/sync/util/event_sys-inl.h"
 #include "chrome/browser/sync/util/user_settings.h"
 
 // How authentication happens:
 //
 // Kick Off:
 //     The sync API looks to see if the user's name and
 //     password are stored.  If so, it calls authwatcher.Authenticate() with
 //     them.  Otherwise it fires an error event.
 //
@@ skipping 88 matching lines @@
         gaia_email;
   }
   AuthWatcherEvent event = {AuthWatcherEvent::ILLEGAL_VALUE , 0};
   gaia_->SetUsername(email);
   gaia_->SetAuthToken(auth_token, SAVE_IN_MEMORY_ONLY);
   const bool was_authenticated = NOT_AUTHENTICATED != status_;
   switch (result) {
     case Authenticator::SUCCESS:
       {
         status_ = GAIA_AUTHENTICATED;
-        PathString share_name;
-        CHECK(AppendUTF8ToPathString(email.data(), email.size(), &share_name));
+        const PathString& share_name = email;
         user_settings_->SwitchUser(email);
 
         // Set the authentication token for notifications
         talk_mediator_->SetAuthToken(email, auth_token);
         scm_->set_auth_token(auth_token);
 
         if (!was_authenticated)
           LoadDirectoryListAndOpen(share_name);
         NotifyAuthSucceeded(email);
         return;
@@ skipping 21 matching lines @@
   NotifyListeners(&event);
 }
 
 bool AuthWatcher::AuthenticateLocally(string email) {
   DCHECK_EQ(MessageLoop::current(), message_loop());
   user_settings_->GetEmailForSignin(&email);
   if (file_util::PathExists(FilePath(dirman_->GetSyncDataDatabasePath()))) {
     gaia_->SetUsername(email);
     status_ = LOCALLY_AUTHENTICATED;
     user_settings_->SwitchUser(email);
-    PathString share_name;
-    CHECK(AppendUTF8ToPathString(email.data(), email.size(), &share_name));
+    const PathString& share_name = email;
     LoadDirectoryListAndOpen(share_name);
     NotifyAuthSucceeded(email);
     return true;
   } else {
     return false;
   }
 }
 
 bool AuthWatcher::AuthenticateLocally(string email, const string& password) {
   DCHECK_EQ(MessageLoop::current(), message_loop());
@@ skipping 149 matching lines @@
 string AuthWatcher::email() const {
   return gaia_->email();
 }
 
 void AuthWatcher::NotifyListeners(AuthWatcherEvent* event) {
   event->trigger = current_attempt_trigger_;
   channel_->NotifyListeners(*event);
 }
 
 }  // namespace browser_sync