String cleanup in sync code

chrome/browser/sync/engine/auth_watcher_unittest.cc

 // Copyright (c) 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 entry.
 
 #include "base/scoped_ptr.h"
 #include "base/scoped_temp_dir.h"
 #include "base/test/test_file_util.h"
 #include "base/waitable_event.h"
 #include "chrome/browser/sync/engine/all_status.h"
 #include "chrome/browser/sync/engine/auth_watcher.h"
@@ skipping 68 matching lines @@
   virtual void SetUp() {
     metadb_.SetUp();
     connection_.reset(new MockConnectionManager(metadb_.manager(),
                                                 metadb_.name()));
     // Mock out data that would normally be sent back from a server.
     connection()->SetAuthenticationResponseInfo(kValidAuthToken,
         kUserDisplayName, kUserDisplayEmail, "ID");
     allstatus_.reset(new AllStatus());
     user_settings_.reset(new UserSettings());
     ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
-    PathString user_settings_path = temp_dir_.path().value() + kUserSettingsDB;
+    FilePath user_settings_path = temp_dir_.path().Append(kUserSettingsDB);
     user_settings_->Init(user_settings_path);
     gaia_auth_ = new GaiaAuthMockForAuthWatcher();
     talk_mediator_.reset(new TalkMediatorImpl());
     auth_watcher_ = new AuthWatcher(metadb_.manager(), connection_.get(),
         allstatus_.get(), kTestUserAgent, kTestServiceId, kTestGaiaURL,
         user_settings_.get(), gaia_auth_, talk_mediator_.get());
     authwatcher_hookup_.reset(NewEventListenerHookup(auth_watcher_->channel(),
         this, &AuthWatcherTest::HandleAuthWatcherEvent));
   }
 
@@ skipping 102 matching lines @@
   EXPECT_EQ(AuthWatcherEvent::SERVICE_AUTH_FAILED, ConsumeNextEvent());
 }
 
 TEST_F(AuthWatcherTest, AuthenticateWithTokenSuccess) {
   auth_watcher()->AuthenticateWithToken(kTestEmail, kValidAuthToken);
   EXPECT_EQ(AuthWatcherEvent::AUTH_SUCCEEDED, ConsumeNextEvent());
   EXPECT_EQ(kUserDisplayEmail, user_email());
 }
 
 }  // namespace browser_sync