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

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

Issue 7744039: Switch ChromeTestSuite to the same convention as ContentTestSuite: (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: more fixing Created 9 years, 4 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) 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_browser_process_test.h"
17 #include "chrome/test/base/testing_profile.h" 16 #include "chrome/test/base/testing_profile.h"
18 #include "content/browser/browser_thread.h" 17 #include "content/browser/browser_thread.h"
19 #include "content/browser/tab_contents/page_navigator.h" 18 #include "content/browser/tab_contents/page_navigator.h"
20 #include "grit/generated_resources.h" 19 #include "grit/generated_resources.h"
21 #include "testing/gtest/include/gtest/gtest.h" 20 #include "testing/gtest/include/gtest/gtest.h"
22 21
23 #if defined(OS_WIN) 22 #if defined(OS_WIN)
24 #include "chrome/browser/ui/views/bookmarks/bookmark_bar_view.h" 23 #include "chrome/browser/ui/views/bookmarks/bookmark_bar_view.h"
25 #endif 24 #endif
26 25
(...skipping 15 matching lines...) Expand all
42 virtual TabContents* OpenURL(const OpenURLParams& params) OVERRIDE { 41 virtual TabContents* OpenURL(const OpenURLParams& params) OVERRIDE {
43 urls_.push_back(params.url); 42 urls_.push_back(params.url);
44 return NULL; 43 return NULL;
45 } 44 }
46 45
47 std::vector<GURL> urls_; 46 std::vector<GURL> urls_;
48 }; 47 };
49 48
50 } // namespace 49 } // namespace
51 50
52 class BookmarkContextMenuTest : public TestingBrowserProcessTest { 51 class BookmarkContextMenuTest : public testing::Test {
53 public: 52 public:
54 BookmarkContextMenuTest() 53 BookmarkContextMenuTest()
55 : ui_thread_(BrowserThread::UI, &message_loop_), 54 : ui_thread_(BrowserThread::UI, &message_loop_),
56 file_thread_(BrowserThread::FILE, &message_loop_), 55 file_thread_(BrowserThread::FILE, &message_loop_),
57 model_(NULL) { 56 model_(NULL) {
58 } 57 }
59 58
60 virtual void SetUp() { 59 virtual void SetUp() {
61 #if defined(OS_WIN) 60 #if defined(OS_WIN)
62 BookmarkBarView::testing_ = true; 61 BookmarkBarView::testing_ = true;
(...skipping 250 matching lines...) Expand 10 before | Expand all | Expand 10 after
313 ASSERT_EQ(bb_node->GetChild(0)->url(), bb_node->GetChild(1)->url()); 312 ASSERT_EQ(bb_node->GetChild(0)->url(), bb_node->GetChild(1)->url());
314 313
315 controller.reset(new BookmarkContextMenu( 314 controller.reset(new BookmarkContextMenu(
316 NULL, profile_.get(), NULL, nodes[0]->parent(), nodes, false)); 315 NULL, profile_.get(), NULL, nodes[0]->parent(), nodes, false));
317 // Cut the URL. 316 // Cut the URL.
318 controller->ExecuteCommand(IDC_CUT); 317 controller->ExecuteCommand(IDC_CUT);
319 ASSERT_TRUE(bb_node->GetChild(0)->is_url()); 318 ASSERT_TRUE(bb_node->GetChild(0)->is_url());
320 ASSERT_TRUE(bb_node->GetChild(1)->is_folder()); 319 ASSERT_TRUE(bb_node->GetChild(1)->is_folder());
321 ASSERT_EQ(old_count, bb_node->child_count()); 320 ASSERT_EQ(old_count, bb_node->child_count());
322 } 321 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698