chrome/browser/extensions/gtalk_extension_browsertest.cc - Issue 19631004: Update include paths in chrome/browser/ for base/process changes.

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/browser/extensions/gtalk_extension_browsertest.cc

Issue 19631004: Update include paths in chrome/browser/ for base/process changes. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Merge ToT Created 7 years, 4 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

OLD	NEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved.	1 // Copyright (c) 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 "base/bind.h"	5 #include "base/bind.h"

6 #include "base/process_util.h"

7 #include "chrome/browser/browser_process.h"	6 #include "chrome/browser/browser_process.h"

8 #include "chrome/browser/chrome_notification_types.h"	7 #include "chrome/browser/chrome_notification_types.h"

9 #include "chrome/browser/extensions/extension_browsertest.h"	8 #include "chrome/browser/extensions/extension_browsertest.h"

10 #include "chrome/browser/extensions/extension_host.h"	9 #include "chrome/browser/extensions/extension_host.h"

11 #include "chrome/browser/extensions/extension_process_manager.h"	10 #include "chrome/browser/extensions/extension_process_manager.h"

12 #include "chrome/browser/extensions/extension_service.h"	11 #include "chrome/browser/extensions/extension_service.h"

13 #include "chrome/browser/extensions/extension_system.h"	12 #include "chrome/browser/extensions/extension_system.h"

14 #include "chrome/browser/profiles/profile.h"	13 #include "chrome/browser/profiles/profile.h"

15 #include "chrome/browser/ui/browser.h"	14 #include "chrome/browser/ui/browser.h"

16 #include "chrome/browser/ui/browser_commands.h"	15 #include "chrome/browser/ui/browser_commands.h"

(...skipping 64 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
81 };	80 };

82	81

83 IN_PROC_BROWSER_TEST_F(GtalkExtensionTest, InstallCurrent) {	82 IN_PROC_BROWSER_TEST_F(GtalkExtensionTest, InstallCurrent) {

84 content::WindowedNotificationObserver panel_loaded(	83 content::WindowedNotificationObserver panel_loaded(

85 chrome::NOTIFICATION_EXTENSION_VIEW_REGISTERED,	84 chrome::NOTIFICATION_EXTENSION_VIEW_REGISTERED,

86 content::NotificationService::AllSources());	85 content::NotificationService::AllSources());

87 InstallGtalkExtension(ReadCurrentVersion());	86 InstallGtalkExtension(ReadCurrentVersion());

88 panel_loaded.Wait();	87 panel_loaded.Wait();

89 ASSERT_TRUE(GetViewer());	88 ASSERT_TRUE(GetViewer());

90 }	89 }

OLD	NEW