DO NOT COMMIT - Unrelated changes made by run-clang-tidy.py

chrome/browser/extensions/browser_action_test_util.h

 // Copyright (c) 2010 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.
 
 #ifndef CHROME_BROWSER_EXTENSIONS_BROWSER_ACTION_TEST_UTIL_H_
 #define CHROME_BROWSER_EXTENSIONS_BROWSER_ACTION_TEST_UTIL_H_
 
 #include <stddef.h>
 
 #include <memory>
@@ skipping 51 matching lines @@
 
   // Simulates a user click on the browser action button at |index|.
   void Press(int index);
 
   // Returns the extension id of the extension at |index|.
   std::string GetExtensionId(int index);
 
   // Returns the current tooltip for the browser action button.
   std::string GetTooltip(int index);
 
-  gfx::NativeView GetPopupNativeView();
+  gfx::NativeViewId GetPopupNativeView();
 
   // Returns whether a browser action popup is being shown currently.
   bool HasPopup();
 
   // Returns the size of the current browser action popup.
   gfx::Size GetPopupSize();
 
   // Hides the given popup and returns whether the hide was successful.
   bool HidePopup();
 
@@ skipping 26 matching lines @@
   Browser* browser_;  // weak
 
   // Our test helper, which constructs and owns the views if we don't have a
   // real browser window, or if this is an overflow version.
   std::unique_ptr<TestToolbarActionsBarHelper> test_helper_;
 
   DISALLOW_COPY_AND_ASSIGN(BrowserActionTestUtil);
 };
 
 #endif  // CHROME_BROWSER_EXTENSIONS_BROWSER_ACTION_TEST_UTIL_H_