Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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 #ifndef CHROME_TEST_REMOTING_REMOTE_DESKTOP_BROWSERTEST_H_ | 5 #ifndef CHROME_TEST_REMOTING_REMOTE_DESKTOP_BROWSERTEST_H_ |
| 6 #define CHROME_TEST_REMOTING_REMOTE_DESKTOP_BROWSERTEST_H_ | 6 #define CHROME_TEST_REMOTING_REMOTE_DESKTOP_BROWSERTEST_H_ |
| 7 | 7 |
| 8 #include "base/debug/stack_trace.h" | 8 #include "base/debug/stack_trace.h" |
| 9 #include "chrome/browser/apps/app_browsertest_util.h" | 9 #include "chrome/browser/apps/app_browsertest_util.h" |
| 10 #include "chrome/browser/chrome_notification_types.h" | 10 #include "chrome/browser/chrome_notification_types.h" |
| (...skipping 333 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 344 | 344 |
| 345 // Callback used by Approve to check whether the chromoting app has | 345 // Callback used by Approve to check whether the chromoting app has |
| 346 // successfully authenticated with the Google services. | 346 // successfully authenticated with the Google services. |
| 347 static bool IsAuthenticatedInWindow(content::WebContents* web_contents); | 347 static bool IsAuthenticatedInWindow(content::WebContents* web_contents); |
| 348 | 348 |
| 349 // Callback used to check whether a host action is completed. | 349 // Callback used to check whether a host action is completed. |
| 350 // Used by browser tests while conditionally waiting for host actions. | 350 // Used by browser tests while conditionally waiting for host actions. |
| 351 static bool IsHostActionComplete( | 351 static bool IsHostActionComplete( |
| 352 content::WebContents* client_web_content, std::string host_action_var); | 352 content::WebContents* client_web_content, std::string host_action_var); |
| 353 | 353 |
| 354 // Test if the remoting app mode is matching the given mode | |
|
Jamie
2014/12/19 23:17:26
s/is matching/matches/
or
s/matching/equal to/
yihongg1
2015/01/22 21:55:25
Done.
| |
| 355 bool IsAppModeMatching(const std::string& mode); | |
|
Jamie
2014/12/19 23:17:26
Similar to the above, IsAppModeEqualTo would be a
yihongg1
2015/01/22 21:55:25
Done.
| |
| 356 | |
| 357 // Disable remote connection while the remote connection is enabled | |
| 358 void DisableRemoteConnection(); | |
| 359 | |
| 354 private: | 360 private: |
| 355 // Fields | 361 // Fields |
| 356 | 362 |
| 357 // This test needs to make live DNS requests for access to | 363 // This test needs to make live DNS requests for access to |
| 358 // GAIA and sync server URLs under google.com. We use a scoped version | 364 // GAIA and sync server URLs under google.com. We use a scoped version |
| 359 // to override the default resolver while the test is active. | 365 // to override the default resolver while the test is active. |
| 360 scoped_ptr<net::ScopedDefaultHostResolverProc> mock_host_resolver_override_; | 366 scoped_ptr<net::ScopedDefaultHostResolverProc> mock_host_resolver_override_; |
| 361 | 367 |
| 362 // Stores all the WebContents instance in a stack so that we can easily | 368 // Stores all the WebContents instance in a stack so that we can easily |
| 363 // return to the previous instance. | 369 // return to the previous instance. |
| (...skipping 23 matching lines...) Expand all Loading... | |
| 387 std::string password_; | 393 std::string password_; |
| 388 std::string me2me_pin_; | 394 std::string me2me_pin_; |
| 389 std::string remote_host_name_; | 395 std::string remote_host_name_; |
| 390 std::string extension_name_; | 396 std::string extension_name_; |
| 391 std::string http_server_; | 397 std::string http_server_; |
| 392 }; | 398 }; |
| 393 | 399 |
| 394 } // namespace remoting | 400 } // namespace remoting |
| 395 | 401 |
| 396 #endif // CHROME_TEST_REMOTING_REMOTE_DESKTOP_BROWSERTEST_H_ | 402 #endif // CHROME_TEST_REMOTING_REMOTE_DESKTOP_BROWSERTEST_H_ |
| OLD | NEW |