Description: Replace layout constants in chrome/browser/extensions and chrome/browser/first_run

chrome/browser/ui/views/try_chrome_dialog_view.h

 // 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.
 
-#ifndef CHROME_BROWSER_FIRST_RUN_TRY_CHROME_DIALOG_VIEW_H_
-#define CHROME_BROWSER_FIRST_RUN_TRY_CHROME_DIALOG_VIEW_H_
+#ifndef CHROME_BROWSER_UI_VIEWS_TRY_CHROME_DIALOG_VIEW_H_
+#define CHROME_BROWSER_UI_VIEWS_TRY_CHROME_DIALOG_VIEW_H_
 
 #include <stddef.h>
 
 #include "base/compiler_specific.h"
 #include "base/macros.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/geometry/size.h"
 #include "ui/gfx/native_widget_types.h"
 #include "ui/views/controls/button/button.h"
 #include "ui/views/controls/link_listener.h"
@@ skipping 84 matching lines @@
   // views::ButtonListener:
   // We have two buttons and according to what the user clicked we set |result_|
   // and we should always close and end the modal loop.
   void ButtonPressed(views::Button* sender, const ui::Event& event) override;
 
   // views::LinkListener:
   // If the user selects the link we need to fire off the default browser that
   // by some convoluted logic should not be chrome.
   void LinkClicked(views::Link* source, int event_flags) override;
 
+  friend class TryChromeDialogTest;

[Peter Kasting, 2017/04/28 06:16:41]

Nit: Friend declarations typically go at the top of the section

[ananta, 2017/04/28 14:57:01]

no longer needed with the force parameter.

+
   // Controls which flavor of the heading text to use.
   size_t flavor_;
 
   // We don't own any of these pointers. The |popup_| owns itself and owns the
   // other views.
   views::Widget* popup_;
   views::RadioButton* try_chrome_;
   views::RadioButton* kill_chrome_;
   views::RadioButton* dont_try_chrome_;
   views::Checkbox* make_default_;
   Result result_;
+  static bool for_testing_;
 
   DISALLOW_COPY_AND_ASSIGN(TryChromeDialogView);
 };
 
-#endif  // CHROME_BROWSER_FIRST_RUN_TRY_CHROME_DIALOG_VIEW_H_
+#endif  // CHROME_BROWSER_UI_VIEWS_TRY_CHROME_DIALOG_VIEW_H_