[Mac] Reverse bookmark buttons and menus in RTL (take 2)

chrome/browser/ui/cocoa/bookmarks/bookmark_button_cell_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 "chrome/browser/ui/cocoa/bookmarks/bookmark_button_cell.h"
 #include "base/mac/scoped_nsobject.h"
 #include "base/strings/sys_string_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
+#include "chrome/browser/ui/cocoa/l10n_util.h"
 #include "chrome/browser/ui/cocoa/test/cocoa_profile_test.h"
 #import "chrome/browser/ui/cocoa/test/cocoa_test_helper.h"
 #include "chrome/test/base/testing_profile.h"
 #include "components/bookmarks/browser/bookmark_model.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/platform_test.h"
 #include "ui/base/material_design/material_design_controller.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/image/image.h"
 #include "ui/resources/grit/ui_resources.h"
@@ skipping 130 matching lines @@
     [cell mouseExited:event];
   EXPECT_EQ(button.get()->enters_, 1);
   EXPECT_EQ(button.get()->exits_, 3);
 }
 
 // Confirms a cell created in a nib is initialized properly
 TEST_F(BookmarkButtonCellTest, Awake) {
   base::scoped_nsobject<BookmarkButtonCell> cell(
       [[BookmarkButtonCell alloc] init]);
   [cell awakeFromNib];
-  EXPECT_EQ(NSLeftTextAlignment, [cell alignment]);
+  EXPECT_EQ(NSNaturalTextAlignment, [cell alignment]);
 }
 
 // Subfolder arrow details.
 TEST_F(BookmarkButtonCellTest, FolderArrow) {
   BookmarkModel* model = BookmarkModelFactory::GetForBrowserContext(profile());
   const BookmarkNode* bar = model->bookmark_bar_node();
   const BookmarkNode* node = model->AddURL(bar, bar->child_count(),
                                            base::ASCIIToUTF16("title"),
                                            GURL("http://www.google.com"));
   base::scoped_nsobject<BookmarkButtonCell> cell(
@@ skipping 68 matching lines @@
   base::scoped_nsobject<BookmarkButtonCell> bookmark_cell(
       [[BookmarkButtonCell alloc] initForNode:node_a
                                          text:nil
                                         image:image
                                menuController:nil]);
   EXPECT_CGFLOAT_EQ([bookmark_cell cellSize].width, width_for_node_a);
   [bookmark_cell setBookmarkNode:node_b image:image];
   EXPECT_CGFLOAT_EQ([bookmark_cell cellSize].width, width_for_node_b);
 }
 }  // namespace