more changes

chrome/browser/extensions/extension_tts_engine_api.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/extensions/extension_tts_engine_api.h"
 
 #include <string>
 
 #include "base/json/json_writer.h"
 #include "base/values.h"
@@ skipping 40 matching lines @@
         result_voice->SetString(constants::kLangKey, voice.lang);
       if (!voice.gender.empty())
         result_voice->SetString(constants::kGenderKey, voice.gender);
       result_voice->SetString(constants::kExtensionIdKey, extension->id());
 
       ListValue* event_types = new ListValue();
       for (std::set<std::string>::const_iterator iter =
                voice.event_types.begin();
            iter != voice.event_types.end();
            ++iter) {
-        event_types->Append(Value::CreateStringValue(*iter));
+        event_types->Append(base::StringValue::New(*iter));
       }
       // If the extension sends end events, the controller will handle
       // queueing and send interrupted and cancelled events.
       if (voice.event_types.find(constants::kEventTypeEnd) !=
           voice.event_types.end()) {
         event_types->Append(
-            Value::CreateStringValue(constants::kEventTypeCancelled));
-        event_types->Append(Value::CreateStringValue(
+            base::StringValue::New(constants::kEventTypeCancelled));
+        event_types->Append(base::StringValue::New(
             constants::kEventTypeInterrupted));
       }
 
       result_voice->Set(constants::kEventTypesKey, event_types);
       result_voices->Append(result_voice);
     }
   }
 }
 
 bool GetMatchingExtensionVoice(
@@ skipping 73 matching lines @@
                              size_t voice_index) {
   // See if the engine supports the "end" event; if so, we can keep the
   // utterance around and track it. If not, we're finished with this
   // utterance now.
   const std::set<std::string> event_types =
       extension->tts_voices()[voice_index].event_types;
   bool sends_end_event =
       (event_types.find(constants::kEventTypeEnd) != event_types.end());
 
   ListValue args;
-  args.Set(0, Value::CreateStringValue(utterance->text()));
+  args.Set(0, base::StringValue::New(utterance->text()));
 
   // Pass through most options to the speech engine, but remove some
   // that are handled internally.
   DictionaryValue* options = static_cast<DictionaryValue*>(
       utterance->options()->DeepCopy());
   if (options->HasKey(constants::kRequiredEventTypesKey))
     options->Remove(constants::kRequiredEventTypesKey, NULL);
   if (options->HasKey(constants::kDesiredEventTypesKey))
     options->Remove(constants::kDesiredEventTypesKey, NULL);
   if (sends_end_event && options->HasKey(constants::kEnqueueKey))
     options->Remove(constants::kEnqueueKey, NULL);
   if (options->HasKey(constants::kSrcIdKey))
     options->Remove(constants::kSrcIdKey, NULL);
   if (options->HasKey(constants::kIsFinalEventKey))
     options->Remove(constants::kIsFinalEventKey, NULL);
 
   args.Set(1, options);
-  args.Set(2, Value::CreateIntegerValue(utterance->id()));
+  args.Set(2, base::NumberValue::New(utterance->id()));
   std::string json_args;
   base::JSONWriter::Write(&args, false, &json_args);
 
   utterance->profile()->GetExtensionEventRouter()->DispatchEventToExtension(
       extension->id(),
       events::kOnSpeak,
       json_args,
       utterance->profile(),
       GURL());
 }
@@ skipping 60 matching lines @@
     std::string error_message;
     event->GetString(constants::kErrorMessageKey, &error_message);
     controller->OnTtsEvent(
         utterance_id, TTS_EVENT_ERROR, char_index, error_message);
   } else {
     EXTENSION_FUNCTION_VALIDATE(false);
   }
 
   return true;
 }