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

Side by Side Diff: chrome/browser/renderer_host/render_process_host_chrome_browsertest.cc

Issue 108213012: [DevTools] Remove dock side knowledge from browser. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Mac tests Created 6 years, 11 months 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 (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 "base/command_line.h" 5 #include "base/command_line.h"
6 #include "chrome/browser/chrome_notification_types.h" 6 #include "chrome/browser/chrome_notification_types.h"
7 #include "chrome/browser/devtools/devtools_window.h" 7 #include "chrome/browser/devtools/devtools_window.h"
8 #include "chrome/browser/search/search.h" 8 #include "chrome/browser/search/search.h"
9 #include "chrome/browser/ui/browser.h" 9 #include "chrome/browser/ui/browser.h"
10 #include "chrome/browser/ui/browser_commands.h" 10 #include "chrome/browser/ui/browser_commands.h"
(...skipping 335 matching lines...) Expand 10 before | Expand all | Expand 10 after
346 // DevTools start in docked mode (no new tab), in a separate process. 346 // DevTools start in docked mode (no new tab), in a separate process.
347 chrome::ToggleDevToolsWindow(browser(), DevToolsToggleAction::Inspect()); 347 chrome::ToggleDevToolsWindow(browser(), DevToolsToggleAction::Inspect());
348 host_count++; 348 host_count++;
349 EXPECT_EQ(tab_count, browser()->tab_strip_model()->count()); 349 EXPECT_EQ(tab_count, browser()->tab_strip_model()->count());
350 EXPECT_EQ(host_count, RenderProcessHostCount()); 350 EXPECT_EQ(host_count, RenderProcessHostCount());
351 351
352 RenderViewHost* devtools = FindFirstDevToolsHost(); 352 RenderViewHost* devtools = FindFirstDevToolsHost();
353 DCHECK(devtools); 353 DCHECK(devtools);
354 354
355 // DevTools start in a separate process. 355 // DevTools start in a separate process.
356 DevToolsWindow::ToggleDevToolsWindow( 356 DevToolsWindow::OpenDevToolsWindow(devtools, DevToolsToggleAction::Inspect());
357 devtools, true, DevToolsToggleAction::Inspect());
358 host_count++; 357 host_count++;
359 EXPECT_EQ(tab_count, browser()->tab_strip_model()->count()); 358 EXPECT_EQ(tab_count, browser()->tab_strip_model()->count());
360 EXPECT_EQ(host_count, RenderProcessHostCount()); 359 EXPECT_EQ(host_count, RenderProcessHostCount());
361 360
362 // close docked devtools 361 // close docked devtools
363 content::WindowedNotificationObserver close_observer( 362 content::WindowedNotificationObserver close_observer(
364 content::NOTIFICATION_WEB_CONTENTS_DESTROYED, 363 content::NOTIFICATION_WEB_CONTENTS_DESTROYED,
365 content::Source<WebContents>(WebContents::FromRenderViewHost(devtools))); 364 content::Source<WebContents>(WebContents::FromRenderViewHost(devtools)));
366 365
367 chrome::ToggleDevToolsWindow(browser(), DevToolsToggleAction::Toggle()); 366 chrome::ToggleDevToolsWindow(browser(), DevToolsToggleAction::Toggle());
(...skipping 26 matching lines...) Expand all
394 // DevTools start in docked mode (no new tab), in a separate process. 393 // DevTools start in docked mode (no new tab), in a separate process.
395 chrome::ToggleDevToolsWindow(browser(), DevToolsToggleAction::Inspect()); 394 chrome::ToggleDevToolsWindow(browser(), DevToolsToggleAction::Inspect());
396 host_count++; 395 host_count++;
397 EXPECT_EQ(tab_count, browser()->tab_strip_model()->count()); 396 EXPECT_EQ(tab_count, browser()->tab_strip_model()->count());
398 EXPECT_EQ(host_count, RenderProcessHostCount()); 397 EXPECT_EQ(host_count, RenderProcessHostCount());
399 398
400 RenderViewHost* devtools = FindFirstDevToolsHost(); 399 RenderViewHost* devtools = FindFirstDevToolsHost();
401 DCHECK(devtools); 400 DCHECK(devtools);
402 401
403 // DevTools start in a separate process. 402 // DevTools start in a separate process.
404 DevToolsWindow::ToggleDevToolsWindow( 403 DevToolsWindow::OpenDevToolsWindow(devtools, DevToolsToggleAction::Inspect());
405 devtools, true, DevToolsToggleAction::Inspect());
406 host_count++; 404 host_count++;
407 EXPECT_EQ(tab_count, browser()->tab_strip_model()->count()); 405 EXPECT_EQ(tab_count, browser()->tab_strip_model()->count());
408 EXPECT_EQ(host_count, RenderProcessHostCount()); 406 EXPECT_EQ(host_count, RenderProcessHostCount());
409 407
410 // close docked devtools 408 // close docked devtools
411 content::WindowedNotificationObserver close_observer( 409 content::WindowedNotificationObserver close_observer(
412 content::NOTIFICATION_WEB_CONTENTS_DESTROYED, 410 content::NOTIFICATION_WEB_CONTENTS_DESTROYED,
413 content::Source<content::WebContents>( 411 content::Source<content::WebContents>(
414 WebContents::FromRenderViewHost(devtools))); 412 WebContents::FromRenderViewHost(devtools)));
415 chrome::ToggleDevToolsWindow(browser(), DevToolsToggleAction::Toggle()); 413 chrome::ToggleDevToolsWindow(browser(), DevToolsToggleAction::Toggle());
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
471 chrome::NOTIFICATION_BROWSER_CLOSED, 469 chrome::NOTIFICATION_BROWSER_CLOSED,
472 content::NotificationService::AllSources()); 470 content::NotificationService::AllSources());
473 471
474 // Kill the renderer process, simulating a crash. This should the ProcessDied 472 // Kill the renderer process, simulating a crash. This should the ProcessDied
475 // method to be called. Alternatively, RenderProcessHost::OnChannelError can 473 // method to be called. Alternatively, RenderProcessHost::OnChannelError can
476 // be called to directly force a call to ProcessDied. 474 // be called to directly force a call to ProcessDied.
477 base::KillProcess(wc1->GetRenderProcessHost()->GetHandle(), -1, true); 475 base::KillProcess(wc1->GetRenderProcessHost()->GetHandle(), -1, true);
478 476
479 observer.Wait(); 477 observer.Wait();
480 } 478 }
OLDNEW
« no previous file with comments | « chrome/browser/policy/policy_browsertest.cc ('k') | chrome/browser/task_manager/task_manager_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698