more changes

chrome/browser/sync/sync_setup_wizard_unittest.cc

 // Copyright (c) 2011 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/sync_setup_wizard.h"
 
 #include "base/json/json_writer.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/stl_util.h"
 #include "base/utf_string_conversions.h"
@@ skipping 228 matching lines @@
   DictionaryValue dialog_args;
   SyncSetupFlow::GetArgsForGaiaLogin(service_, &dialog_args);
   std::string json_start_args;
   base::JSONWriter::Write(&dialog_args, false, &json_start_args);
   ListValue credentials;
   std::string auth = "{\"user\":\"";
   auth += std::string(kTestUser) + "\",\"pass\":\"";
   auth += std::string(kTestPassword) + "\",\"captcha\":\"";
   auth += std::string(kTestCaptcha) + "\",\"access_code\":\"";
   auth += std::string() + "\"}";
-  credentials.Append(new StringValue(auth));
+  credentials.Append(base::StringValue::New(auth));
 
   EXPECT_FALSE(wizard_->IsVisible());
   EXPECT_EQ(static_cast<SyncSetupFlow*>(NULL), flow_);
   wizard_->Step(SyncSetupWizard::GAIA_LOGIN);
   AttachSyncSetupHandler();
 
   EXPECT_TRUE(wizard_->IsVisible());
   EXPECT_EQ(SyncSetupWizard::GAIA_LOGIN, flow_->current_state_);
   EXPECT_EQ(SyncSetupWizard::DONE, flow_->end_state_);
   EXPECT_EQ(json_start_args, flow_->dialog_start_args_);
@@ skipping 60 matching lines @@
   wizard_->Step(SyncSetupWizard::GAIA_SUCCESS);
   wizard_->Step(SyncSetupWizard::CONFIGURE);
 
   ListValue data_type_choices_value;
   std::string data_type_choices =
       "{\"keepEverythingSynced\":false,\"syncBookmarks\":true,"
       "\"syncPreferences\":true,\"syncThemes\":false,\"syncPasswords\":false,"
       "\"syncAutofill\":false,\"syncExtensions\":false,\"syncTypedUrls\":true,"
       "\"syncApps\":true,\"syncSessions\":false,\"usePassphrase\":false,"
       "\"encryptAllData\":false}";
-  data_type_choices_value.Append(new StringValue(data_type_choices));
+  data_type_choices_value.Append(base::StringValue::New(data_type_choices));
 
   // Simulate the user choosing data types; bookmarks, prefs, typed URLS, and
   // apps are on, the rest are off.
   handler_.HandleConfigure(&data_type_choices_value);
   EXPECT_TRUE(wizard_->IsVisible());
   EXPECT_FALSE(service_->keep_everything_synced_);
   EXPECT_EQ(1U, service_->chosen_data_types_.count(syncable::BOOKMARKS));
   EXPECT_EQ(1U, service_->chosen_data_types_.count(syncable::PREFERENCES));
   EXPECT_EQ(0U, service_->chosen_data_types_.count(syncable::THEMES));
   EXPECT_EQ(0U, service_->chosen_data_types_.count(syncable::PASSWORDS));
@@ skipping 10 matching lines @@
   wizard_->Step(SyncSetupWizard::GAIA_LOGIN);
   AttachSyncSetupHandler();
   wizard_->Step(SyncSetupWizard::GAIA_SUCCESS);
   wizard_->Step(SyncSetupWizard::CONFIGURE);
   wizard_->Step(SyncSetupWizard::SETTING_UP);
   service_->set_passphrase_required_reason(sync_api::REASON_ENCRYPTION);
   wizard_->Step(SyncSetupWizard::ENTER_PASSPHRASE);
   EXPECT_EQ(SyncSetupWizard::ENTER_PASSPHRASE, flow_->current_state_);
 
   ListValue value;
-  value.Append(new StringValue("{\"passphrase\":\"myPassphrase\","
+  value.Append(base::StringValue::New("{\"passphrase\":\"myPassphrase\","
                                 "\"mode\":\"gaia\"}"));
   handler_.HandlePassphraseEntry(&value);
   EXPECT_EQ("myPassphrase", service_->passphrase_);
   CloseSetupUI();
 }
 
 TEST_F(SyncSetupWizardTest, DialogCancelled) {
   SKIP_TEST_ON_MACOSX();
   wizard_->Step(SyncSetupWizard::GAIA_LOGIN);
   AttachSyncSetupHandler();
@@ skipping 209 matching lines @@
       AuthError(GoogleServiceAuthError::SERVICE_UNAVAILABLE));
   wizard_->Step(SyncSetupWizard::NONFATAL_ERROR);
   AttachSyncSetupHandler();
   EXPECT_EQ(SyncSetupWizard::GAIA_LOGIN, flow_->current_state_);
   EXPECT_EQ(SyncSetupWizard::DONE, flow_->end_state_);
   CloseSetupUI();
   EXPECT_FALSE(wizard_->IsVisible());
 }
 
 #undef SKIP_TEST_ON_MACOSX