chrome/browser/ui/cocoa/bookmarks/bookmark_sync_promo_controller_unittest.mm - Issue 1038423004: Reland of: Change default code flag to NewAvatarMenu.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/cocoa/bookmarks/bookmark_sync_promo_controller_unittest.mm

Issue 1038423004: Reland of: Change default code flag to NewAvatarMenu. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Rebase Created 5 years, 9 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 side-by-side diff with in-line comments

Download patch

« chrome/browser/profiles/profile_avatar_downloader.cc ('K') | « chrome/browser/ui/bookmarks/bookmark_bubble_sign_in_delegate_browsertest.cc ('k') | chrome/browser/ui/cocoa/profiles/avatar_icon_controller_unittest.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/cocoa/bookmarks/bookmark_sync_promo_controller_unittest.mm

diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_sync_promo_controller_unittest.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_sync_promo_controller_unittest.mm

index 90160c16f5ebb65a72dbc774ae73b6f724ca801f..2a82c2f543fcbd8a741c91d2913b53f38a0ae8da 100644

--- a/chrome/browser/ui/cocoa/bookmarks/bookmark_sync_promo_controller_unittest.mm

+++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_sync_promo_controller_unittest.mm

@@ -14,6 +14,7 @@

#include "chrome/browser/ui/browser.h"

#include "chrome/browser/ui/tabs/tab_strip_model.h"

#include "chrome/test/base/browser_with_test_window_test.h"

+#include "components/signin/core/common/profile_management_switches.h"

#include "testing/gtest/include/gtest/gtest.h"

namespace {

@@ -21,6 +22,8 @@ namespace {

class BookmarkSyncPromoControllerTest : public BrowserWithTestWindowTest {

public:

void SetUp() override {

+ switches::DisableNewAvatarMenuForTesting(

+ base::CommandLine::ForCurrentProcess());

BrowserWithTestWindowTest::SetUp();

ASSERT_TRUE(profile());

// Adds TestExtensionSystem, since signin uses the gaia auth extension.