chrome/browser/ui/views/ash/tab_scrubber_browsertest.cc - Issue 1160073004: chrome/browser/ui: Remove use of MessageLoopProxy and deprecated MessageLoop APIs

Side by Side Diff: chrome/browser/ui/views/ash/tab_scrubber_browsertest.cc

Issue 1160073004: chrome/browser/ui: Remove use of MessageLoopProxy and deprecated MessageLoop APIs (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Check for task runner instead of current message loop. Created 5 years, 6 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

« chrome/browser/ui/tab_modal_confirm_dialog_browsertest.cc ('K') | « chrome/browser/ui/unload_controller.cc ('k') | chrome/browser/ui/views/autofill/autofill_popup_base_view.cc » ('j') | chrome/browser/ui/views/bookmarks/bookmark_bar_view_test.cc » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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/browser/ui/views/ash/tab_scrubber.h"	5 #include "chrome/browser/ui/views/ash/tab_scrubber.h"

6	6

7 #include "ash/display/event_transformation_handler.h"	7 #include "ash/display/event_transformation_handler.h"

8 #include "ash/shell.h"	8 #include "ash/shell.h"

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

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

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

12 #include "base/message_loop/message_loop_proxy.h"	12 #include "base/thread_task_runner_handle.h"
	msw 2015/06/10 00:12:57 Perhaps remove this and message_loop.h, and includ Perhaps remove this and message_loop.h, and include base/run_loop.h instead? This file only uses base::RunLoop and content::RunThisRunLoop. Sami 2015/06/10 12:35:34 Right, this was the other header I added by mistak Show quoted text On 2015/06/10 00:12:57, msw wrote: > Perhaps remove this and message_loop.h, and include base/run_loop.h instead? > This file only uses base::RunLoop and content::RunThisRunLoop. Right, this was the other header I added by mistake. Replaced this and message_loop.h with run_loop.h
13 #include "chrome/browser/ui/browser_tabstrip.h"	13 #include "chrome/browser/ui/browser_tabstrip.h"

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

15 #include "chrome/browser/ui/tabs/tab_strip_model_observer.h"	15 #include "chrome/browser/ui/tabs/tab_strip_model_observer.h"

16 #include "chrome/browser/ui/views/frame/browser_view.h"	16 #include "chrome/browser/ui/views/frame/browser_view.h"

17 #include "chrome/browser/ui/views/tabs/tab.h"	17 #include "chrome/browser/ui/views/tabs/tab.h"

18 #include "chrome/browser/ui/views/tabs/tab_strip.h"	18 #include "chrome/browser/ui/views/tabs/tab_strip.h"

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

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

21 #include "content/public/browser/notification_service.h"	21 #include "content/public/browser/notification_service.h"

22 #include "content/public/common/url_constants.h"	22 #include "content/public/common/url_constants.h"

(...skipping 386 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
409 IN_PROC_BROWSER_TEST_F(TabScrubberTest, CloseBrowser) {	409 IN_PROC_BROWSER_TEST_F(TabScrubberTest, CloseBrowser) {

410 AddTabs(browser(), 1);	410 AddTabs(browser(), 1);

411	411

412 SendScrubEvent(browser(), 0);	412 SendScrubEvent(browser(), 0);

413 EXPECT_TRUE(TabScrubber::GetInstance()->IsActivationPending());	413 EXPECT_TRUE(TabScrubber::GetInstance()->IsActivationPending());

414 browser()->window()->Close();	414 browser()->window()->Close();

415 EXPECT_FALSE(TabScrubber::GetInstance()->IsActivationPending());	415 EXPECT_FALSE(TabScrubber::GetInstance()->IsActivationPending());

416 }	416 }

417	417

418 #endif // defined(OS_CHROMEOS)	418 #endif // defined(OS_CHROMEOS)

OLD	NEW