OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 <utility> | 5 #include <utility> |
6 | 6 |
7 #include "base/callback_list.h" | 7 #include "base/callback_list.h" |
8 #include "base/lazy_instance.h" | 8 #include "base/lazy_instance.h" |
9 #include "base/macros.h" | 9 #include "base/macros.h" |
10 #include "base/threading/thread_task_runner_handle.h" | 10 #include "base/threading/thread_task_runner_handle.h" |
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
85 QueryNextStatusCallback callback_; | 85 QueryNextStatusCallback callback_; |
86 }; | 86 }; |
87 | 87 |
88 // Overrides the default service implementation with the test implementation | 88 // Overrides the default service implementation with the test implementation |
89 // declared above. | 89 // declared above. |
90 class TestContentBrowserClient : public ContentBrowserClient { | 90 class TestContentBrowserClient : public ContentBrowserClient { |
91 public: | 91 public: |
92 void ExposeInterfacesToRenderer( | 92 void ExposeInterfacesToRenderer( |
93 shell::InterfaceRegistry* registry, | 93 shell::InterfaceRegistry* registry, |
94 RenderProcessHost* render_process_host) override { | 94 RenderProcessHost* render_process_host) override { |
95 registry->AddInterface(base::Bind(&FakeBatteryMonitor::Create)); | 95 scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner = |
| 96 BrowserThread::GetTaskRunnerForThread(BrowserThread::UI); |
| 97 registry->AddInterface(base::Bind(&FakeBatteryMonitor::Create), |
| 98 ui_task_runner); |
96 } | 99 } |
97 | 100 |
98 void AppendExtraCommandLineSwitches(base::CommandLine* command_line, | 101 void AppendExtraCommandLineSwitches(base::CommandLine* command_line, |
99 int child_process_id) override { | 102 int child_process_id) override { |
100 // Necessary for passing kIsolateSitesForTesting flag to the renderer. | 103 // Necessary for passing kIsolateSitesForTesting flag to the renderer. |
101 ShellContentBrowserClient::Get()->AppendExtraCommandLineSwitches( | 104 ShellContentBrowserClient::Get()->AppendExtraCommandLineSwitches( |
102 command_line, child_process_id); | 105 command_line, child_process_id); |
103 } | 106 } |
104 | 107 |
105 #if defined(OS_ANDROID) | 108 #if defined(OS_ANDROID) |
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
179 TestNavigationObserver same_tab_observer2(shell()->web_contents(), 1); | 182 TestNavigationObserver same_tab_observer2(shell()->web_contents(), 1); |
180 status.level = 0.6; | 183 status.level = 0.6; |
181 UpdateBattery(status); | 184 UpdateBattery(status); |
182 same_tab_observer2.Wait(); | 185 same_tab_observer2.Wait(); |
183 EXPECT_EQ("pass", shell()->web_contents()->GetLastCommittedURL().ref()); | 186 EXPECT_EQ("pass", shell()->web_contents()->GetLastCommittedURL().ref()); |
184 } | 187 } |
185 | 188 |
186 } // namespace | 189 } // namespace |
187 | 190 |
188 } // namespace content | 191 } // namespace content |
OLD | NEW |