| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "base/command_line.h" | 5 #include "base/command_line.h" |
| 6 #include "base/memory/scoped_ptr.h" | 6 #include "base/memory/scoped_ptr.h" |
| 7 #include "base/synchronization/waitable_event.h" | 7 #include "base/synchronization/waitable_event.h" |
| 8 #include "chrome/browser/extensions/api/dns/dns_api.h" | 8 #include "chrome/browser/extensions/api/dns/dns_api.h" |
| 9 #include "chrome/browser/extensions/extension_apitest.h" | 9 #include "chrome/browser/extensions/extension_apitest.h" |
| 10 #include "chrome/browser/extensions/extension_function_test_utils.h" | 10 #include "chrome/browser/extensions/extension_function_test_utils.h" |
| (...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 112 | 112 |
| 113 resolve_function->set_extension(empty_extension.get()); | 113 resolve_function->set_extension(empty_extension.get()); |
| 114 resolve_function->set_has_callback(true); | 114 resolve_function->set_has_callback(true); |
| 115 | 115 |
| 116 scoped_ptr<base::Value> result(RunFunctionAndReturnResult( | 116 scoped_ptr<base::Value> result(RunFunctionAndReturnResult( |
| 117 resolve_function, "[\"127.0.0.1\"]", browser())); | 117 resolve_function, "[\"127.0.0.1\"]", browser())); |
| 118 ASSERT_EQ(base::Value::TYPE_DICTIONARY, result->GetType()); | 118 ASSERT_EQ(base::Value::TYPE_DICTIONARY, result->GetType()); |
| 119 DictionaryValue *value = static_cast<DictionaryValue*>(result.get()); | 119 DictionaryValue *value = static_cast<DictionaryValue*>(result.get()); |
| 120 | 120 |
| 121 int resultCode; | 121 int resultCode; |
| 122 EXPECT_TRUE(value->GetInteger(extensions::kResultCodeKey, &resultCode)); | 122 EXPECT_TRUE(value->GetInteger("resultCode", &resultCode)); |
| 123 EXPECT_EQ(net::OK, resultCode); | 123 EXPECT_EQ(net::OK, resultCode); |
| 124 | 124 |
| 125 std::string address; | 125 std::string address; |
| 126 EXPECT_TRUE(value->GetString(extensions::kAddressKey, &address)); | 126 EXPECT_TRUE(value->GetString("address", &address)); |
| 127 EXPECT_EQ("127.0.0.1", address); | 127 EXPECT_EQ("127.0.0.1", address); |
| 128 } | 128 } |
| 129 | 129 |
| 130 IN_PROC_BROWSER_TEST_F(DNSApiTest, DNSResolveHostname) { | 130 IN_PROC_BROWSER_TEST_F(DNSApiTest, DNSResolveHostname) { |
| 131 scoped_refptr<extensions::DNSResolveFunction> resolve_function( | 131 scoped_refptr<extensions::DNSResolveFunction> resolve_function( |
| 132 new extensions::DNSResolveFunction()); | 132 new extensions::DNSResolveFunction()); |
| 133 scoped_refptr<Extension> empty_extension(CreateEmptyExtension()); | 133 scoped_refptr<Extension> empty_extension(CreateEmptyExtension()); |
| 134 | 134 |
| 135 resolve_function->set_extension(empty_extension.get()); | 135 resolve_function->set_extension(empty_extension.get()); |
| 136 resolve_function->set_has_callback(true); | 136 resolve_function->set_has_callback(true); |
| 137 | 137 |
| 138 std::string function_arguments("[\""); | 138 std::string function_arguments("[\""); |
| 139 function_arguments += DNSApiTest::kHostname; | 139 function_arguments += DNSApiTest::kHostname; |
| 140 function_arguments += "\"]"; | 140 function_arguments += "\"]"; |
| 141 scoped_ptr<base::Value> result( | 141 scoped_ptr<base::Value> result( |
| 142 RunFunctionAndReturnResult(resolve_function.get(), | 142 RunFunctionAndReturnResult(resolve_function.get(), |
| 143 function_arguments, browser())); | 143 function_arguments, browser())); |
| 144 ASSERT_EQ(base::Value::TYPE_DICTIONARY, result->GetType()); | 144 ASSERT_EQ(base::Value::TYPE_DICTIONARY, result->GetType()); |
| 145 DictionaryValue *value = static_cast<DictionaryValue*>(result.get()); | 145 DictionaryValue *value = static_cast<DictionaryValue*>(result.get()); |
| 146 | 146 |
| 147 int resultCode; | 147 int resultCode; |
| 148 EXPECT_TRUE(value->GetInteger(extensions::kResultCodeKey, &resultCode)); | 148 EXPECT_TRUE(value->GetInteger("resultCode", &resultCode)); |
| 149 EXPECT_EQ(net::OK, resultCode); | 149 EXPECT_EQ(net::OK, resultCode); |
| 150 | 150 |
| 151 std::string address; | 151 std::string address; |
| 152 EXPECT_TRUE(value->GetString(extensions::kAddressKey, &address)); | 152 EXPECT_TRUE(value->GetString("address", &address)); |
| 153 EXPECT_EQ(DNSApiTest::kAddress, address); | 153 EXPECT_EQ(DNSApiTest::kAddress, address); |
| 154 } | 154 } |
| 155 | 155 |
| 156 IN_PROC_BROWSER_TEST_F(DNSApiTest, DNSExtension) { | 156 IN_PROC_BROWSER_TEST_F(DNSApiTest, DNSExtension) { |
| 157 ASSERT_TRUE(RunExtensionTest("dns/api")) << message_; | 157 ASSERT_TRUE(RunExtensionTest("dns/api")) << message_; |
| 158 } | 158 } |
| OLD | NEW |