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

Side by Side Diff: chrome/test/remoting/remote_desktop_browsertest.cc

Issue 757433004: Add SOURCE_TEST. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed remaining instances of SOURCE_BROWSER_TEST. Created 6 years 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 unified diff | Download patch
OLDNEW
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 #include "chrome/test/remoting/remote_desktop_browsertest.h" 5 #include "chrome/test/remoting/remote_desktop_browsertest.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/files/file_util.h" 8 #include "base/files/file_util.h"
9 #include "base/json/json_reader.h" 9 #include "base/json/json_reader.h"
10 #include "base/path_service.h" 10 #include "base/path_service.h"
(...skipping 162 matching lines...) Expand 10 before | Expand all | Expand 10 after
173 // We cannot simply wait for any page load because the first page 173 // We cannot simply wait for any page load because the first page
174 // loaded could be the generated background page. We need to wait 174 // loaded could be the generated background page. We need to wait
175 // till the chromoting main page is loaded. 175 // till the chromoting main page is loaded.
176 PageLoadNotificationObserver observer(chromoting_main); 176 PageLoadNotificationObserver observer(chromoting_main);
177 177
178 OpenApplication(AppLaunchParams(browser()->profile(), extension_, 178 OpenApplication(AppLaunchParams(browser()->profile(), extension_,
179 is_platform_app() 179 is_platform_app()
180 ? extensions::LAUNCH_CONTAINER_NONE 180 ? extensions::LAUNCH_CONTAINER_NONE
181 : extensions::LAUNCH_CONTAINER_TAB, 181 : extensions::LAUNCH_CONTAINER_TAB,
182 is_platform_app() ? NEW_WINDOW : CURRENT_TAB, 182 is_platform_app() ? NEW_WINDOW : CURRENT_TAB,
183 extensions::SOURCE_UNTRACKED)); 183 extensions::SOURCE_TEST));
184 184
185 observer.Wait(); 185 observer.Wait();
186 186
187 187
188 // The active WebContents instance should be the source of the LOAD_STOP 188 // The active WebContents instance should be the source of the LOAD_STOP
189 // notification. 189 // notification.
190 content::NavigationController* controller = 190 content::NavigationController* controller =
191 content::Source<content::NavigationController>(observer.source()).ptr(); 191 content::Source<content::NavigationController>(observer.source()).ptr();
192 192
193 content::WebContents* web_contents = controller->GetWebContents(); 193 content::WebContents* web_contents = controller->GetWebContents();
(...skipping 693 matching lines...) Expand 10 before | Expand all | Expand 10 after
887 // static 887 // static
888 bool RemoteDesktopBrowserTest::IsEnabled( 888 bool RemoteDesktopBrowserTest::IsEnabled(
889 content::WebContents* client_web_content, 889 content::WebContents* client_web_content,
890 const std::string& element_name) { 890 const std::string& element_name) {
891 return !ExecuteScriptAndExtractBool( 891 return !ExecuteScriptAndExtractBool(
892 client_web_content, 892 client_web_content,
893 "document.getElementById(\"" + element_name + "\").disabled"); 893 "document.getElementById(\"" + element_name + "\").disabled");
894 } 894 }
895 895
896 } // namespace remoting 896 } // namespace remoting
OLDNEW
« no previous file with comments | « chrome/test/ppapi/ppapi_browsertest.cc ('k') | extensions/browser/api/app_runtime/app_runtime_api.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698