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

Side by Side Diff: chrome/browser/ui/browser_browsertest.cc

Issue 395783002: [DevTools] Move DevToolsWindow testing code to a separate class. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixed TaskManagerBrowserTest Created 6 years, 5 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 | Annotate | Revision Log
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 <string> 5 #include <string>
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/compiler_specific.h" 9 #include "base/compiler_specific.h"
10 #include "base/files/file_path.h" 10 #include "base/files/file_path.h"
11 #include "base/memory/scoped_ptr.h" 11 #include "base/memory/scoped_ptr.h"
12 #include "base/prefs/pref_service.h" 12 #include "base/prefs/pref_service.h"
13 #include "base/strings/utf_string_conversions.h" 13 #include "base/strings/utf_string_conversions.h"
14 #include "base/sys_info.h" 14 #include "base/sys_info.h"
15 #include "chrome/app/chrome_command_ids.h" 15 #include "chrome/app/chrome_command_ids.h"
16 #include "chrome/browser/chrome_content_browser_client.h" 16 #include "chrome/browser/chrome_content_browser_client.h"
17 #include "chrome/browser/chrome_notification_types.h" 17 #include "chrome/browser/chrome_notification_types.h"
18 #include "chrome/browser/command_updater.h" 18 #include "chrome/browser/command_updater.h"
19 #include "chrome/browser/content_settings/host_content_settings_map.h" 19 #include "chrome/browser/content_settings/host_content_settings_map.h"
20 #include "chrome/browser/defaults.h" 20 #include "chrome/browser/defaults.h"
21 #include "chrome/browser/devtools/devtools_window.h" 21 #include "chrome/browser/devtools/devtools_window_testing.h"
22 #include "chrome/browser/extensions/extension_browsertest.h" 22 #include "chrome/browser/extensions/extension_browsertest.h"
23 #include "chrome/browser/extensions/extension_service.h" 23 #include "chrome/browser/extensions/extension_service.h"
24 #include "chrome/browser/extensions/tab_helper.h" 24 #include "chrome/browser/extensions/tab_helper.h"
25 #include "chrome/browser/first_run/first_run.h" 25 #include "chrome/browser/first_run/first_run.h"
26 #include "chrome/browser/lifetime/application_lifetime.h" 26 #include "chrome/browser/lifetime/application_lifetime.h"
27 #include "chrome/browser/prefs/incognito_mode_prefs.h" 27 #include "chrome/browser/prefs/incognito_mode_prefs.h"
28 #include "chrome/browser/profiles/profile.h" 28 #include "chrome/browser/profiles/profile.h"
29 #include "chrome/browser/profiles/profile_manager.h" 29 #include "chrome/browser/profiles/profile_manager.h"
30 #include "chrome/browser/search/search.h" 30 #include "chrome/browser/search/search.h"
31 #include "chrome/browser/sessions/session_backend.h" 31 #include "chrome/browser/sessions/session_backend.h"
(...skipping 1335 matching lines...) Expand 10 before | Expand all | Expand 10 after
1367 const Extension* extension_app = GetExtension(); 1367 const Extension* extension_app = GetExtension();
1368 1368
1369 // Launch it in a window, as AppLauncherHandler::HandleLaunchApp() would. 1369 // Launch it in a window, as AppLauncherHandler::HandleLaunchApp() would.
1370 WebContents* app_window = 1370 WebContents* app_window =
1371 OpenApplication(AppLaunchParams(browser()->profile(), 1371 OpenApplication(AppLaunchParams(browser()->profile(),
1372 extension_app, 1372 extension_app,
1373 extensions::LAUNCH_CONTAINER_WINDOW, 1373 extensions::LAUNCH_CONTAINER_WINDOW,
1374 NEW_WINDOW)); 1374 NEW_WINDOW));
1375 ASSERT_TRUE(app_window); 1375 ASSERT_TRUE(app_window);
1376 1376
1377 DevToolsWindow::OpenDevToolsWindowForTest( 1377 DevToolsWindowTesting::OpenDevToolsWindowSync(browser(), false);
1378 browser()->tab_strip_model()->GetActiveWebContents()->GetRenderViewHost(),
1379 false);
1380 1378
1381 // The launch should have created a new app browser and a dev tools browser. 1379 // The launch should have created a new app browser and a dev tools browser.
1382 ASSERT_EQ(3u, 1380 ASSERT_EQ(3u,
1383 chrome::GetBrowserCount(browser()->profile(), 1381 chrome::GetBrowserCount(browser()->profile(),
1384 browser()->host_desktop_type())); 1382 browser()->host_desktop_type()));
1385 1383
1386 // Find the new browsers. 1384 // Find the new browsers.
1387 Browser* app_browser = NULL; 1385 Browser* app_browser = NULL;
1388 Browser* dev_tools_browser = NULL; 1386 Browser* dev_tools_browser = NULL;
1389 for (chrome::BrowserIterator it; !it.done(); it.Next()) { 1387 for (chrome::BrowserIterator it; !it.done(); it.Next()) {
(...skipping 1316 matching lines...) Expand 10 before | Expand all | Expand 10 after
2706 #endif 2704 #endif
2707 EXPECT_EQ(exp_commit_size, rwhv_commit_size2); 2705 EXPECT_EQ(exp_commit_size, rwhv_commit_size2);
2708 EXPECT_EQ(exp_commit_size, wcv_commit_size2); 2706 EXPECT_EQ(exp_commit_size, wcv_commit_size2);
2709 gfx::Size exp_final_size(initial_wcv_size); 2707 gfx::Size exp_final_size(initial_wcv_size);
2710 exp_final_size.Enlarge(wcv_resize_insets.width(), 2708 exp_final_size.Enlarge(wcv_resize_insets.width(),
2711 wcv_resize_insets.height() + height_inset); 2709 wcv_resize_insets.height() + height_inset);
2712 EXPECT_EQ(exp_final_size, 2710 EXPECT_EQ(exp_final_size,
2713 web_contents->GetRenderWidgetHostView()->GetViewBounds().size()); 2711 web_contents->GetRenderWidgetHostView()->GetViewBounds().size());
2714 EXPECT_EQ(exp_final_size, web_contents->GetContainerBounds().size()); 2712 EXPECT_EQ(exp_final_size, web_contents->GetContainerBounds().size());
2715 } 2713 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698