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 #include <vector> | 6 #include <vector> |
7 | 7 |
8 #include "base/compiler_specific.h" | 8 #include "base/compiler_specific.h" |
9 #include "base/memory/scoped_ptr.h" | 9 #include "base/memory/scoped_ptr.h" |
10 #include "base/utf_string_conversions.h" | 10 #include "base/utf_string_conversions.h" |
11 #include "chrome/app/chrome_command_ids.h" | 11 #include "chrome/app/chrome_command_ids.h" |
12 #include "chrome/browser/bookmarks/bookmark_model.h" | 12 #include "chrome/browser/bookmarks/bookmark_model.h" |
13 #include "chrome/browser/bookmarks/bookmark_utils.h" | 13 #include "chrome/browser/bookmarks/bookmark_utils.h" |
14 #include "chrome/browser/profiles/profile.h" | 14 #include "chrome/browser/profiles/profile.h" |
15 #include "chrome/browser/ui/views/bookmarks/bookmark_context_menu.h" | 15 #include "chrome/browser/ui/views/bookmarks/bookmark_context_menu.h" |
16 #include "chrome/test/base/testing_profile.h" | 16 #include "chrome/test/base/testing_profile.h" |
| 17 #include "chrome/test/testing_browser_process_test.h" |
17 #include "content/browser/browser_thread.h" | 18 #include "content/browser/browser_thread.h" |
18 #include "content/browser/tab_contents/page_navigator.h" | 19 #include "content/browser/tab_contents/page_navigator.h" |
19 #include "grit/generated_resources.h" | 20 #include "grit/generated_resources.h" |
20 #include "testing/gtest/include/gtest/gtest.h" | 21 #include "testing/gtest/include/gtest/gtest.h" |
21 | 22 |
22 #if defined(OS_WIN) | 23 #if defined(OS_WIN) |
23 #include "chrome/browser/ui/views/bookmarks/bookmark_bar_view.h" | 24 #include "chrome/browser/ui/views/bookmarks/bookmark_bar_view.h" |
24 #endif | 25 #endif |
25 | 26 |
26 namespace { | 27 namespace { |
(...skipping 14 matching lines...) Expand all Loading... |
41 virtual TabContents* OpenURL(const OpenURLParams& params) OVERRIDE { | 42 virtual TabContents* OpenURL(const OpenURLParams& params) OVERRIDE { |
42 urls_.push_back(params.url); | 43 urls_.push_back(params.url); |
43 return NULL; | 44 return NULL; |
44 } | 45 } |
45 | 46 |
46 std::vector<GURL> urls_; | 47 std::vector<GURL> urls_; |
47 }; | 48 }; |
48 | 49 |
49 } // namespace | 50 } // namespace |
50 | 51 |
51 class BookmarkContextMenuTest : public testing::Test { | 52 class BookmarkContextMenuTest : public TestingBrowserProcessTest { |
52 public: | 53 public: |
53 BookmarkContextMenuTest() | 54 BookmarkContextMenuTest() |
54 : ui_thread_(BrowserThread::UI, &message_loop_), | 55 : ui_thread_(BrowserThread::UI, &message_loop_), |
55 file_thread_(BrowserThread::FILE, &message_loop_), | 56 file_thread_(BrowserThread::FILE, &message_loop_), |
56 model_(NULL) { | 57 model_(NULL) { |
57 } | 58 } |
58 | 59 |
59 virtual void SetUp() { | 60 virtual void SetUp() { |
60 #if defined(OS_WIN) | 61 #if defined(OS_WIN) |
61 BookmarkBarView::testing_ = true; | 62 BookmarkBarView::testing_ = true; |
(...skipping 250 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
312 ASSERT_EQ(bb_node->GetChild(0)->url(), bb_node->GetChild(1)->url()); | 313 ASSERT_EQ(bb_node->GetChild(0)->url(), bb_node->GetChild(1)->url()); |
313 | 314 |
314 controller.reset(new BookmarkContextMenu( | 315 controller.reset(new BookmarkContextMenu( |
315 NULL, profile_.get(), NULL, nodes[0]->parent(), nodes, false)); | 316 NULL, profile_.get(), NULL, nodes[0]->parent(), nodes, false)); |
316 // Cut the URL. | 317 // Cut the URL. |
317 controller->ExecuteCommand(IDC_CUT); | 318 controller->ExecuteCommand(IDC_CUT); |
318 ASSERT_TRUE(bb_node->GetChild(0)->is_url()); | 319 ASSERT_TRUE(bb_node->GetChild(0)->is_url()); |
319 ASSERT_TRUE(bb_node->GetChild(1)->is_folder()); | 320 ASSERT_TRUE(bb_node->GetChild(1)->is_folder()); |
320 ASSERT_EQ(old_count, bb_node->child_count()); | 321 ASSERT_EQ(old_count, bb_node->child_count()); |
321 } | 322 } |
OLD | NEW |