chrome/browser/protector/protector_service_browsertest.cc - Issue 10700027: browser: Move global error to subdir.

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/protector/protector_service_browsertest.cc

Issue 10700027: browser: Move global error to subdir. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 8 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

« no previous file with comments | « chrome/browser/profiles/profile_dependency_manager.cc ('k') | chrome/browser/protector/protector_service_factory.h » ('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 "base/command_line.h"	5 #include "base/command_line.h"

6 #include "base/memory/scoped_ptr.h"	6 #include "base/memory/scoped_ptr.h"

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

8 #include "chrome/app/chrome_command_ids.h"	8 #include "chrome/app/chrome_command_ids.h"

9 #include "chrome/browser/protector/mock_setting_change.h"	9 #include "chrome/browser/protector/mock_setting_change.h"

10 #include "chrome/browser/protector/protector_service.h"	10 #include "chrome/browser/protector/protector_service.h"

11 #include "chrome/browser/protector/protector_service_factory.h"	11 #include "chrome/browser/protector/protector_service_factory.h"

12 #include "chrome/browser/protector/settings_change_global_error.h"	12 #include "chrome/browser/protector/settings_change_global_error.h"

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

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

15 #include "chrome/browser/ui/global_error_bubble_view_base.h"	15 #include "chrome/browser/ui/global_error/global_error_bubble_view_base.h"

16 #include "chrome/browser/ui/global_error_service.h"	16 #include "chrome/browser/ui/global_error/global_error_service.h"

17 #include "chrome/browser/ui/global_error_service_factory.h"	17 #include "chrome/browser/ui/global_error/global_error_service_factory.h"

18 #include "chrome/common/chrome_switches.h"	18 #include "chrome/common/chrome_switches.h"

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

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

21	21

22 using ::testing::InvokeWithoutArgs;	22 using ::testing::InvokeWithoutArgs;

23 using ::testing::NiceMock;	23 using ::testing::NiceMock;

24 using ::testing::Return;	24 using ::testing::Return;

25	25

26 namespace protector {	26 namespace protector {

27	27

(...skipping 619 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
647	647

648 protector_service_->DismissChange(composite_change);	648 protector_service_->DismissChange(composite_change);

649 ui_test_utils::RunAllPendingInMessageLoop();	649 ui_test_utils::RunAllPendingInMessageLoop();

650 EXPECT_FALSE(IsGlobalErrorActive(composite_change));	650 EXPECT_FALSE(IsGlobalErrorActive(composite_change));

651 EXPECT_FALSE(protector_service_->GetLastChange());	651 EXPECT_FALSE(protector_service_->GetLastChange());

652 }	652 }

653	653

654 // TODO(ivankr): Timeout test.	654 // TODO(ivankr): Timeout test.

655	655

656 } // namespace protector	656 } // namespace protector

OLD	NEW