Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1484)

Unified Diff: chrome/browser/ui/webui/web_ui_browsertest.h

Issue 7259019: Move base/values.h into the base namespace. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 9 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/ui/webui/textfields_ui.h ('k') | chrome/browser/web_resource/gpu_blacklist_updater.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/webui/web_ui_browsertest.h
===================================================================
--- chrome/browser/ui/webui/web_ui_browsertest.h (revision 92173)
+++ chrome/browser/ui/webui/web_ui_browsertest.h (working copy)
@@ -13,9 +13,12 @@
#include "chrome/test/in_process_browser_test.h"
#include "chrome/test/test_navigation_observer.h"
-class Value;
class WebUIMessageHandler;
+namespace base {
+class Value;
+}
+
// This macro simplifies the declaration of simple javascript unit tests.
// Use:
// WEB_UI_UNITTEST_F(MyWebUIPageTest, myJavascriptUnittest);
@@ -34,7 +37,7 @@
: public InProcessBrowserTest,
public TestNavigationObserver::JsInjectionReadyObserver {
public:
- typedef std::vector<const Value*> ConstValueVector;
+ typedef std::vector<const base::Value*> ConstValueVector;
virtual ~WebUIBrowserTest();
// Add a custom helper JS library for your test.
@@ -46,10 +49,10 @@
// Note that calls to functions in test_api.js are not supported.
bool RunJavascriptFunction(const std::string& function_name);
bool RunJavascriptFunction(const std::string& function_name,
- const Value& arg);
+ const base::Value& arg);
bool RunJavascriptFunction(const std::string& function_name,
- const Value& arg1,
- const Value& arg2);
+ const base::Value& arg1,
+ const base::Value& arg2);
bool RunJavascriptFunction(const std::string& function_name,
const ConstValueVector& function_arguments);
@@ -60,10 +63,10 @@
// Runs a test that may include calls to functions in test_api.js.
bool RunJavascriptTest(const std::string& test_name);
bool RunJavascriptTest(const std::string& test_name,
- const Value& arg);
+ const base::Value& arg);
bool RunJavascriptTest(const std::string& test_name,
- const Value& arg1,
- const Value& arg2);
+ const base::Value& arg1,
+ const base::Value& arg2);
bool RunJavascriptTest(const std::string& test_name,
const ConstValueVector& test_arguments);
« no previous file with comments | « chrome/browser/ui/webui/textfields_ui.h ('k') | chrome/browser/web_resource/gpu_blacklist_updater.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698