| 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_BROWSER_INSTANT_INSTANT_TEST_UTILS_H_ | 5 #ifndef CHROME_BROWSER_INSTANT_INSTANT_TEST_UTILS_H_ |
| 6 #define CHROME_BROWSER_INSTANT_INSTANT_TEST_UTILS_H_ | 6 #define CHROME_BROWSER_INSTANT_INSTANT_TEST_UTILS_H_ |
| 7 | 7 |
| 8 #include <string> | 8 #include <string> |
| 9 | 9 |
| 10 #include "base/run_loop.h" | 10 #include "base/run_loop.h" |
| (...skipping 25 matching lines...) Expand all Loading... |
| 36 | 36 |
| 37 DISALLOW_COPY_AND_ASSIGN(InstantTestModelObserver); | 37 DISALLOW_COPY_AND_ASSIGN(InstantTestModelObserver); |
| 38 }; | 38 }; |
| 39 | 39 |
| 40 class InstantTestBase : public InProcessBrowserTest { | 40 class InstantTestBase : public InProcessBrowserTest { |
| 41 public: | 41 public: |
| 42 InstantTestBase() | 42 InstantTestBase() |
| 43 : https_test_server_( | 43 : https_test_server_( |
| 44 net::TestServer::TYPE_HTTPS, | 44 net::TestServer::TYPE_HTTPS, |
| 45 net::BaseTestServer::SSLOptions(), | 45 net::BaseTestServer::SSLOptions(), |
| 46 base::FilePath(FILE_PATH_LITERAL("chrome/test/data"))) { | 46 net::TestServer::GetTestDataPath()) { |
| 47 } | 47 } |
| 48 | 48 |
| 49 protected: | 49 protected: |
| 50 void SetupInstant(); | 50 void SetupInstant(); |
| 51 void SetupInstantUsingTemplateURL(); | 51 void SetupInstantUsingTemplateURL(); |
| 52 | 52 |
| 53 InstantController* instant() { | 53 InstantController* instant() { |
| 54 return browser()->instant_controller()->instant(); | 54 return browser()->instant_controller()->instant(); |
| 55 } | 55 } |
| 56 | 56 |
| (...skipping 22 matching lines...) Expand all Loading... |
| 79 bool CheckVisibilityIs(content::WebContents* contents, | 79 bool CheckVisibilityIs(content::WebContents* contents, |
| 80 bool expected) WARN_UNUSED_RESULT; | 80 bool expected) WARN_UNUSED_RESULT; |
| 81 | 81 |
| 82 GURL instant_url_; | 82 GURL instant_url_; |
| 83 | 83 |
| 84 // HTTPS Testing server, started on demand. | 84 // HTTPS Testing server, started on demand. |
| 85 net::TestServer https_test_server_; | 85 net::TestServer https_test_server_; |
| 86 }; | 86 }; |
| 87 | 87 |
| 88 #endif // CHROME_BROWSER_INSTANT_INSTANT_TEST_UTILS_H_ | 88 #endif // CHROME_BROWSER_INSTANT_INSTANT_TEST_UTILS_H_ |
| OLD | NEW |