[Mac] Touch Bar Support for Dialogs

chrome/browser/ui/cocoa/browser_window_touch_bar_unittest.mm

 // Copyright 2017 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/mac/foundation_util.h"
 #include "base/mac/mac_util.h"
 #include "base/mac/scoped_nsobject.h"
 #include "base/strings/sys_string_conversions.h"
 #include "base/test/scoped_feature_list.h"
 #include "chrome/app/chrome_command_ids.h"
 #import "chrome/browser/ui/cocoa/browser_window_controller.h"
 #import "chrome/browser/ui/cocoa/browser_window_touch_bar.h"
 #include "chrome/browser/ui/cocoa/test/cocoa_profile_test.h"
 #include "chrome/common/chrome_features.h"
 #include "chrome/common/pref_names.h"
 #include "components/prefs/pref_service.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #import "third_party/ocmock/OCMock/OCMock.h"
+#import "ui/base/cocoa/touch_bar_util.h"
 
 namespace {
 
 // Touch bar identifiers.
 NSString* const kBrowserWindowTouchBarId = @"browser-window";
 NSString* const kTabFullscreenTouchBarId = @"tab-fullscreen";
 
 // Touch bar items identifiers.
 NSString* const kBackForwardTouchId = @"BACK-FWD";
 NSString* const kReloadOrStopTouchId = @"RELOAD-STOP";
@@ skipping 20 matching lines @@
         isKindOfClass:[BrowserWindowController class]];
     [[bwc_ stub] invalidateTouchBar];
 
     touch_bar_.reset([[BrowserWindowTouchBar alloc] initWithBrowser:browser()
                                             browserWindowController:bwc_]);
   }
 
   id bwc() const { return bwc_; }
 
   NSString* GetFullscreenTouchBarItemId(NSString* id) {
-    return
-        [BrowserWindowTouchBar identifierForTouchBarId:kTabFullscreenTouchBarId
-                                                itemId:id];
+    return ui::GetTouchBarItemId(kTabFullscreenTouchBarId, id);
   }
 
   NSString* GetBrowserTouchBarItemId(NSString* id) {
-    return
-        [BrowserWindowTouchBar identifierForTouchBarId:kBrowserWindowTouchBarId
-                                                itemId:id];
+    return ui::GetTouchBarItemId(kBrowserWindowTouchBarId, id);
   }
 
   void TearDown() override { CocoaProfileTest::TearDown(); }
 
   // A mock BrowserWindowController object.
   id bwc_;
 
   // Used to enable the the browser window touch bar.
   base::test::ScopedFeatureList feature_list;
 
@@ skipping 70 matching lines @@
   NSTouchBarItem* item =
       [touch_bar_ touchBar:touch_bar
           makeItemForIdentifier:GetBrowserTouchBarItemId(kReloadOrStopTouchId)];
   EXPECT_EQ(IDC_RELOAD, [[item view] tag]);
 
   [touch_bar_ setIsPageLoading:YES];
   item = [touch_bar_ touchBar:touch_bar
         makeItemForIdentifier:GetBrowserTouchBarItemId(kReloadOrStopTouchId)];
   EXPECT_EQ(IDC_STOP, [[item view] tag]);
 }