summaryrefslogtreecommitdiffstats
path: root/chrome/test/webdriver/dispatch.h
diff options
context:
space:
mode:
authordmazzoni@chromium.org <dmazzoni@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-07-12 19:15:03 +0000
committerdmazzoni@chromium.org <dmazzoni@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-07-12 19:15:03 +0000
commitf3a1c64a4d81c412273ed567536f23c2c14813a2 (patch)
treef0ced21805b18546e879413e4f808dd4f683c534 /chrome/test/webdriver/dispatch.h
parent2338319a9acbaecba44243740b3f01b5c408a78a (diff)
downloadchromium_src-f3a1c64a4d81c412273ed567536f23c2c14813a2.zip
chromium_src-f3a1c64a4d81c412273ed567536f23c2c14813a2.tar.gz
chromium_src-f3a1c64a4d81c412273ed567536f23c2c14813a2.tar.bz2
Move base/values.h into the base namespace. This includes a cros DEPS roll
with a minor change to that code since libcros also uses base/values.h. BUG=88666 TEST=none Review URL: http://codereview.chromium.org/7259019 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@92208 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/webdriver/dispatch.h')
-rw-r--r--chrome/test/webdriver/dispatch.h7
1 files changed, 3 insertions, 4 deletions
diff --git a/chrome/test/webdriver/dispatch.h b/chrome/test/webdriver/dispatch.h
index b3d2fd0..8454fbb 100644
--- a/chrome/test/webdriver/dispatch.h
+++ b/chrome/test/webdriver/dispatch.h
@@ -13,9 +13,8 @@
#include "chrome/test/webdriver/commands/response.h"
#include "third_party/mongoose/mongoose.h"
-class DictionaryValue;
-
namespace base {
+class DictionaryValue;
class WaitableEvent;
}
@@ -43,7 +42,7 @@ void SendResponse(struct mg_connection* const connection,
bool ParseRequestInfo(const struct mg_request_info* const request_info,
std::string* method,
std::vector<std::string>* path_segments,
- DictionaryValue** parameters,
+ base::DictionaryValue** parameters,
Response* const response);
// Allows the bulk of the implementation of |Dispatch| to be moved out of this
@@ -62,7 +61,7 @@ void Dispatch(struct mg_connection* connection,
void* user_data) {
std::string method;
std::vector<std::string> path_segments;
- DictionaryValue* parameters = NULL;
+ base::DictionaryValue* parameters = NULL;
Response response;
if (internal::ParseRequestInfo(request_info,
&method,