Inactive toast ux changes

chrome/browser/first_run/try_chrome_dialog_browsertest.cc

 // 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.
 
 #include "base/command_line.h"
 #include "build/build_config.h"
 #include "chrome/browser/ui/test/test_browser_dialog.h"
 #include "chrome/common/chrome_result_codes.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "ui/base/ui_base_switches.h"
 
 // Unfortunately, this needs to be Windows only for now. Even though this test
 // is meant to exercise code that is for Windows only, it is a good general
 // canary in the coal mine for problems related to early shutdown (aborted
 // startup). Sadly, it times out on platforms other than Windows, so I can't
 // enable it for those platforms at the moment. I hope one day our test harness
 // will be improved to support this so we can get coverage on other platforms.
 // See http://crbug.com/45115 for details.
 #if defined(OS_WIN)
-#include "chrome/browser/ui/views/try_chrome_dialog_view.h"
+#include "chrome/browser/ui/views/try_chrome_dialog.h"
 
 // By passing kTryChromeAgain with a magic value > 10000 we cause Chrome
 // to exit fairly early.
 // Quickly exiting Chrome (regardless of this particular flag -- it
 // doesn't do anything other than cause Chrome to quit on startup on
 // non-Windows) was a cause of crashes (see bug 34799 for example) so
 // this is a useful test of the startup/quick-shutdown cycle.
 class TryChromeDialogBrowserTest : public InProcessBrowserTest {
-public:
+ public:
   TryChromeDialogBrowserTest() {
     set_expected_exit_code(chrome::RESULT_CODE_NORMAL_EXIT_CANCEL);
   }
 
-protected:
- void SetUpCommandLine(base::CommandLine* command_line) override {
+ protected:
+  void SetUpCommandLine(base::CommandLine* command_line) override {
     command_line->AppendSwitchASCII(switches::kTryChromeAgain, "10001");
   }
 };
 
 // Note to Sheriffs: This test (as you can read about above) simply causes
 // Chrome to shutdown early, and, as such, has proven to be pretty good at
 // finding problems related to shutdown. Sheriff, before marking this test as
 // disabled, please consider that this test is meant to catch when people
 // introduce changes that crash Chrome during shutdown and disabling this test
 // and moving on removes a safeguard meant to avoid an even bigger thorny mess
@@ skipping 16 matching lines @@
  public:
   // TODO(ananta)
   // Provide a way to test flavors other than 0.
   TryChromeDialogTest() : dialog_(0) {}
 
   static void DialogHandler(gfx::NativeWindow active_dialog) {}
 
   // DialogBrowserTest:
   void ShowDialog(const std::string& name) override {
     dialog_.ShowDialog(base::Bind(&TryChromeDialogTest::DialogHandler),
-                       TryChromeDialogView::kDialogType::MODELESS,
-                       TryChromeDialogView::kUsageType::FOR_TESTING);
+                       TryChromeDialog::DialogType::MODELESS_FOR_TEST,
+                       TryChromeDialog::UsageType::FOR_TESTING);
   }
 
   // content::BrowserTestBase:
   void SetUpCommandLine(base::CommandLine* command_line) override {
     command_line->AppendSwitch(switches::kExtendMdToSecondaryUi);
   }
 
  private:
-  TryChromeDialogView dialog_;
+  TryChromeDialog dialog_;
 
   DISALLOW_COPY_AND_ASSIGN(TryChromeDialogTest);
 };
 
 IN_PROC_BROWSER_TEST_F(TryChromeDialogTest, InvokeDialog_default) {
   RunDialog();
 }
 
 #endif  // defined(OS_WIN)