| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 <string> | 5 #include <string> |
| 6 | 6 |
| 7 #include "base/memory/scoped_ptr.h" | 7 #include "base/memory/scoped_ptr.h" |
| 8 #include "base/utf_string_conversions.h" | 8 #include "base/utf_string_conversions.h" |
| 9 #include "chrome/app/chrome_command_ids.h" | 9 #include "chrome/app/chrome_command_ids.h" |
| 10 #include "chrome/browser/bookmarks/bookmark_context_menu_controller.h" | 10 #include "chrome/browser/bookmarks/bookmark_context_menu_controller.h" |
| (...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 63 model_ = profile_->GetBookmarkModel(); | 63 model_ = profile_->GetBookmarkModel(); |
| 64 | 64 |
| 65 AddTestData(); | 65 AddTestData(); |
| 66 } | 66 } |
| 67 | 67 |
| 68 virtual void TearDown() { | 68 virtual void TearDown() { |
| 69 #if defined(OS_WIN) | 69 #if defined(OS_WIN) |
| 70 BookmarkBarView::testing_ = false; | 70 BookmarkBarView::testing_ = false; |
| 71 #endif | 71 #endif |
| 72 | 72 |
| 73 // Flush the message loop to make Purify happy. | 73 // Flush the message loop to make application verifiers happy. |
| 74 message_loop_.RunAllPending(); | 74 message_loop_.RunAllPending(); |
| 75 } | 75 } |
| 76 | 76 |
| 77 protected: | 77 protected: |
| 78 MessageLoopForUI message_loop_; | 78 MessageLoopForUI message_loop_; |
| 79 BrowserThread ui_thread_; | 79 BrowserThread ui_thread_; |
| 80 BrowserThread file_thread_; | 80 BrowserThread file_thread_; |
| 81 scoped_ptr<TestingProfile> profile_; | 81 scoped_ptr<TestingProfile> profile_; |
| 82 BookmarkModel* model_; | 82 BookmarkModel* model_; |
| 83 TestingPageNavigator navigator_; | 83 TestingPageNavigator navigator_; |
| (...skipping 227 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 311 ASSERT_EQ(bb_node->GetChild(0)->url(), bb_node->GetChild(1)->url()); | 311 ASSERT_EQ(bb_node->GetChild(0)->url(), bb_node->GetChild(1)->url()); |
| 312 | 312 |
| 313 controller.reset(new BookmarkContextMenuController( | 313 controller.reset(new BookmarkContextMenuController( |
| 314 NULL, NULL, profile_.get(), NULL, nodes[0]->parent(), nodes)); | 314 NULL, NULL, profile_.get(), NULL, nodes[0]->parent(), nodes)); |
| 315 // Cut the URL. | 315 // Cut the URL. |
| 316 controller->ExecuteCommand(IDC_CUT); | 316 controller->ExecuteCommand(IDC_CUT); |
| 317 ASSERT_TRUE(bb_node->GetChild(0)->is_url()); | 317 ASSERT_TRUE(bb_node->GetChild(0)->is_url()); |
| 318 ASSERT_TRUE(bb_node->GetChild(1)->is_folder()); | 318 ASSERT_TRUE(bb_node->GetChild(1)->is_folder()); |
| 319 ASSERT_EQ(old_count, bb_node->child_count()); | 319 ASSERT_EQ(old_count, bb_node->child_count()); |
| 320 } | 320 } |
| OLD | NEW |