Revert 277793 "Enable consistent identity on android platform by..."

chrome/browser/ui/views/frame/opaque_browser_frame_view_layout_unittest.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/views/frame/opaque_browser_frame_view_layout.h"
 
 #include "base/basictypes.h"
 #include "base/command_line.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/ui/views/profiles/avatar_label.h"
 #include "chrome/browser/ui/views/profiles/avatar_menu_button.h"
 #include "chrome/browser/ui/views/tab_icon_view.h"
 #include "chrome/browser/ui/views/tabs/tab.h"
 #include "chrome/common/chrome_switches.h"
-#include "components/signin/core/common/profile_management_switches.h"
 #include "ui/gfx/image/image_skia.h"
 #include "ui/gfx/image/image_skia_rep.h"
 #include "ui/gfx/text_constants.h"
 #include "ui/views/controls/button/image_button.h"
 #include "ui/views/controls/button/menu_button.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/test/views_test_base.h"
 
 using views::Widget;
 
@@ skipping 481 matching lines @@
                 delegate_->GetTabstripPreferredSize(), kWidth).ToString());
   EXPECT_EQ("251x61", layout_manager_->GetMinimumSize(kWidth).ToString());
 
   // A normal window with no window icon still produces icon bounds for
   // Windows, which has a hidden icon that a user can double click on to close
   // the window.
   EXPECT_EQ("2,0 17x17", layout_manager_->IconBounds().ToString());
 }
 
 TEST_F(OpaqueBrowserFrameViewLayoutTest, WindowWithNewAvatar) {
-  switches::EnableNewProfileManagementForTesting(
-      CommandLine::ForCurrentProcess());
+  CommandLine::ForCurrentProcess()->AppendSwitch(
+      switches::kNewProfileManagement);
 
   // Tests a normal tabstrip window with the new style avatar icon.
   AddNewAvatarButton();
   root_view_->Layout();
 
   ExpectBasicWindowBounds();
 
   // Check the location of the caption button
   EXPECT_EQ("385,1 12x20", new_avatar_button_->bounds().ToString());
   // The basic window bounds are (-1, 13 398x29). There should not be an icon
@@ skipping 13 matching lines @@
 
   // Check the location of the avatar label relative to the avatar button if
   // both are displayed on the left side.
   // The label height and width depends on the font size and the text displayed.
   // This may possibly change, so we don't test it here.
   EXPECT_EQ(menu_button_->bounds().x() - 2, avatar_label_->bounds().x());
   EXPECT_EQ(
       menu_button_->bounds().bottom() - 3 - avatar_label_->bounds().height(),
       avatar_label_->bounds().y());
 }