summaryrefslogtreecommitdiffstats
path: root/content
diff options
context:
space:
mode:
Diffstat (limited to 'content')
-rw-r--r--content/browser/accessibility/accessibility_tree_formatter_android.cc4
-rw-r--r--content/browser/accessibility/accessibility_tree_formatter_gtk.cc2
-rw-r--r--content/browser/browser_plugin/browser_plugin_host_browsertest.cc2
-rw-r--r--content/browser/devtools/devtools_protocol.cc4
-rw-r--r--content/browser/devtools/devtools_tracing_handler.cc4
-rw-r--r--content/browser/devtools/renderer_overrides_handler.cc2
-rw-r--r--content/browser/devtools/renderer_overrides_handler_browsertest.cc7
-rw-r--r--content/browser/gpu/gpu_internals_ui.cc2
-rw-r--r--content/browser/indexed_db/indexed_db_context_impl.cc17
-rw-r--r--content/browser/indexed_db/indexed_db_internals_ui.cc4
-rw-r--r--content/browser/media/webrtc_browsertest.cc10
-rw-r--r--content/browser/webui/generic_handler.cc2
-rw-r--r--content/browser/webui/web_ui_impl.cc28
-rw-r--r--content/browser/webui/web_ui_message_handler.cc7
-rw-r--r--content/browser/webui/web_ui_message_handler_unittest.cc2
-rw-r--r--content/common/font_list_android.cc4
-rw-r--r--content/common/font_list_ozone.cc4
-rw-r--r--content/common/gpu/client/gl_helper_unittests.cc4
-rw-r--r--content/public/test/browser_test_utils.cc10
-rw-r--r--content/renderer/browser_plugin/browser_plugin_bindings.cc2
-rw-r--r--content/renderer/media/peer_connection_tracker.cc2
-rw-r--r--content/renderer/v8_value_converter_impl.cc4
-rw-r--r--content/renderer/v8_value_converter_impl_unittest.cc4
-rw-r--r--content/renderer/web_ui_extension.cc4
-rw-r--r--content/shell/browser/shell_net_log.cc2
25 files changed, 71 insertions, 66 deletions
diff --git a/content/browser/accessibility/accessibility_tree_formatter_android.cc b/content/browser/accessibility/accessibility_tree_formatter_android.cc
index 8c625a3..8ec3ecf 100644
--- a/content/browser/accessibility/accessibility_tree_formatter_android.cc
+++ b/content/browser/accessibility/accessibility_tree_formatter_android.cc
@@ -68,7 +68,7 @@ void AccessibilityTreeFormatter::Initialize() {
}
void AccessibilityTreeFormatter::AddProperties(
- const BrowserAccessibility& node, DictionaryValue* dict) {
+ const BrowserAccessibility& node, base::DictionaryValue* dict) {
const BrowserAccessibilityAndroid* android_node =
static_cast<const BrowserAccessibilityAndroid*>(&node);
@@ -116,7 +116,7 @@ void AccessibilityTreeFormatter::AddProperties(
}
base::string16 AccessibilityTreeFormatter::ToString(
- const DictionaryValue& dict,
+ const base::DictionaryValue& dict,
const base::string16& indent) {
base::string16 line;
diff --git a/content/browser/accessibility/accessibility_tree_formatter_gtk.cc b/content/browser/accessibility/accessibility_tree_formatter_gtk.cc
index 0dc21ce..c930e0d 100644
--- a/content/browser/accessibility/accessibility_tree_formatter_gtk.cc
+++ b/content/browser/accessibility/accessibility_tree_formatter_gtk.cc
@@ -27,7 +27,7 @@ void AccessibilityTreeFormatter::AddProperties(const BrowserAccessibility& node,
dict->SetString("description", atk_object_get_description(atk_object));
AtkStateSet* state_set =
atk_object_ref_state_set(atk_object);
- ListValue* states = new base::ListValue;
+ base::ListValue* states = new base::ListValue;
for (int i = ATK_STATE_INVALID; i < ATK_STATE_LAST_DEFINED; i++) {
AtkStateType state_type = static_cast<AtkStateType>(i);
if (atk_state_set_contains_state(state_set, state_type))
diff --git a/content/browser/browser_plugin/browser_plugin_host_browsertest.cc b/content/browser/browser_plugin/browser_plugin_host_browsertest.cc
index d8307fb..5096aef 100644
--- a/content/browser/browser_plugin/browser_plugin_host_browsertest.cc
+++ b/content/browser/browser_plugin/browser_plugin_host_browsertest.cc
@@ -275,7 +275,7 @@ class BrowserPluginHostTest : public ContentBrowserTest {
bool IsAttributeNull(RenderViewHost* rvh, const std::string& attribute) {
scoped_ptr<base::Value> value = content::ExecuteScriptAndGetValue(rvh,
"document.getElementById('plugin').getAttribute('" + attribute + "');");
- return value->GetType() == Value::TYPE_NULL;
+ return value->GetType() == base::Value::TYPE_NULL;
}
// Removes all attributes in the comma-delimited string |attributes|.
diff --git a/content/browser/devtools/devtools_protocol.cc b/content/browser/devtools/devtools_protocol.cc
index e0e544e..f3c393d 100644
--- a/content/browser/devtools/devtools_protocol.cc
+++ b/content/browser/devtools/devtools_protocol.cc
@@ -275,11 +275,11 @@ base::DictionaryValue* DevToolsProtocol::ParseMessage(
std::string* error_response) {
int parse_error_code;
std::string error_message;
- scoped_ptr<Value> message(
+ scoped_ptr<base::Value> message(
base::JSONReader::ReadAndReturnError(
json, 0, &parse_error_code, &error_message));
- if (!message || !message->IsType(Value::TYPE_DICTIONARY)) {
+ if (!message || !message->IsType(base::Value::TYPE_DICTIONARY)) {
scoped_refptr<Response> response =
new Response(0, kErrorParseError, error_message);
if (error_response)
diff --git a/content/browser/devtools/devtools_tracing_handler.cc b/content/browser/devtools/devtools_tracing_handler.cc
index e9f6cf1..5b0d68c 100644
--- a/content/browser/devtools/devtools_tracing_handler.cc
+++ b/content/browser/devtools/devtools_tracing_handler.cc
@@ -69,10 +69,10 @@ void DevToolsTracingHandler::ReadRecordingResult(
if (trace_data->data().size()) {
scoped_ptr<base::Value> trace_value(base::JSONReader::Read(
trace_data->data()));
- DictionaryValue* dictionary = NULL;
+ base::DictionaryValue* dictionary = NULL;
bool ok = trace_value->GetAsDictionary(&dictionary);
DCHECK(ok);
- ListValue* list = NULL;
+ base::ListValue* list = NULL;
ok = dictionary->GetList("traceEvents", &list);
DCHECK(ok);
std::string buffer;
diff --git a/content/browser/devtools/renderer_overrides_handler.cc b/content/browser/devtools/renderer_overrides_handler.cc
index 4901f34..f8d0211 100644
--- a/content/browser/devtools/renderer_overrides_handler.cc
+++ b/content/browser/devtools/renderer_overrides_handler.cc
@@ -367,7 +367,7 @@ RendererOverridesHandler::PageGetNavigationHistory(
result->SetInteger(
devtools::Page::getNavigationHistory::kResponseCurrentIndex,
controller.GetCurrentEntryIndex());
- ListValue* entries = new ListValue();
+ base::ListValue* entries = new base::ListValue();
for (int i = 0; i != controller.GetEntryCount(); ++i) {
const NavigationEntry* entry = controller.GetEntryAtIndex(i);
base::DictionaryValue* entry_value = new base::DictionaryValue();
diff --git a/content/browser/devtools/renderer_overrides_handler_browsertest.cc b/content/browser/devtools/renderer_overrides_handler_browsertest.cc
index 24dd962..3759fc0 100644
--- a/content/browser/devtools/renderer_overrides_handler_browsertest.cc
+++ b/content/browser/devtools/renderer_overrides_handler_browsertest.cc
@@ -18,14 +18,15 @@ class RendererOverridesHandlerTest : public ContentBrowserTest {
protected:
scoped_refptr<DevToolsProtocol::Response> SendCommand(
const std::string& method,
- DictionaryValue* params) {
+ base::DictionaryValue* params) {
scoped_ptr<RendererOverridesHandler> handler(CreateHandler());
scoped_refptr<DevToolsProtocol::Command> command(
DevToolsProtocol::CreateCommand(1, method, params));
return handler->HandleCommand(command);
}
- void SendAsyncCommand(const std::string& method, DictionaryValue* params) {
+ void SendAsyncCommand(const std::string& method,
+ base::DictionaryValue* params) {
scoped_ptr<RendererOverridesHandler> handler(CreateHandler());
scoped_refptr<DevToolsProtocol::Command> command(
DevToolsProtocol::CreateCommand(1, method, params));
@@ -84,7 +85,7 @@ class RendererOverridesHandlerTest : public ContentBrowserTest {
};
IN_PROC_BROWSER_TEST_F(RendererOverridesHandlerTest, QueryUsageAndQuota) {
- DictionaryValue* params = new DictionaryValue();
+ base::DictionaryValue* params = new base::DictionaryValue();
params->SetString("securityOrigin", "http://example.com");
SendAsyncCommand("Page.queryUsageAndQuota", params);
diff --git a/content/browser/gpu/gpu_internals_ui.cc b/content/browser/gpu/gpu_internals_ui.cc
index 5ff4373..d58b6ff 100644
--- a/content/browser/gpu/gpu_internals_ui.cc
+++ b/content/browser/gpu/gpu_internals_ui.cc
@@ -334,7 +334,7 @@ void GpuMessageHandler::OnGpuInfoUpdate() {
scoped_ptr<base::DictionaryValue> gpu_info_val(GpuInfoAsDictionaryValue());
// Add in blacklisting features
- base::DictionaryValue* feature_status = new DictionaryValue;
+ base::DictionaryValue* feature_status = new base::DictionaryValue;
feature_status->Set("featureStatus", GetFeatureStatus());
feature_status->Set("problems", GetProblems());
feature_status->Set("workarounds", GetDriverBugWorkarounds());
diff --git a/content/browser/indexed_db/indexed_db_context_impl.cc b/content/browser/indexed_db/indexed_db_context_impl.cc
index 69dfa27..daa4174 100644
--- a/content/browser/indexed_db/indexed_db_context_impl.cc
+++ b/content/browser/indexed_db/indexed_db_context_impl.cc
@@ -162,19 +162,19 @@ static bool HostNameComparator(const GURL& i, const GURL& j) {
return i.host() < j.host();
}
-ListValue* IndexedDBContextImpl::GetAllOriginsDetails() {
+base::ListValue* IndexedDBContextImpl::GetAllOriginsDetails() {
DCHECK(TaskRunner()->RunsTasksOnCurrentThread());
std::vector<GURL> origins = GetAllOrigins();
std::sort(origins.begin(), origins.end(), HostNameComparator);
- scoped_ptr<ListValue> list(new ListValue());
+ scoped_ptr<base::ListValue> list(new base::ListValue());
for (std::vector<GURL>::const_iterator iter = origins.begin();
iter != origins.end();
++iter) {
const GURL& origin_url = *iter;
- scoped_ptr<DictionaryValue> info(new DictionaryValue());
+ scoped_ptr<base::DictionaryValue> info(new base::DictionaryValue());
info->SetString("url", origin_url.spec());
info->SetString("size", ui::FormatBytes(GetOriginDiskUsage(origin_url)));
info->SetDouble("last_modified",
@@ -190,14 +190,14 @@ ListValue* IndexedDBContextImpl::GetAllOriginsDetails() {
std::vector<IndexedDBDatabase*> databases =
factory_->GetOpenDatabasesForOrigin(origin_url);
// TODO(jsbell): Sort by name?
- scoped_ptr<ListValue> database_list(new ListValue());
+ scoped_ptr<base::ListValue> database_list(new base::ListValue());
for (std::vector<IndexedDBDatabase*>::iterator it = databases.begin();
it != databases.end();
++it) {
const IndexedDBDatabase* db = *it;
- scoped_ptr<DictionaryValue> db_info(new DictionaryValue());
+ scoped_ptr<base::DictionaryValue> db_info(new base::DictionaryValue());
db_info->SetString("name", db->name());
db_info->SetDouble("pending_opens", db->PendingOpenCount());
@@ -208,7 +208,7 @@ ListValue* IndexedDBContextImpl::GetAllOriginsDetails() {
db->ConnectionCount() - db->PendingUpgradeCount() -
db->RunningUpgradeCount());
- scoped_ptr<ListValue> transaction_list(new ListValue());
+ scoped_ptr<base::ListValue> transaction_list(new base::ListValue());
std::vector<const IndexedDBTransaction*> transactions =
db->transaction_coordinator().GetTransactions();
for (std::vector<const IndexedDBTransaction*>::iterator trans_it =
@@ -217,7 +217,8 @@ ListValue* IndexedDBContextImpl::GetAllOriginsDetails() {
++trans_it) {
const IndexedDBTransaction* transaction = *trans_it;
- scoped_ptr<DictionaryValue> transaction_info(new DictionaryValue());
+ scoped_ptr<base::DictionaryValue> transaction_info(
+ new base::DictionaryValue());
const char* kModes[] = { "readonly", "readwrite", "versionchange" };
transaction_info->SetString("mode", kModes[transaction->mode()]);
@@ -257,7 +258,7 @@ ListValue* IndexedDBContextImpl::GetAllOriginsDetails() {
transaction_info->SetDouble(
"tasks_completed", transaction->diagnostics().tasks_completed);
- scoped_ptr<ListValue> scope(new ListValue());
+ scoped_ptr<base::ListValue> scope(new base::ListValue());
for (std::set<int64>::const_iterator scope_it =
transaction->scope().begin();
scope_it != transaction->scope().end();
diff --git a/content/browser/indexed_db/indexed_db_internals_ui.cc b/content/browser/indexed_db/indexed_db_internals_ui.cc
index b5e888f..2b60c55 100644
--- a/content/browser/indexed_db/indexed_db_internals_ui.cc
+++ b/content/browser/indexed_db/indexed_db_internals_ui.cc
@@ -87,7 +87,7 @@ void IndexedDBInternalsUI::GetAllOriginsOnIndexedDBThread(
const base::FilePath& context_path) {
DCHECK(context->TaskRunner()->RunsTasksOnCurrentThread());
- scoped_ptr<ListValue> info_list(static_cast<IndexedDBContextImpl*>(
+ scoped_ptr<base::ListValue> info_list(static_cast<IndexedDBContextImpl*>(
context.get())->GetAllOriginsDetails());
BrowserThread::PostTask(BrowserThread::UI,
@@ -98,7 +98,7 @@ void IndexedDBInternalsUI::GetAllOriginsOnIndexedDBThread(
context_path));
}
-void IndexedDBInternalsUI::OnOriginsReady(scoped_ptr<ListValue> origins,
+void IndexedDBInternalsUI::OnOriginsReady(scoped_ptr<base::ListValue> origins,
const base::FilePath& path) {
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
web_ui()->CallJavascriptFunction(
diff --git a/content/browser/media/webrtc_browsertest.cc b/content/browser/media/webrtc_browsertest.cc
index 10504b3..5e3666c 100644
--- a/content/browser/media/webrtc_browsertest.cc
+++ b/content/browser/media/webrtc_browsertest.cc
@@ -134,8 +134,9 @@ class WebrtcBrowserTest: public ContentBrowserTest {
double timestamp_ns = 0.0;
double previous_timestamp_ns = 0.0;
std::string samples_interarrival_ns;
- for (ListValue::iterator it = values->begin(); it != values->end(); ++it) {
- const DictionaryValue* dict;
+ for (base::ListValue::iterator it = values->begin();
+ it != values->end(); ++it) {
+ const base::DictionaryValue* dict;
EXPECT_TRUE((*it)->GetAsDictionary(&dict));
if (dict->GetInteger("dur", &duration_ns))
@@ -187,8 +188,9 @@ class WebrtcBrowserTest: public ContentBrowserTest {
base::ListValue* values;
ASSERT_TRUE(value->GetAsList(&values));
- for (ListValue::iterator it = values->begin(); it != values->end(); ++it) {
- const DictionaryValue* dict;
+ for (base::ListValue::iterator it = values->begin();
+ it != values->end(); ++it) {
+ const base::DictionaryValue* dict;
std::string kind;
std::string id;
ASSERT_TRUE((*it)->GetAsDictionary(&dict));
diff --git a/content/browser/webui/generic_handler.cc b/content/browser/webui/generic_handler.cc
index 56b9e07..058382f 100644
--- a/content/browser/webui/generic_handler.cc
+++ b/content/browser/webui/generic_handler.cc
@@ -25,7 +25,7 @@ void GenericHandler::RegisterMessages() {
base::Bind(&GenericHandler::HandleNavigateToUrl, base::Unretained(this)));
}
-void GenericHandler::HandleNavigateToUrl(const ListValue* args) {
+void GenericHandler::HandleNavigateToUrl(const base::ListValue* args) {
std::string url_string;
std::string target_string;
double button;
diff --git a/content/browser/webui/web_ui_impl.cc b/content/browser/webui/web_ui_impl.cc
index 4774e4f..73c4ebd 100644
--- a/content/browser/webui/web_ui_impl.cc
+++ b/content/browser/webui/web_ui_impl.cc
@@ -29,7 +29,7 @@ const WebUI::TypeID WebUI::kNoWebUI = NULL;
// static
base::string16 WebUI::GetJavascriptCall(
const std::string& function_name,
- const std::vector<const Value*>& arg_list) {
+ const std::vector<const base::Value*>& arg_list) {
base::string16 parameters;
std::string json;
for (size_t i = 0; i < arg_list.size(); ++i) {
@@ -69,7 +69,7 @@ bool WebUIImpl::OnMessageReceived(const IPC::Message& message) {
void WebUIImpl::OnWebUISend(const GURL& source_url,
const std::string& message,
- const ListValue& args) {
+ const base::ListValue& args) {
WebContentsDelegate* delegate = web_contents_->GetDelegate();
bool data_urls_allowed = delegate && delegate->CanLoadDataURLsInWebUI();
if (!ChildProcessSecurityPolicyImpl::GetInstance()->
@@ -149,18 +149,18 @@ void WebUIImpl::CallJavascriptFunction(const std::string& function_name) {
}
void WebUIImpl::CallJavascriptFunction(const std::string& function_name,
- const Value& arg) {
+ const base::Value& arg) {
DCHECK(IsStringASCII(function_name));
- std::vector<const Value*> args;
+ std::vector<const base::Value*> args;
args.push_back(&arg);
ExecuteJavascript(GetJavascriptCall(function_name, args));
}
void WebUIImpl::CallJavascriptFunction(
const std::string& function_name,
- const Value& arg1, const Value& arg2) {
+ const base::Value& arg1, const base::Value& arg2) {
DCHECK(IsStringASCII(function_name));
- std::vector<const Value*> args;
+ std::vector<const base::Value*> args;
args.push_back(&arg1);
args.push_back(&arg2);
ExecuteJavascript(GetJavascriptCall(function_name, args));
@@ -168,9 +168,9 @@ void WebUIImpl::CallJavascriptFunction(
void WebUIImpl::CallJavascriptFunction(
const std::string& function_name,
- const Value& arg1, const Value& arg2, const Value& arg3) {
+ const base::Value& arg1, const base::Value& arg2, const base::Value& arg3) {
DCHECK(IsStringASCII(function_name));
- std::vector<const Value*> args;
+ std::vector<const base::Value*> args;
args.push_back(&arg1);
args.push_back(&arg2);
args.push_back(&arg3);
@@ -179,12 +179,12 @@ void WebUIImpl::CallJavascriptFunction(
void WebUIImpl::CallJavascriptFunction(
const std::string& function_name,
- const Value& arg1,
- const Value& arg2,
- const Value& arg3,
- const Value& arg4) {
+ const base::Value& arg1,
+ const base::Value& arg2,
+ const base::Value& arg3,
+ const base::Value& arg4) {
DCHECK(IsStringASCII(function_name));
- std::vector<const Value*> args;
+ std::vector<const base::Value*> args;
args.push_back(&arg1);
args.push_back(&arg2);
args.push_back(&arg3);
@@ -194,7 +194,7 @@ void WebUIImpl::CallJavascriptFunction(
void WebUIImpl::CallJavascriptFunction(
const std::string& function_name,
- const std::vector<const Value*>& args) {
+ const std::vector<const base::Value*>& args) {
DCHECK(IsStringASCII(function_name));
ExecuteJavascript(GetJavascriptCall(function_name, args));
}
diff --git a/content/browser/webui/web_ui_message_handler.cc b/content/browser/webui/web_ui_message_handler.cc
index 57b2c46..44f065d 100644
--- a/content/browser/webui/web_ui_message_handler.cc
+++ b/content/browser/webui/web_ui_message_handler.cc
@@ -11,7 +11,7 @@
namespace content {
-bool WebUIMessageHandler::ExtractIntegerValue(const ListValue* value,
+bool WebUIMessageHandler::ExtractIntegerValue(const base::ListValue* value,
int* out_int) {
std::string string_value;
if (value->GetString(0, &string_value))
@@ -25,7 +25,7 @@ bool WebUIMessageHandler::ExtractIntegerValue(const ListValue* value,
return false;
}
-bool WebUIMessageHandler::ExtractDoubleValue(const ListValue* value,
+bool WebUIMessageHandler::ExtractDoubleValue(const base::ListValue* value,
double* out_value) {
std::string string_value;
if (value->GetString(0, &string_value))
@@ -36,7 +36,8 @@ bool WebUIMessageHandler::ExtractDoubleValue(const ListValue* value,
return false;
}
-base::string16 WebUIMessageHandler::ExtractStringValue(const ListValue* value) {
+base::string16 WebUIMessageHandler::ExtractStringValue(
+ const base::ListValue* value) {
base::string16 string16_value;
if (value->GetString(0, &string16_value))
return string16_value;
diff --git a/content/browser/webui/web_ui_message_handler_unittest.cc b/content/browser/webui/web_ui_message_handler_unittest.cc
index 33cdb61..fe09a7b 100644
--- a/content/browser/webui/web_ui_message_handler_unittest.cc
+++ b/content/browser/webui/web_ui_message_handler_unittest.cc
@@ -12,7 +12,7 @@
namespace content {
TEST(WebUIMessageHandlerTest, ExtractIntegerValue) {
- ListValue list;
+ base::ListValue list;
int value, zero_value = 0, neg_value = -1234, pos_value = 1234;
base::string16 zero_string(UTF8ToUTF16("0"));
base::string16 neg_string(UTF8ToUTF16("-1234"));
diff --git a/content/common/font_list_android.cc b/content/common/font_list_android.cc
index b0a542d..71ff8b6 100644
--- a/content/common/font_list_android.cc
+++ b/content/common/font_list_android.cc
@@ -8,8 +8,8 @@
namespace content {
-scoped_ptr<ListValue> GetFontList_SlowBlocking() {
- return scoped_ptr<ListValue>(new ListValue);
+scoped_ptr<base::ListValue> GetFontList_SlowBlocking() {
+ return scoped_ptr<base::ListValue>(new base::ListValue);
}
} // namespace content
diff --git a/content/common/font_list_ozone.cc b/content/common/font_list_ozone.cc
index b0a542d..71ff8b6 100644
--- a/content/common/font_list_ozone.cc
+++ b/content/common/font_list_ozone.cc
@@ -8,8 +8,8 @@
namespace content {
-scoped_ptr<ListValue> GetFontList_SlowBlocking() {
- return scoped_ptr<ListValue>(new ListValue);
+scoped_ptr<base::ListValue> GetFontList_SlowBlocking() {
+ return scoped_ptr<base::ListValue>(new base::ListValue);
}
} // namespace content
diff --git a/content/common/gpu/client/gl_helper_unittests.cc b/content/common/gpu/client/gl_helper_unittests.cc
index 548faec..2ec61ac 100644
--- a/content/common/gpu/client/gl_helper_unittests.cc
+++ b/content/common/gpu/client/gl_helper_unittests.cc
@@ -113,8 +113,8 @@ class GLHelperTest : public testing::Test {
run_loop.Run();
json_data.append("]");
- scoped_ptr<Value> trace_data(base::JSONReader::Read(json_data));
- ListValue* list;
+ scoped_ptr<base::Value> trace_data(base::JSONReader::Read(json_data));
+ base::ListValue* list;
CHECK(trace_data->GetAsList(&list));
for (size_t i = 0; i < list->GetSize(); i++) {
base::Value *item = NULL;
diff --git a/content/public/test/browser_test_utils.cc b/content/public/test/browser_test_utils.cc
index 5a87327..29252b3 100644
--- a/content/public/test/browser_test_utils.cc
+++ b/content/public/test/browser_test_utils.cc
@@ -82,7 +82,7 @@ class DOMOperationObserver : public NotificationObserver,
bool ExecuteScriptHelper(RenderViewHost* render_view_host,
const std::string& frame_xpath,
const std::string& original_script,
- scoped_ptr<Value>* result) WARN_UNUSED_RESULT;
+ scoped_ptr<base::Value>* result) WARN_UNUSED_RESULT;
// Executes the passed |original_script| in the frame pointed to by
// |frame_xpath|. If |result| is not NULL, stores the value that the evaluation
@@ -90,7 +90,7 @@ bool ExecuteScriptHelper(RenderViewHost* render_view_host,
bool ExecuteScriptHelper(RenderViewHost* render_view_host,
const std::string& frame_xpath,
const std::string& original_script,
- scoped_ptr<Value>* result) {
+ scoped_ptr<base::Value>* result) {
// TODO(jcampan): we should make the domAutomationController not require an
// automation id.
std::string script =
@@ -415,7 +415,7 @@ bool ExecuteScriptInFrameAndExtractInt(
const std::string& script,
int* result) {
DCHECK(result);
- scoped_ptr<Value> value;
+ scoped_ptr<base::Value> value;
if (!ExecuteScriptHelper(adapter.render_view_host(), frame_xpath, script,
&value) || !value.get())
return false;
@@ -429,7 +429,7 @@ bool ExecuteScriptInFrameAndExtractBool(
const std::string& script,
bool* result) {
DCHECK(result);
- scoped_ptr<Value> value;
+ scoped_ptr<base::Value> value;
if (!ExecuteScriptHelper(adapter.render_view_host(), frame_xpath, script,
&value) || !value.get())
return false;
@@ -443,7 +443,7 @@ bool ExecuteScriptInFrameAndExtractString(
const std::string& script,
std::string* result) {
DCHECK(result);
- scoped_ptr<Value> value;
+ scoped_ptr<base::Value> value;
if (!ExecuteScriptHelper(adapter.render_view_host(), frame_xpath, script,
&value) || !value.get())
return false;
diff --git a/content/renderer/browser_plugin/browser_plugin_bindings.cc b/content/renderer/browser_plugin/browser_plugin_bindings.cc
index 2e0ab77..509ace2 100644
--- a/content/renderer/browser_plugin/browser_plugin_bindings.cc
+++ b/content/renderer/browser_plugin/browser_plugin_bindings.cc
@@ -249,7 +249,7 @@ class BrowserPluginBindingAttach: public BrowserPluginMethodBinding {
if (!value)
return false;
- if (!value->IsType(Value::TYPE_DICTIONARY))
+ if (!value->IsType(base::Value::TYPE_DICTIONARY))
return false;
scoped_ptr<base::DictionaryValue> extra_params(
diff --git a/content/renderer/media/peer_connection_tracker.cc b/content/renderer/media/peer_connection_tracker.cc
index b594ff8..b55191c 100644
--- a/content/renderer/media/peer_connection_tracker.cc
+++ b/content/renderer/media/peer_connection_tracker.cc
@@ -160,7 +160,7 @@ static base::DictionaryValue* GetDictValueStats(
if (report.values.empty())
return NULL;
- DictionaryValue* dict = new base::DictionaryValue();
+ base::DictionaryValue* dict = new base::DictionaryValue();
dict->SetDouble("timestamp", report.timestamp);
base::ListValue* values = new base::ListValue();
diff --git a/content/renderer/v8_value_converter_impl.cc b/content/renderer/v8_value_converter_impl.cc
index 6028d5d..d5f3883 100644
--- a/content/renderer/v8_value_converter_impl.cc
+++ b/content/renderer/v8_value_converter_impl.cc
@@ -321,7 +321,7 @@ base::Value* V8ValueConverterImpl::FromV8Array(
scope.reset(new v8::Context::Scope(val->CreationContext()));
if (strategy_) {
- Value* out = NULL;
+ base::Value* out = NULL;
if (strategy_->FromV8Array(val, &out, isolate))
return out;
}
@@ -391,7 +391,7 @@ base::Value* V8ValueConverterImpl::FromV8Object(
scope.reset(new v8::Context::Scope(val->CreationContext()));
if (strategy_) {
- Value* out = NULL;
+ base::Value* out = NULL;
if (strategy_->FromV8Object(val, &out, isolate))
return out;
}
diff --git a/content/renderer/v8_value_converter_impl_unittest.cc b/content/renderer/v8_value_converter_impl_unittest.cc
index 392dd0b..9853e51 100644
--- a/content/renderer/v8_value_converter_impl_unittest.cc
+++ b/content/renderer/v8_value_converter_impl_unittest.cc
@@ -578,7 +578,7 @@ TEST_F(V8ValueConverterImplTest, UndefinedValueBehavior) {
base::test::ParseJson("{ \"bar\": null }").get(), actual_object.get()));
// Everything is null because JSON stringification preserves array length.
- scoped_ptr<Value> actual_array(converter.FromV8Value(array, context));
+ scoped_ptr<base::Value> actual_array(converter.FromV8Value(array, context));
EXPECT_TRUE(base::Value::Equals(
base::test::ParseJson("[ null, null, null ]").get(), actual_array.get()));
}
@@ -691,7 +691,7 @@ TEST_F(V8ValueConverterImplTest, MaxRecursionDepth) {
// The leaf node shouldn't have any properties.
base::DictionaryValue empty;
- EXPECT_TRUE(Value::Equals(&empty, current)) << *current;
+ EXPECT_TRUE(base::Value::Equals(&empty, current)) << *current;
}
} // namespace content
diff --git a/content/renderer/web_ui_extension.cc b/content/renderer/web_ui_extension.cc
index f887e9d..b49241e 100644
--- a/content/renderer/web_ui_extension.cc
+++ b/content/renderer/web_ui_extension.cc
@@ -120,9 +120,9 @@ void WebUIExtensionWrapper::Send(
// If they've provided an optional message parameter, convert that into a
// Value to send to the browser process.
- scoped_ptr<ListValue> content;
+ scoped_ptr<base::ListValue> content;
if (args[1]->IsUndefined()) {
- content.reset(new ListValue());
+ content.reset(new base::ListValue());
} else {
if (!args[1]->IsObject())
return;
diff --git a/content/shell/browser/shell_net_log.cc b/content/shell/browser/shell_net_log.cc
index 97276d6..42a9a4b 100644
--- a/content/shell/browser/shell_net_log.cc
+++ b/content/shell/browser/shell_net_log.cc
@@ -20,7 +20,7 @@ base::DictionaryValue* GetShellConstants() {
base::DictionaryValue* constants_dict = net::NetLogLogger::GetConstants();
// Add a dictionary with client information
- base::DictionaryValue* dict = new DictionaryValue();
+ base::DictionaryValue* dict = new base::DictionaryValue();
dict->SetString("name", "content_shell");
dict->SetString("command_line",
generated by cgit v1.1 at 2025-02-12 20:09:05 +0000