| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 #include <deque> | 5 #include <deque> |
| 6 #include <vector> | 6 #include <vector> |
| 7 | 7 |
| 8 #include "base/bind.h" | 8 #include "base/bind.h" |
| 9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
| 10 #include "base/files/file_path.h" | 10 #include "base/files/file_path.h" |
| (...skipping 4028 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4039 | 4039 |
| 4040 // Navigate to the URL entered. | 4040 // Navigate to the URL entered. |
| 4041 omnibox_view->model()->AcceptInput(CURRENT_TAB, false); | 4041 omnibox_view->model()->AcceptInput(CURRENT_TAB, false); |
| 4042 | 4042 |
| 4043 // Prerender should be running, but abandoned. | 4043 // Prerender should be running, but abandoned. |
| 4044 EXPECT_TRUE( | 4044 EXPECT_TRUE( |
| 4045 GetAutocompleteActionPredictor()->IsPrerenderAbandonedForTesting()); | 4045 GetAutocompleteActionPredictor()->IsPrerenderAbandonedForTesting()); |
| 4046 } | 4046 } |
| 4047 | 4047 |
| 4048 // Can't run tests with NaCl plugins if built with DISABLE_NACL. | 4048 // Can't run tests with NaCl plugins if built with DISABLE_NACL. |
| 4049 #if !defined(DISABLE_NACL) | 4049 #if !defined(DISABLE_NACL) && !defined(DISABLE_NACL_BROWSERTESTS) |
| 4050 class PrerenderBrowserTestWithNaCl : public PrerenderBrowserTest { | 4050 class PrerenderBrowserTestWithNaCl : public PrerenderBrowserTest { |
| 4051 public: | 4051 public: |
| 4052 PrerenderBrowserTestWithNaCl() {} | 4052 PrerenderBrowserTestWithNaCl() {} |
| 4053 ~PrerenderBrowserTestWithNaCl() override {} | 4053 ~PrerenderBrowserTestWithNaCl() override {} |
| 4054 | 4054 |
| 4055 void SetUpCommandLine(base::CommandLine* command_line) override { | 4055 void SetUpCommandLine(base::CommandLine* command_line) override { |
| 4056 PrerenderBrowserTest::SetUpCommandLine(command_line); | 4056 PrerenderBrowserTest::SetUpCommandLine(command_line); |
| 4057 command_line->AppendSwitch(switches::kEnableNaCl); | 4057 command_line->AppendSwitch(switches::kEnableNaCl); |
| 4058 } | 4058 } |
| 4059 }; | 4059 }; |
| (...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4141 | 4141 |
| 4142 NavigateToDestURL(); | 4142 NavigateToDestURL(); |
| 4143 EXPECT_EQ(1U, task_manager.tasks().size()); | 4143 EXPECT_EQ(1U, task_manager.tasks().size()); |
| 4144 } | 4144 } |
| 4145 | 4145 |
| 4146 } // namespace | 4146 } // namespace |
| 4147 | 4147 |
| 4148 #endif // defined(ENABLE_TASK_MANAGER) | 4148 #endif // defined(ENABLE_TASK_MANAGER) |
| 4149 | 4149 |
| 4150 } // namespace prerender | 4150 } // namespace prerender |
| OLD | NEW |