Revert of [Mac] Flip toolbar in RTL

chrome/browser/ui/cocoa/toolbar/toolbar_controller_unittest.mm

 // Copyright (c) 2012 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.
 
 #import <Cocoa/Cocoa.h>
 
-#include "base/command_line.h"
 #import "base/mac/scoped_nsobject.h"
 #include "base/macros.h"
 #include "base/run_loop.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/command_updater.h"
-#include "chrome/browser/extensions/extension_action_test_util.h"
-#include "chrome/browser/extensions/extension_service.h"
-#include "chrome/browser/extensions/test_extension_system.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_command_controller.h"
 #include "chrome/browser/ui/browser_commands.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/browser_list_observer.h"
 #import "chrome/browser/ui/cocoa/image_button_cell.h"
-#import "chrome/browser/ui/cocoa/extensions/browser_actions_controller.h"
 #import "chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h"
 #import "chrome/browser/ui/cocoa/location_bar/translate_decoration.h"
 #include "chrome/browser/ui/cocoa/test/cocoa_profile_test.h"
-#include "chrome/browser/ui/cocoa/test/scoped_force_rtl_mac.h"
 #import "chrome/browser/ui/cocoa/toolbar/toolbar_controller.h"
-#include "chrome/browser/ui/toolbar/toolbar_actions_bar.h"
-#include "chrome/browser/ui/toolbar/toolbar_actions_model.h"
 #import "chrome/browser/ui/cocoa/view_resizer_pong.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/test/base/testing_profile.h"
 #include "components/prefs/pref_service.h"
-#include "extensions/browser/extension_system.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #import "testing/gtest_mac.h"
 #include "testing/platform_test.h"
 
 // An NSView that fakes out hitTest:.
 @interface HitView : NSView {
   id hitTestReturn_;
 }
 @end
 
@@ skipping 31 matching lines @@
 @end
 
 namespace {
 
 class ToolbarControllerTest : public CocoaProfileTest {
  public:
 
   // Indexes that match the ordering returned by the private ToolbarController
   // |-toolbarViews| method.
   enum SubviewIndex {
-    kBackIndex,
-    kForwardIndex,
-    kReloadIndex,
-    kHomeIndex,
-    kLocationIndex,
-    kBrowserActionContainerViewIndex,
-    kAppMenuIndex
+    kBackIndex, kForwardIndex, kReloadIndex, kHomeIndex,
+    kAppMenuIndex, kLocationIndex, kBrowserActionContainerViewIndex
   };
 
   void SetUp() override {
     CocoaProfileTest::SetUp();
     ASSERT_TRUE(browser());
 
-    // Add an extension so the browser action container view
-    // is visible and has a real size/position.
-    extensions::TestExtensionSystem* extension_system =
-        static_cast<extensions::TestExtensionSystem*>(
-            extensions::ExtensionSystem::Get(profile()));
-    extension_system->CreateExtensionService(
-        base::CommandLine::ForCurrentProcess(), base::FilePath(), false);
-    scoped_refptr<const extensions::Extension> extension =
-        extensions::extension_action_test_util::CreateActionExtension(
-            "ABC", extensions::extension_action_test_util::BROWSER_ACTION);
-    extensions::ExtensionSystem::Get(profile())
-        ->extension_service()
-        ->AddExtension(extension.get());
-    ToolbarActionsModel* model =
-        extensions::extension_action_test_util::CreateToolbarModelForProfile(
-            profile());
-    model->SetVisibleIconCount(1);
-
     resizeDelegate_.reset([[ViewResizerPong alloc] init]);
 
     CommandUpdater* updater =
         browser()->command_controller()->command_updater();
     // The default state for the commands is true, set a couple to false to
     // ensure they get picked up correct on initialization
     updater->UpdateCommandEnabled(IDC_BACK, false);
     updater->UpdateCommandEnabled(IDC_FORWARD, false);
     bar_.reset([[TestToolbarController alloc]
         initWithCommands:browser()->command_controller()->command_updater()
                  profile:profile()
                  browser:browser()
           resizeDelegate:resizeDelegate_.get()]);
     EXPECT_TRUE([bar_ view]);
     NSView* parent = [test_window() contentView];
     [parent addSubview:[bar_ view]];
-
-    // Nudge a few things to ensure the browser actions container gets
-    // laid out.
-    [bar_ createBrowserActionButtons];
-    [[bar_ browserActionsController] update];
-    [bar_ toolbarFrameChanged];
   }
 
   void TearDown() override {
     // Releasing ToolbarController doesn't actually free it at this point, since
     // the NSViewController retains a reference to it from the nib loading.
     // As browser() is released in the superclass TearDown, call
     // -[ToolbarController browserWillBeDestroyed] to prevent a use after free
     // issue on the |browser_| pointer in LocationBarViewMac when
     // ToolbarController is actually freed (some time after this method is run).
     [bar_ browserWillBeDestroyed];
@@ skipping 59 matching lines @@
             [GetSubviewAt(kLocationIndex) frame].size.height);
   EXPECT_GT([[bar_ view] frame].size.width,
             [GetSubviewAt(kLocationIndex) frame].size.width);
   EXPECT_FALSE([view isHidden]);
   EXPECT_FALSE([GetSubviewAt(kLocationIndex) isHidden]);
   EXPECT_FALSE([GetSubviewAt(kBackIndex) isHidden]);
   EXPECT_FALSE([GetSubviewAt(kForwardIndex) isHidden]);
   EXPECT_FALSE([GetSubviewAt(kReloadIndex) isHidden]);
   EXPECT_FALSE([GetSubviewAt(kAppMenuIndex) isHidden]);
   EXPECT_TRUE([GetSubviewAt(kHomeIndex) isHidden]);
-  EXPECT_FALSE([GetSubviewAt(kBrowserActionContainerViewIndex) isHidden]);
+  EXPECT_TRUE([GetSubviewAt(kBrowserActionContainerViewIndex) isHidden]);
 
   // For NO/NO, only the top level toolbar view is hidden.
   [bar_ setHasToolbar:NO hasLocationBar:NO];
   EXPECT_TRUE([view isHidden]);
   EXPECT_FALSE([GetSubviewAt(kLocationIndex) isHidden]);
   EXPECT_FALSE([GetSubviewAt(kBackIndex) isHidden]);
   EXPECT_FALSE([GetSubviewAt(kForwardIndex) isHidden]);
   EXPECT_FALSE([GetSubviewAt(kReloadIndex) isHidden]);
   EXPECT_FALSE([GetSubviewAt(kAppMenuIndex) isHidden]);
   EXPECT_TRUE([GetSubviewAt(kHomeIndex) isHidden]);
-  EXPECT_FALSE([GetSubviewAt(kBrowserActionContainerViewIndex) isHidden]);
+  EXPECT_TRUE([GetSubviewAt(kBrowserActionContainerViewIndex) isHidden]);
 
   // Now test the inescapable state.
   [bar_ setHasToolbar:NO hasLocationBar:YES];
   EXPECT_GT([[bar_ view] frame].size.height, 0);
   EXPECT_EQ([[bar_ view] frame].size.height,
             [GetSubviewAt(kLocationIndex) frame].size.height);
   EXPECT_EQ([[bar_ view] frame].size.width,
             [GetSubviewAt(kLocationIndex) frame].size.width);
   EXPECT_FALSE([view isHidden]);
   EXPECT_FALSE([GetSubviewAt(kLocationIndex) isHidden]);
@@ skipping 182 matching lines @@
   base::scoped_nsobject<ImageButtonCell> cell(
       [[ImageButtonCell alloc] init]);
   [button setCell:cell.get()];
   EXPECT_TRUE([bar_ hoverButtonForEvent:nil]);
 
   // Restore the original view so that
   // -[ToolbarController browserWillBeDestroyed] will run correctly.
   [bar_ setView:toolbarView];
 }
 
-// Test that subviews are ordered left to right
-TEST_F(ToolbarControllerTest, ElementOrder) {
-  NSArray* views = [bar_ toolbarViews];
-  for (size_t i = 1; i < [views count]; i++) {
-    NSView* previousSubview = views[i - 1];
-    NSView* subview = views[i];
-    EXPECT_LE(NSMinX([previousSubview frame]), NSMinX([subview frame]));
-  }
-}
-
-class ToolbarControllerRTLTest : public ToolbarControllerTest {
- public:
-  ToolbarControllerRTLTest() {}
-
- private:
-  cocoa_l10n_util::ScopedForceRTLMac rtl_;
-
-  DISALLOW_COPY_AND_ASSIGN(ToolbarControllerRTLTest);
-};
-
-// Test that subviews are ordered right to left
-TEST_F(ToolbarControllerRTLTest, ElementOrder) {
-  NSArray* views = [[[bar_ toolbarViews] reverseObjectEnumerator] allObjects];
-  for (size_t i = 1; i < [views count]; i++) {
-    NSView* previousSubview = views[i - 1];
-    NSView* subview = views[i];
-    EXPECT_LE(NSMinX([previousSubview frame]), NSMinX([subview frame]));
-  }
-}
-
 class BrowserRemovedObserver : public chrome::BrowserListObserver {
  public:
   BrowserRemovedObserver() { BrowserList::AddObserver(this); }
   ~BrowserRemovedObserver() override { BrowserList::RemoveObserver(this); }
   void WaitUntilBrowserRemoved() { run_loop_.Run(); }
   void OnBrowserRemoved(Browser* browser) override { run_loop_.Quit(); }
 
  private:
   base::RunLoop run_loop_;
 
   DISALLOW_COPY_AND_ASSIGN(BrowserRemovedObserver);
 };
 
 }  // namespace