diff options
author | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-23 21:43:38 +0000 |
---|---|---|
committer | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-23 21:43:38 +0000 |
commit | e53a7f29591f8b3f03f97541b3b30422780b39a6 (patch) | |
tree | 5f1bb507eafc55db061d12ed78072d7a69d2f054 /chrome/test/automation | |
parent | 56cbcb3a456ffc4a2fe2f69c0d3cbd993fc0e13a (diff) | |
download | chromium_src-e53a7f29591f8b3f03f97541b3b30422780b39a6.zip chromium_src-e53a7f29591f8b3f03f97541b3b30422780b39a6.tar.gz chromium_src-e53a7f29591f8b3f03f97541b3b30422780b39a6.tar.bz2 |
Update some uses of Value in chrome/ to use the base:: namespace.
BUG=88666
TEST=no change
TBR=ben@chromium.org
Review URL: https://codereview.chromium.org/119583003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@242408 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/automation')
-rw-r--r-- | chrome/test/automation/browser_proxy.cc | 21 | ||||
-rw-r--r-- | chrome/test/automation/tab_proxy.cc | 28 |
2 files changed, 25 insertions, 24 deletions
diff --git a/chrome/test/automation/browser_proxy.cc b/chrome/test/automation/browser_proxy.cc index bf1ad34..7346e77 100644 --- a/chrome/test/automation/browser_proxy.cc +++ b/chrome/test/automation/browser_proxy.cc @@ -292,30 +292,31 @@ bool BrowserProxy::GetInitialLoadTimes(base::TimeDelta timeout, return false; } std::string error; - scoped_ptr<Value> values(base::JSONReader::ReadAndReturnError( + scoped_ptr<base::Value> values(base::JSONReader::ReadAndReturnError( json_response, base::JSON_ALLOW_TRAILING_COMMAS, NULL, &error)); - if (!error.empty() || values->GetType() != Value::TYPE_DICTIONARY) + if (!error.empty() || values->GetType() != base::Value::TYPE_DICTIONARY) return false; - DictionaryValue* values_dict = static_cast<DictionaryValue*>(values.get()); + base::DictionaryValue* values_dict = + static_cast<base::DictionaryValue*>(values.get()); - Value* tabs_value; + base::Value* tabs_value; if (!values_dict->Get("tabs", &tabs_value) || - tabs_value->GetType() != Value::TYPE_LIST) + tabs_value->GetType() != base::Value::TYPE_LIST) return false; - ListValue* tabs_list = static_cast<ListValue*>(tabs_value); + base::ListValue* tabs_list = static_cast<base::ListValue*>(tabs_value); for (size_t i = 0; i < tabs_list->GetSize(); i++) { float stop_ms = 0; float start_ms = 0; - Value* tab_value; - DictionaryValue* tab_dict; + base::Value* tab_value; + base::DictionaryValue* tab_dict; if (!tabs_list->Get(i, &tab_value) || - tab_value->GetType() != Value::TYPE_DICTIONARY) + tab_value->GetType() != base::Value::TYPE_DICTIONARY) return false; - tab_dict = static_cast<DictionaryValue*>(tab_value); + tab_dict = static_cast<base::DictionaryValue*>(tab_value); double temp; if (!tab_dict->GetDouble("load_start_ms", &temp)) diff --git a/chrome/test/automation/tab_proxy.cc b/chrome/test/automation/tab_proxy.cc index 50d4223..0360360 100644 --- a/chrome/test/automation/tab_proxy.cc +++ b/chrome/test/automation/tab_proxy.cc @@ -169,13 +169,13 @@ bool TabProxy::NavigateToURLAsync(const GURL& url) { bool TabProxy::ExecuteAndExtractString(const std::wstring& frame_xpath, const std::wstring& jscript, std::wstring* string_value) { - scoped_ptr<Value> root(ExecuteAndExtractValue(frame_xpath, jscript)); + scoped_ptr<base::Value> root(ExecuteAndExtractValue(frame_xpath, jscript)); if (root == NULL) return false; - DCHECK(root->IsType(Value::TYPE_LIST)); - Value* value = NULL; - bool succeeded = static_cast<ListValue*>(root.get())->Get(0, &value); + DCHECK(root->IsType(base::Value::TYPE_LIST)); + base::Value* value = NULL; + bool succeeded = static_cast<base::ListValue*>(root.get())->Get(0, &value); if (succeeded) { base::string16 read_value; succeeded = value->GetAsString(&read_value); @@ -190,14 +190,14 @@ bool TabProxy::ExecuteAndExtractString(const std::wstring& frame_xpath, bool TabProxy::ExecuteAndExtractBool(const std::wstring& frame_xpath, const std::wstring& jscript, bool* bool_value) { - scoped_ptr<Value> root(ExecuteAndExtractValue(frame_xpath, jscript)); + scoped_ptr<base::Value> root(ExecuteAndExtractValue(frame_xpath, jscript)); if (root == NULL) return false; bool read_value = false; - DCHECK(root->IsType(Value::TYPE_LIST)); - Value* value = NULL; - bool succeeded = static_cast<ListValue*>(root.get())->Get(0, &value); + DCHECK(root->IsType(base::Value::TYPE_LIST)); + base::Value* value = NULL; + bool succeeded = static_cast<base::ListValue*>(root.get())->Get(0, &value); if (succeeded) { succeeded = value->GetAsBoolean(&read_value); if (succeeded) { @@ -210,14 +210,14 @@ bool TabProxy::ExecuteAndExtractBool(const std::wstring& frame_xpath, bool TabProxy::ExecuteAndExtractInt(const std::wstring& frame_xpath, const std::wstring& jscript, int* int_value) { - scoped_ptr<Value> root(ExecuteAndExtractValue(frame_xpath, jscript)); + scoped_ptr<base::Value> root(ExecuteAndExtractValue(frame_xpath, jscript)); if (root == NULL) return false; int read_value = 0; - DCHECK(root->IsType(Value::TYPE_LIST)); - Value* value = NULL; - bool succeeded = static_cast<ListValue*>(root.get())->Get(0, &value); + DCHECK(root->IsType(base::Value::TYPE_LIST)); + base::Value* value = NULL; + bool succeeded = static_cast<base::ListValue*>(root.get())->Get(0, &value); if (succeeded) { succeeded = value->GetAsInteger(&read_value); if (succeeded) { @@ -227,8 +227,8 @@ bool TabProxy::ExecuteAndExtractInt(const std::wstring& frame_xpath, return succeeded; } -Value* TabProxy::ExecuteAndExtractValue(const std::wstring& frame_xpath, - const std::wstring& jscript) { +base::Value* TabProxy::ExecuteAndExtractValue(const std::wstring& frame_xpath, + const std::wstring& jscript) { if (!is_valid()) return NULL; |