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

Unified Diff: chrome/browser/chromeos/login/test/oobe_base_test.h

Issue 1141163002: Browser tests for the new way of handling device ID in Chrome OS. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@device_id
Patch Set: Fixed flakiness. Created 5 years, 7 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
Index: chrome/browser/chromeos/login/test/oobe_base_test.h
diff --git a/chrome/browser/chromeos/login/test/oobe_base_test.h b/chrome/browser/chromeos/login/test/oobe_base_test.h
index f93ef88a55450131293a6daa6fcb92ddb9eac802..d849f8c644cc879b58c25dadfbafaee5255190e2 100644
--- a/chrome/browser/chromeos/login/test/oobe_base_test.h
+++ b/chrome/browser/chromeos/login/test/oobe_base_test.h
@@ -10,6 +10,7 @@
#include "base/callback.h"
#include "base/command_line.h"
#include "chrome/browser/chromeos/login/test/https_forwarder.h"
+#include "chrome/browser/chromeos/login/test/js_checker.h"
#include "chrome/browser/chromeos/login/ui/login_display_host_impl.h"
#include "chrome/browser/chromeos/login/ui/webui_login_display.h"
#include "chrome/browser/extensions/extension_apitest.h"
@@ -73,6 +74,8 @@ class OobeBaseTest : public ExtensionApiTest {
// Checks JavaScript |expression| in login screen.
void JsExpect(const std::string& expression);
+ test::JSChecker& JS() { return js_checker_; }
achuithb 2015/05/26 06:28:21 I think returning a pointer is preferred to a non-
dzhioev (left Google) 2015/05/26 21:18:15 Why? I don't see any advantage in that.
achuithb 2015/05/26 21:26:44 This is for arguments, but I think the logic also
+
bool use_webview() { return use_webview_; }
void set_use_webview(bool use_webview) { use_webview_ = use_webview; }
@@ -108,6 +111,7 @@ class OobeBaseTest : public ExtensionApiTest {
std::string gaia_frame_parent_;
bool use_webview_;
bool initialize_fake_merge_session_;
+ test::JSChecker js_checker_;
DISALLOW_COPY_AND_ASSIGN(OobeBaseTest);
};

Powered by Google App Engine
This is Rietveld 408576698