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

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

Issue 490123003: Move bookmark_pref_names.* into bookmarks namespace. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: REBASE Created 6 years, 3 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
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/bind.h" 5 #include "base/bind.h"
6 #include "base/callback.h" 6 #include "base/callback.h"
7 #include "base/compiler_specific.h" 7 #include "base/compiler_specific.h"
8 #include "base/prefs/pref_service.h" 8 #include "base/prefs/pref_service.h"
9 #include "base/strings/string_number_conversions.h" 9 #include "base/strings/string_number_conversions.h"
10 #include "base/strings/utf_string_conversions.h" 10 #include "base/strings/utf_string_conversions.h"
(...skipping 247 matching lines...) Expand 10 before | Expand all | Expand 10 after
258 browser_content_client_.reset(new chrome::ChromeContentBrowserClient()); 258 browser_content_client_.reset(new chrome::ChromeContentBrowserClient());
259 content::SetBrowserClientForTesting(browser_content_client_.get()); 259 content::SetBrowserClientForTesting(browser_content_client_.get());
260 260
261 views::MenuController::TurnOffMenuSelectionHoldForTest(); 261 views::MenuController::TurnOffMenuSelectionHoldForTest();
262 BookmarkBarView::DisableAnimationsForTesting(true); 262 BookmarkBarView::DisableAnimationsForTesting(true);
263 263
264 profile_.reset(new TestingProfile()); 264 profile_.reset(new TestingProfile());
265 profile_->CreateBookmarkModel(true); 265 profile_->CreateBookmarkModel(true);
266 model_ = BookmarkModelFactory::GetForProfile(profile_.get()); 266 model_ = BookmarkModelFactory::GetForProfile(profile_.get());
267 test::WaitForBookmarkModelToLoad(model_); 267 test::WaitForBookmarkModelToLoad(model_);
268 profile_->GetPrefs()->SetBoolean(prefs::kShowBookmarkBar, true); 268 profile_->GetPrefs()->SetBoolean(bookmarks::prefs::kShowBookmarkBar, true);
269 269
270 Browser::CreateParams native_params(profile_.get(), 270 Browser::CreateParams native_params(profile_.get(),
271 chrome::GetActiveDesktop()); 271 chrome::GetActiveDesktop());
272 browser_.reset( 272 browser_.reset(
273 chrome::CreateBrowserWithTestWindowForParams(&native_params)); 273 chrome::CreateBrowserWithTestWindowForParams(&native_params));
274 274
275 local_state_.reset(new ScopedTestingLocalState( 275 local_state_.reset(new ScopedTestingLocalState(
276 TestingBrowserProcess::GetGlobal())); 276 TestingBrowserProcess::GetGlobal()));
277 model_->ClearStore(); 277 model_->ClearStore();
278 278
(...skipping 1718 matching lines...) Expand 10 before | Expand all | Expand 10 after
1997 EXPECT_TRUE(bb_view_->GetContextMenu() == NULL); 1997 EXPECT_TRUE(bb_view_->GetContextMenu() == NULL);
1998 EXPECT_TRUE(bb_view_->GetMenu() == NULL); 1998 EXPECT_TRUE(bb_view_->GetMenu() == NULL);
1999 1999
2000 Done(); 2000 Done();
2001 } 2001 }
2002 2002
2003 BookmarkContextMenuNotificationObserver observer_; 2003 BookmarkContextMenuNotificationObserver observer_;
2004 }; 2004 };
2005 2005
2006 VIEW_TEST(BookmarkBarViewTest21, ContextMenusForEmptyFolder) 2006 VIEW_TEST(BookmarkBarViewTest21, ContextMenusForEmptyFolder)
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698