summaryrefslogtreecommitdiffstats
path: root/content/browser/speech
diff options
context:
space:
mode:
authorbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-14 17:58:00 +0000
committerbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-14 17:58:00 +0000
commit716775259699430736d1a461131d2bc9982e1dc3 (patch)
tree825820a1778ba504a8319cae95b9b8d79a0742b5 /content/browser/speech
parent3eacfb1de4c166b7c5606ccc4e2943c80f75e16a (diff)
downloadchromium_src-716775259699430736d1a461131d2bc9982e1dc3.zip
chromium_src-716775259699430736d1a461131d2bc9982e1dc3.tar.gz
chromium_src-716775259699430736d1a461131d2bc9982e1dc3.tar.bz2
Make content use base namespace for Values.
This is in preparation for removing the "using". BUG= TBR=jam@chromium.org Review URL: https://codereview.chromium.org/17025003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@206442 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/speech')
-rw-r--r--content/browser/speech/google_one_shot_remote_engine.cc24
1 files changed, 12 insertions, 12 deletions
diff --git a/content/browser/speech/google_one_shot_remote_engine.cc b/content/browser/speech/google_one_shot_remote_engine.cc
index 7d54aa9..a421e79 100644
--- a/content/browser/speech/google_one_shot_remote_engine.cc
+++ b/content/browser/speech/google_one_shot_remote_engine.cc
@@ -46,20 +46,20 @@ bool ParseServerResponse(const std::string& response_body,
// Parse the response, ignoring comments.
std::string error_msg;
- scoped_ptr<Value> response_value(base::JSONReader::ReadAndReturnError(
+ scoped_ptr<base::Value> response_value(base::JSONReader::ReadAndReturnError(
response_body, base::JSON_PARSE_RFC, NULL, &error_msg));
if (response_value == NULL) {
LOG(WARNING) << "ParseServerResponse: JSONReader failed : " << error_msg;
return false;
}
- if (!response_value->IsType(Value::TYPE_DICTIONARY)) {
+ if (!response_value->IsType(base::Value::TYPE_DICTIONARY)) {
VLOG(1) << "ParseServerResponse: Unexpected response type "
<< response_value->GetType();
return false;
}
- const DictionaryValue* response_object =
- static_cast<const DictionaryValue*>(response_value.get());
+ const base::DictionaryValue* response_object =
+ static_cast<const base::DictionaryValue*>(response_value.get());
// Get the status.
int status;
@@ -87,40 +87,40 @@ bool ParseServerResponse(const std::string& response_body,
}
// Get the hypotheses.
- const Value* hypotheses_value = NULL;
+ const base::Value* hypotheses_value = NULL;
if (!response_object->Get(kHypothesesString, &hypotheses_value)) {
VLOG(1) << "ParseServerResponse: Missing hypotheses attribute.";
return false;
}
DCHECK(hypotheses_value);
- if (!hypotheses_value->IsType(Value::TYPE_LIST)) {
+ if (!hypotheses_value->IsType(base::Value::TYPE_LIST)) {
VLOG(1) << "ParseServerResponse: Unexpected hypotheses type "
<< hypotheses_value->GetType();
return false;
}
- const ListValue* hypotheses_list =
- static_cast<const ListValue*>(hypotheses_value);
+ const base::ListValue* hypotheses_list =
+ static_cast<const base::ListValue*>(hypotheses_value);
// For now we support only single shot recognition, so we are giving only a
// final result, consisting of one fragment (with one or more hypotheses).
size_t index = 0;
for (; index < hypotheses_list->GetSize(); ++index) {
- const Value* hypothesis = NULL;
+ const base::Value* hypothesis = NULL;
if (!hypotheses_list->Get(index, &hypothesis)) {
LOG(WARNING) << "ParseServerResponse: Unable to read hypothesis value.";
break;
}
DCHECK(hypothesis);
- if (!hypothesis->IsType(Value::TYPE_DICTIONARY)) {
+ if (!hypothesis->IsType(base::Value::TYPE_DICTIONARY)) {
LOG(WARNING) << "ParseServerResponse: Unexpected value type "
<< hypothesis->GetType();
break;
}
- const DictionaryValue* hypothesis_value =
- static_cast<const DictionaryValue*>(hypothesis);
+ const base::DictionaryValue* hypothesis_value =
+ static_cast<const base::DictionaryValue*>(hypothesis);
string16 utterance;
if (!hypothesis_value->GetString(kUtteranceString, &utterance)) {