chrome/browser/ui: Remove use of MessageLoopProxy and deprecated MessageLoop APIs

chrome/browser/ui/views/bookmarks/bookmark_bar_view_test.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/compiler_specific.h"
+#include "base/location.h"
+#include "base/message_loop/message_loop.h"
 #include "base/prefs/pref_service.h"
+#include "base/run_loop.h"
+#include "base/single_thread_task_runner.h"

[msw, 2015/06/12 00:31:21]

nit: remove sttr and ttrh headers.

[Sami, 2015/06/12 10:56:22]

Done.

 #include "base/strings/string_number_conversions.h"
 #include "base/strings/utf_string_conversions.h"
+#include "base/thread_task_runner_handle.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
 #include "chrome/browser/chrome_content_browser_client.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/bookmarks/bookmark_utils.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_tabstrip.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
@@ skipping 287 matching lines @@
     // Tasks and fully shut down.
     browser_->tab_strip_model()->CloseAllTabs();
     bb_view_.reset();
     browser_.reset();
     profile_.reset();
 
     // Run the message loop to ensure we delete allTasks and fully shut down.
     base::MessageLoopForUI* loop = base::MessageLoopForUI::current();
     base::MessageLoopForUI::ScopedNestableTaskAllower allow_nested(loop);
     base::RunLoop run_loop;
-    loop->PostTask(FROM_HERE, run_loop.QuitClosure());
+    loop->task_runner()->PostTask(FROM_HERE, run_loop.QuitClosure());
     run_loop.Run();
 
     ViewEventTestBase::TearDown();
     BookmarkBarView::DisableAnimationsForTesting(false);
     constrained_window::SetConstrainedWindowViewsClient(nullptr);
 
     browser_content_client_.reset();
     content_client_.reset();
     content::SetContentClient(NULL);
   }
@@ skipping 248 matching lines @@
   explicit BookmarkContextMenuNotificationObserver(const base::Closure& task)
       : task_(task) {
     registrar_.Add(this,
                    chrome::NOTIFICATION_BOOKMARK_CONTEXT_MENU_SHOWN,
                    content::NotificationService::AllSources());
   }
 
   void Observe(int type,
                const content::NotificationSource& source,
                const content::NotificationDetails& details) override {
-    base::MessageLoop::current()->PostTask(FROM_HERE, task_);
+    base::MessageLoop::current()->task_runner()->PostTask(FROM_HERE, task_);
   }
 
   // Sets the task that is posted when the context menu is shown.
   void set_task(const base::Closure& task) { task_ = task; }
 
  private:
   content::NotificationRegistrar registrar_;
   base::Closure task_;
 
   DISALLOW_COPY_AND_ASSIGN(BookmarkContextMenuNotificationObserver);
@@ skipping 410 matching lines @@
                    scroll_down_button->height() / 2);
     views::View::ConvertPointToScreen(scroll_down_button, &loc);
 
     // On linux, the sending one location isn't enough.
     ui_controls::SendMouseMove(loc.x() - 1 , loc.y() - 1);
     ui_controls::SendMouseMoveNotifyWhenDone(
         loc.x(), loc.y(), CreateEventTask(this, &BookmarkBarViewTest9::Step3));
   }
 
   void Step3() {
-    base::MessageLoop::current()->PostDelayedTask(
-        FROM_HERE,
-        base::Bind(&BookmarkBarViewTest9::Step4, this),
+    base::MessageLoop::current()->task_runner()->PostDelayedTask(
+        FROM_HERE, base::Bind(&BookmarkBarViewTest9::Step4, this),
         base::TimeDelta::FromMilliseconds(200));
   }
 
   void Step4() {
     gfx::Point menu_loc;
     views::View::ConvertPointToScreen(first_menu_, &menu_loc);
     ASSERT_NE(start_y_, menu_loc.y());
 
     // Hide menu.
     bb_view_->GetMenu()->GetMenuController()->CancelAll();
 
     // On linux, Cancelling menu will call Quit on the message loop,
     // which can interfere with Done. We need to run Done in the
     // next execution loop.
-    base::MessageLoop::current()->PostTask(
+    base::MessageLoop::current()->task_runner()->PostTask(
         FROM_HERE, base::Bind(&ViewEventTestBase::Done, this));
   }
 
   int start_y_;
   views::MenuItemView* first_menu_;
 };
 
 // Fails on official cros bot. crbug.com/431427.
 #if defined(OS_CHROMEOS) && defined(OFFICIAL_BUILD)
 #define MAYBE_ScrollButtonScrolls DISABLED_ScrollButtonScrolls
@@ skipping 262 matching lines @@
     waiter.reset();
 
     // Press tab to give focus to the cancel button. Wait until the widget
     // receives the tab key.
     TabKeyWaiter tab_waiter(dialog);
     ui_controls::SendKeyPress(
         window_->GetNativeWindow(), ui::VKEY_TAB, false, false, false, false);
     tab_waiter.WaitForTab();
 
     // For some reason return isn't processed correctly unless we delay.
-    base::MessageLoop::current()->PostDelayedTask(
-        FROM_HERE,
-        base::Bind(
-            &BookmarkBarViewTest12::Step5, this, base::Unretained(dialog)),
+    base::MessageLoop::current()->task_runner()->PostDelayedTask(
+        FROM_HERE, base::Bind(&BookmarkBarViewTest12::Step5, this,
+                              base::Unretained(dialog)),
         base::TimeDelta::FromSeconds(1));
   }
 
   void Step5(views::Widget* dialog) {
     DialogCloseWaiter waiter(dialog);
     // And press enter so that the cancel button is selected.
     ui_controls::SendKeyPressNotifyWhenDone(window_->GetNativeWindow(),
                                             ui::VKEY_RETURN,
                                             false,
                                             false,
@@ skipping 242 matching lines @@
     ASSERT_TRUE(menu->GetSubmenu()->IsShowing());
 
     // Button should be depressed.
     views::LabelButton* button = GetBookmarkButton(0);
     ASSERT_TRUE(button->state() == views::CustomButton::STATE_PRESSED);
 
     // Close the window.
     window_->Close();
     window_ = NULL;
 
-    base::MessageLoop::current()->PostTask(
+    base::MessageLoop::current()->task_runner()->PostTask(
         FROM_HERE, CreateEventTask(this, &BookmarkBarViewTest16::Done));
   }
 };
 
 #if defined(OS_LINUX) && !defined(OS_CHROMEOS)
 // TODO(erg): linux_aura bringup: http://crbug.com/163931
 #define MAYBE_DeleteMenu DISABLED_DeleteMenu
 #else
 #define MAYBE_DeleteMenu DeleteMenu
 #endif
@@ skipping 458 matching lines @@
 };
 
 #if defined(OS_WIN)
 // This test times out on Windows. TODO(pkotwicz): Find out why.
 #define MAYBE_CloseSourceBrowserDuringDrag DISABLED_CloseSourceBrowserDuringDrag
 #else
 #define MAYBE_CloseSourceBrowserDuringDrag CloseSourceBrowserDuringDrag
 #endif
 
 VIEW_TEST(BookmarkBarViewTest22, MAYBE_CloseSourceBrowserDuringDrag)