Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(424)

Side by Side Diff: chrome/browser/ui/views/bookmarks/bookmark_context_menu_test.cc

Issue 14307023: chrome: Use base::MessageLoop. (Part 2) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 7 years, 7 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
OLDNEW
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/bookmarks/bookmark_context_menu.h" 5 #include "chrome/browser/ui/views/bookmarks/bookmark_context_menu.h"
6 6
7 #include <string> 7 #include <string>
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/compiler_specific.h" 10 #include "base/compiler_specific.h"
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
68 68
69 virtual void TearDown() OVERRIDE { 69 virtual void TearDown() OVERRIDE {
70 ui::Clipboard::DestroyClipboardForCurrentThread(); 70 ui::Clipboard::DestroyClipboardForCurrentThread();
71 71
72 BrowserThread::GetBlockingPool()->FlushForTesting(); 72 BrowserThread::GetBlockingPool()->FlushForTesting();
73 // Flush the message loop to make application verifiers happy. 73 // Flush the message loop to make application verifiers happy.
74 message_loop_.RunUntilIdle(); 74 message_loop_.RunUntilIdle();
75 } 75 }
76 76
77 protected: 77 protected:
78 MessageLoopForUI message_loop_; 78 base::MessageLoopForUI message_loop_;
79 content::TestBrowserThread ui_thread_; 79 content::TestBrowserThread ui_thread_;
80 content::TestBrowserThread file_thread_; 80 content::TestBrowserThread file_thread_;
81 scoped_ptr<TestingProfile> profile_; 81 scoped_ptr<TestingProfile> profile_;
82 BookmarkModel* model_; 82 BookmarkModel* model_;
83 TestingPageNavigator navigator_; 83 TestingPageNavigator navigator_;
84 84
85 private: 85 private:
86 // Creates the following structure: 86 // Creates the following structure:
87 // a 87 // a
88 // F1 88 // F1
(...skipping 229 matching lines...) Expand 10 before | Expand all | Expand 10 after
318 ASSERT_EQ(bb_node->GetChild(0)->url(), bb_node->GetChild(1)->url()); 318 ASSERT_EQ(bb_node->GetChild(0)->url(), bb_node->GetChild(1)->url());
319 319
320 controller.reset(new BookmarkContextMenu( 320 controller.reset(new BookmarkContextMenu(
321 NULL, NULL, profile_.get(), NULL, nodes[0]->parent(), nodes, false)); 321 NULL, NULL, profile_.get(), NULL, nodes[0]->parent(), nodes, false));
322 // Cut the URL. 322 // Cut the URL.
323 controller->ExecuteCommand(IDC_CUT, 0); 323 controller->ExecuteCommand(IDC_CUT, 0);
324 ASSERT_TRUE(bb_node->GetChild(0)->is_url()); 324 ASSERT_TRUE(bb_node->GetChild(0)->is_url());
325 ASSERT_TRUE(bb_node->GetChild(1)->is_folder()); 325 ASSERT_TRUE(bb_node->GetChild(1)->is_folder());
326 ASSERT_EQ(old_count, bb_node->child_count()); 326 ASSERT_EQ(old_count, bb_node->child_count());
327 } 327 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698