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

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

Powered by Google App Engine
This is Rietveld 408576698