Integrate About page into Settings for Chrome OS settings in a window.

chrome/browser/ui/webui/options/options_ui_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 "chrome/browser/ui/webui/options/options_ui_browsertest.h"
 
 #include "base/prefs/pref_service.h"
 #include "base/scoped_observer.h"
 #include "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 98 matching lines @@
 
 void OptionsUIBrowserTest::NavigateToSettingsSubpage(
     const std::string& sub_page) {
   const GURL& url = chrome::GetSettingsUrl(sub_page);
   ui_test_utils::NavigateToURLWithDisposition(browser(), url, CURRENT_TAB, 0);
 
   content::WebContents* web_contents =
       browser()->tab_strip_model()->GetActiveWebContents();
   ASSERT_TRUE(web_contents);
   ASSERT_TRUE(web_contents->GetWebUI());
-  UberUI* uber_ui = static_cast<UberUI*>(
-      web_contents->GetWebUI()->GetController());
-  OptionsUI* options_ui = static_cast<OptionsUI*>(
-      uber_ui->GetSubpage(chrome::kChromeUISettingsFrameURL)->GetController());
+
+  content::WebUIController* controller =
+      web_contents->GetWebUI()->GetController();
+#if !defined(OS_CHROMEOS)
+  controller = static_cast<UberUI*>(controller)->
+      GetSubpage(chrome::kChromeUISettingsFrameURL)->GetController();
+#endif
+  OptionsUI* options_ui = static_cast<OptionsUI*>(controller);
 
   // It is not possible to subscribe to the OnFinishedLoading event before the
   // call to NavigateToURL(), because the WebUI does not yet exist at that time.
   // However, it is safe to subscribe afterwards, because the event will always
   // be posted asynchronously to the message loop.
   scoped_refptr<MessageLoopRunner> message_loop_runner(new MessageLoopRunner);
   scoped_ptr<OptionsUI::OnFinishedLoadingCallbackList::Subscription>
       subscription = options_ui->RegisterOnFinishedLoadingCallback(
           message_loop_runner->QuitClosure());
   message_loop_runner->Run();
 
   // The OnFinishedLoading event, which indicates that all WebUI initialization
   // methods have been called on the JS side, is temporally unrelated to whether
   // or not the WebContents considers itself to have finished loading. We want
   // to wait for this too, however, because, e.g. this is a sufficient condition
   // to get the focus properly placed on a form element.
   content::WaitForLoadStop(web_contents);
 }
 
 void OptionsUIBrowserTest::NavigateToSettingsFrame() {
   const GURL& url = GURL(chrome::kChromeUISettingsFrameURL);
   ui_test_utils::NavigateToURL(browser(), url);
 }
 
 void OptionsUIBrowserTest::VerifyNavbar() {
   bool navbar_exist = false;
+  bool should_navbar_exist;
+#if defined(OS_CHROMEOS)
+  should_navbar_exist = false;
+#else
+  should_navbar_exist = true;
+#endif

[Dan Beam, 2014/08/07 22:36:16]

#if defined(OS_CHROMEOS)
  bool should_navbar_exist = false;
#else
  bool should_navbar_exist = true;
#endif

[michaelpg, 2014/08/08 01:10:46]

Done.

   EXPECT_TRUE(content::ExecuteScriptAndExtractBool(
       browser()->tab_strip_model()->GetActiveWebContents(),
       "domAutomationController.send("
       "    !!document.getElementById('navigation'))",
       &navbar_exist));
-  EXPECT_EQ(true, navbar_exist);
+  EXPECT_EQ(should_navbar_exist, navbar_exist);
 }
 
 void OptionsUIBrowserTest::VerifyTitle() {
   base::string16 title =
       browser()->tab_strip_model()->GetActiveWebContents()->GetTitle();
   base::string16 expected_title = l10n_util::GetStringUTF16(IDS_SETTINGS_TITLE);
   EXPECT_NE(title.find(expected_title), base::string16::npos);
 }
 
 content::RenderFrameHost* OptionsUIBrowserTest::GetSettingsFrame() {
@@ skipping 156 matching lines @@
   run_loop.Run();
 
   // Verify that the settings page has updated and lists two profiles.
   ASSERT_TRUE(content::ExecuteScriptAndExtractInt(
       contents, javascript, &profiles));
   EXPECT_EQ(2, profiles);
 }
 #endif
 
 }  // namespace options