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

Side by Side Diff: chrome/browser/ui/views/bookmarks/bookmark_bar_view_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 "base/compiler_specific.h" 5 #include "base/compiler_specific.h"
6 #include "base/string_number_conversions.h" 6 #include "base/string_number_conversions.h"
7 #include "base/utf_string_conversions.h" 7 #include "base/utf_string_conversions.h"
8 #include "chrome/app/chrome_command_ids.h" 8 #include "chrome/app/chrome_command_ids.h"
9 #include "chrome/browser/automation/ui_controls.h" 9 #include "chrome/browser/automation/ui_controls.h"
10 #include "chrome/browser/bookmarks/bookmark_model.h" 10 #include "chrome/browser/bookmarks/bookmark_model.h"
(...skipping 270 matching lines...) Expand 10 before | Expand all | Expand 10 after
281 ASCIIToUTF16("OF")); 281 ASCIIToUTF16("OF"));
282 model_->AddURL(of, 0, ASCIIToUTF16("ofa"), GURL(test_base + "ofa")); 282 model_->AddURL(of, 0, ASCIIToUTF16("ofa"), GURL(test_base + "ofa"));
283 model_->AddURL(of, 1, ASCIIToUTF16("ofb"), GURL(test_base + "ofb")); 283 model_->AddURL(of, 1, ASCIIToUTF16("ofb"), GURL(test_base + "ofb"));
284 const BookmarkNode* of2 = model_->AddFolder(model_->other_node(), 2, 284 const BookmarkNode* of2 = model_->AddFolder(model_->other_node(), 2,
285 ASCIIToUTF16("OF2")); 285 ASCIIToUTF16("OF2"));
286 model_->AddURL(of2, 0, ASCIIToUTF16("of2a"), GURL(test_base + "of2a")); 286 model_->AddURL(of2, 0, ASCIIToUTF16("of2a"), GURL(test_base + "of2a"));
287 model_->AddURL(of2, 1, ASCIIToUTF16("of2b"), GURL(test_base + "of2b")); 287 model_->AddURL(of2, 1, ASCIIToUTF16("of2b"), GURL(test_base + "of2b"));
288 } 288 }
289 289
290 gfx::Size bb_view_pref_; 290 gfx::Size bb_view_pref_;
291 ScopedTestingBrowserProcess testing_browser_process_;
292 scoped_ptr<TestingProfile> profile_; 291 scoped_ptr<TestingProfile> profile_;
293 scoped_ptr<Browser> browser_; 292 scoped_ptr<Browser> browser_;
294 BrowserThread ui_thread_; 293 BrowserThread ui_thread_;
295 BrowserThread file_thread_; 294 BrowserThread file_thread_;
296 ViewsDelegateImpl views_delegate_; 295 ViewsDelegateImpl views_delegate_;
297 }; 296 };
298 297
299 // Clicks on first menu, makes sure button is depressed. Moves mouse to first 298 // Clicks on first menu, makes sure button is depressed. Moves mouse to first
300 // child, clicks it and makes sure a navigation occurs. 299 // child, clicks it and makes sure a navigation occurs.
301 class BookmarkBarViewTest1 : public BookmarkBarViewEventTestBase { 300 class BookmarkBarViewTest1 : public BookmarkBarViewEventTestBase {
(...skipping 1274 matching lines...) Expand 10 before | Expand all | Expand 10 after
1576 ASSERT_TRUE(menu != NULL); 1575 ASSERT_TRUE(menu != NULL);
1577 ASSERT_TRUE(menu->GetSubmenu()->IsShowing()); 1576 ASSERT_TRUE(menu->GetSubmenu()->IsShowing());
1578 1577
1579 menu->GetMenuController()->CancelAll(); 1578 menu->GetMenuController()->CancelAll();
1580 1579
1581 Done(); 1580 Done();
1582 } 1581 }
1583 }; 1582 };
1584 1583
1585 VIEW_TEST(BookmarkBarViewTest19, SiblingMenu) 1584 VIEW_TEST(BookmarkBarViewTest19, SiblingMenu)
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698