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" |
11 #include "chrome/browser/bookmarks/bookmark_model.h" | 11 #include "chrome/browser/bookmarks/bookmark_model.h" |
12 #include "chrome/browser/bookmarks/bookmark_utils.h" | 12 #include "chrome/browser/bookmarks/bookmark_utils.h" |
13 #include "chrome/browser/profiles/profile.h" | 13 #include "chrome/browser/profiles/profile.h" |
14 #include "chrome/test/base/testing_profile.h" | 14 #include "chrome/test/base/testing_profile.h" |
| 15 #include "chrome/test/testing_browser_process_test.h" |
15 #include "content/browser/browser_thread.h" | 16 #include "content/browser/browser_thread.h" |
16 #include "content/browser/tab_contents/page_navigator.h" | 17 #include "content/browser/tab_contents/page_navigator.h" |
17 #include "grit/generated_resources.h" | 18 #include "grit/generated_resources.h" |
18 #include "testing/gtest/include/gtest/gtest.h" | 19 #include "testing/gtest/include/gtest/gtest.h" |
19 | 20 |
20 #if defined(OS_WIN) | 21 #if defined(OS_WIN) |
21 #include "chrome/browser/ui/views/bookmarks/bookmark_bar_view.h" | 22 #include "chrome/browser/ui/views/bookmarks/bookmark_bar_view.h" |
22 #endif | 23 #endif |
23 | 24 |
24 // PageNavigator implementation that records the URL. | 25 // PageNavigator implementation that records the URL. |
(...skipping 10 matching lines...) Expand all Loading... |
35 } | 36 } |
36 | 37 |
37 virtual TabContents* OpenURL(const OpenURLParams& params) OVERRIDE { | 38 virtual TabContents* OpenURL(const OpenURLParams& params) OVERRIDE { |
38 urls_.push_back(params.url); | 39 urls_.push_back(params.url); |
39 return NULL; | 40 return NULL; |
40 } | 41 } |
41 | 42 |
42 std::vector<GURL> urls_; | 43 std::vector<GURL> urls_; |
43 }; | 44 }; |
44 | 45 |
45 class BookmarkContextMenuControllerTest : public testing::Test { | 46 class BookmarkContextMenuControllerTest : public TestingBrowserProcessTest { |
46 public: | 47 public: |
47 BookmarkContextMenuControllerTest() | 48 BookmarkContextMenuControllerTest() |
48 : ui_thread_(BrowserThread::UI, &message_loop_), | 49 : ui_thread_(BrowserThread::UI, &message_loop_), |
49 file_thread_(BrowserThread::FILE, &message_loop_), | 50 file_thread_(BrowserThread::FILE, &message_loop_), |
50 model_(NULL) { | 51 model_(NULL) { |
51 } | 52 } |
52 | 53 |
53 virtual void SetUp() { | 54 virtual void SetUp() { |
54 #if defined(OS_WIN) | 55 #if defined(OS_WIN) |
55 BookmarkBarView::testing_ = true; | 56 BookmarkBarView::testing_ = true; |
(...skipping 254 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
310 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()); |
311 | 312 |
312 controller.reset(new BookmarkContextMenuController( | 313 controller.reset(new BookmarkContextMenuController( |
313 NULL, NULL, profile_.get(), NULL, nodes[0]->parent(), nodes)); | 314 NULL, NULL, profile_.get(), NULL, nodes[0]->parent(), nodes)); |
314 // Cut the URL. | 315 // Cut the URL. |
315 controller->ExecuteCommand(IDC_CUT); | 316 controller->ExecuteCommand(IDC_CUT); |
316 ASSERT_TRUE(bb_node->GetChild(0)->is_url()); | 317 ASSERT_TRUE(bb_node->GetChild(0)->is_url()); |
317 ASSERT_TRUE(bb_node->GetChild(1)->is_folder()); | 318 ASSERT_TRUE(bb_node->GetChild(1)->is_folder()); |
318 ASSERT_EQ(old_count, bb_node->child_count()); | 319 ASSERT_EQ(old_count, bb_node->child_count()); |
319 } | 320 } |
OLD | NEW |