| Index: net/test/test_server.h
|
| ===================================================================
|
| --- net/test/test_server.h (revision 92173)
|
| +++ net/test/test_server.h (working copy)
|
| @@ -24,9 +24,12 @@
|
| #endif
|
|
|
| class CommandLine;
|
| -class DictionaryValue;
|
| class GURL;
|
|
|
| +namespace base {
|
| +class DictionaryValue;
|
| +}
|
| +
|
| namespace net {
|
|
|
| class AddressList;
|
| @@ -117,7 +120,7 @@
|
|
|
| const FilePath& document_root() const { return document_root_; }
|
| const HostPortPair& host_port_pair() const;
|
| - const DictionaryValue& server_data() const;
|
| + const base::DictionaryValue& server_data() const;
|
| std::string GetScheme() const;
|
| bool GetAddressList(AddressList* address_list) const WARN_UNUSED_RESULT;
|
|
|
| @@ -171,7 +174,7 @@
|
| HostPortPair host_port_pair_;
|
|
|
| // Holds the data sent from the server (e.g., port number).
|
| - scoped_ptr<DictionaryValue> server_data_;
|
| + scoped_ptr<base::DictionaryValue> server_data_;
|
|
|
| // Handle of the Python process running the test server.
|
| base::ProcessHandle process_handle_;
|
|
|