chrome/test/base/tracing_browsertest.cc - Issue 877323002: Mechanical rename of tracing includes for /chrome

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: chrome/test/base/tracing_browsertest.cc

Issue 877323002: Mechanical rename of tracing includes for /chrome (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years, 10 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

« no previous file with comments | « chrome/test/base/tracing.cc ('k') | chrome/test/logging/win/file_logger.cc » ('j') | no next file with comments »

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 "chrome/test/base/tracing.h"	5 #include "chrome/test/base/tracing.h"

6	6

7 #include "base/debug/trace_event.h"

8 #include "base/message_loop/message_loop.h"	7 #include "base/message_loop/message_loop.h"

9 #include "base/run_loop.h"	8 #include "base/run_loop.h"

	9 #include "base/trace_event/trace_event.h"

10 #include "chrome/browser/ui/browser.h"	10 #include "chrome/browser/ui/browser.h"

11 #include "chrome/browser/ui/tabs/tab_strip_model.h"	11 #include "chrome/browser/ui/tabs/tab_strip_model.h"

12 #include "chrome/test/base/in_process_browser_test.h"	12 #include "chrome/test/base/in_process_browser_test.h"

13 #include "chrome/test/base/ui_test_utils.h"	13 #include "chrome/test/base/ui_test_utils.h"

14 #include "content/public/browser/render_view_host.h"	14 #include "content/public/browser/render_view_host.h"

15 #include "content/public/browser/web_contents.h"	15 #include "content/public/browser/web_contents.h"

16 #include "content/public/test/browser_test_utils.h"	16 #include "content/public/test/browser_test_utils.h"

17 #include "testing/gtest/include/gtest/gtest.h"	17 #include "testing/gtest/include/gtest/gtest.h"

18	18

19 namespace {	19 namespace {

(...skipping 77 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
97 NEW_FOREGROUND_TAB, ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);	97 NEW_FOREGROUND_TAB, ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);

98 ASSERT_NO_FATAL_FAILURE(ExecuteJavascriptOnCurrentTab());	98 ASSERT_NO_FATAL_FAILURE(ExecuteJavascriptOnCurrentTab());

99 ui_test_utils::NavigateToURLWithDisposition(browser(), url2,	99 ui_test_utils::NavigateToURLWithDisposition(browser(), url2,

100 NEW_FOREGROUND_TAB, ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);	100 NEW_FOREGROUND_TAB, ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);

101 ASSERT_NO_FATAL_FAILURE(ExecuteJavascriptOnCurrentTab());	101 ASSERT_NO_FATAL_FAILURE(ExecuteJavascriptOnCurrentTab());

102 EXPECT_TRUE(WaitForWatchEvent(no_timeout));	102 EXPECT_TRUE(WaitForWatchEvent(no_timeout));

103 ASSERT_TRUE(EndTracing(&json_events));	103 ASSERT_TRUE(EndTracing(&json_events));

104 }	104 }

105	105

106 } // namespace	106 } // namespace

OLD	NEW