Show location for bookmark apps that have navigated across origin.

chrome/browser/ui/browser_browsertest.cc

 // Copyright 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 <string>
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/files/file_path.h"
@@ skipping 31 matching lines @@
 #include "chrome/browser/ui/browser_tabstrip.h"
 #include "chrome/browser/ui/browser_ui_prefs.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/extensions/app_launch_params.h"
 #include "chrome/browser/ui/extensions/application_launch.h"
 #include "chrome/browser/ui/host_desktop.h"
 #include "chrome/browser/ui/startup/startup_browser_creator.h"
 #include "chrome/browser/ui/startup/startup_browser_creator_impl.h"
 #include "chrome/browser/ui/tabs/pinned_tab_codec.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
+#include "chrome/browser/web_applications/web_app.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/extensions/manifest_handlers/app_launch_info.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/grit/chromium_strings.h"
 #include "chrome/grit/generated_resources.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/test_switches.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "components/app_modal/app_modal_dialog.h"
@@ skipping 1317 matching lines @@
   ASSERT_TRUE(app_browser);
   ASSERT_TRUE(app_browser != browser());
 
   EXPECT_FALSE(
       dev_tools_browser->SupportsWindowFeature(Browser::FEATURE_LOCATIONBAR));
   EXPECT_FALSE(
       app_browser->SupportsWindowFeature(Browser::FEATURE_LOCATIONBAR));
 
   DevToolsWindowTesting::CloseDevToolsWindowSync(devtools_window);
 }
+
+// Check that the location bar is shown correctly for bookmark apps.
+IN_PROC_BROWSER_TEST_F(BrowserTest, ShouldShowLocationBarForBookmarkApp) {
+  base::CommandLine::ForCurrentProcess()->AppendSwitch(
+      switches::kEnableNewBookmarkApps);
+  ASSERT_TRUE(test_server()->Start());
+
+  // Setup the test server.
+  host_resolver()->AddRule("www.foo.com", "127.0.0.1");
+  host_resolver()->AddRule("www.example.com", "127.0.0.1");
+
+  // Load a http bookmark app.
+  const Extension* http_bookmark_app = InstallExtensionWithSourceAndFlags(
+      test_data_dir_.AppendASCII("app/"),
+      1,
+      extensions::Manifest::INTERNAL,
+      extensions::Extension::FROM_BOOKMARK);
+  ASSERT_TRUE(http_bookmark_app);
+
+  // Load a https bookmark app.
+  const Extension* https_bookmark_app = InstallExtensionWithSourceAndFlags(
+      test_data_dir_.AppendASCII("https_app/"),
+      1,
+      extensions::Manifest::INTERNAL,
+      extensions::Extension::FROM_BOOKMARK);
+  ASSERT_TRUE(https_bookmark_app);
+
+  // Load a https bookmark app.
+
+  // Launch them in window.
+  WebContents* app_window = OpenApplication(AppLaunchParams(
+      browser()->profile(), http_bookmark_app,
+      extensions::LAUNCH_CONTAINER_WINDOW, NEW_WINDOW,
+      extensions::SOURCE_TEST));
+  ASSERT_TRUE(app_window);
+  app_window = OpenApplication(AppLaunchParams(
+      browser()->profile(), https_bookmark_app,
+      extensions::LAUNCH_CONTAINER_WINDOW, NEW_WINDOW,
+      extensions::SOURCE_TEST));
+  ASSERT_TRUE(app_window);
+
+  // Find the new browsers.
+  Browser* http_app_browser = NULL;
+  Browser* https_app_browser = NULL;
+  for (chrome::BrowserIterator it; !it.done(); it.Next()) {
+    if (*it == browser()) {
+      continue;
+    } else if (web_app::GetExtensionIdFromApplicationName((*it)->app_name()) ==

[Lei Zhang, 2015/03/19 01:31:25]

Just call GetExtensionIdFromApplicationName() once and check the result?

[benwells, 2015/03/19 03:51:21]

Done.

+               http_bookmark_app->id()) {
+      http_app_browser = *it;
+    } else if (web_app::GetExtensionIdFromApplicationName((*it)->app_name()) ==
+               https_bookmark_app->id()) {
+      https_app_browser = *it;
+    }
+  }
+  ASSERT_TRUE(http_app_browser);
+  ASSERT_TRUE(https_app_browser);
+  ASSERT_TRUE(http_app_browser != browser());
+  ASSERT_TRUE(https_app_browser != browser());
+  ASSERT_TRUE(http_app_browser != https_app_browser);
+
+  // Navigate to the app's launch page; the location bar should be hidden.
+  GURL url("http://www.example.com/empty.html");
+  ui_test_utils::NavigateToURL(http_app_browser, url);
+  EXPECT_FALSE(
+      http_app_browser->SupportsWindowFeature(Browser::FEATURE_LOCATIONBAR));
+  url = GURL("https://www.example.com/empty.html");
+  ui_test_utils::NavigateToURL(https_app_browser, url);
+  EXPECT_FALSE(
+      https_app_browser->SupportsWindowFeature(Browser::FEATURE_LOCATIONBAR));
+
+  // Navigate to another page on the same origin; the location bar should still
+  // hidden.
+  url = GURL("http://www.example.com/blah");
+  ui_test_utils::NavigateToURL(http_app_browser, url);
+  EXPECT_FALSE(
+      http_app_browser->SupportsWindowFeature(Browser::FEATURE_LOCATIONBAR));
+  url = GURL("https://www.example.com/blah");
+  ui_test_utils::NavigateToURL(http_app_browser, url);
+  EXPECT_FALSE(
+      https_app_browser->SupportsWindowFeature(Browser::FEATURE_LOCATIONBAR));
+
+  // Navigate to the https version of the site; the location bar should
+  // be hidden for both browsers.
+  url = GURL("https://www.example.com/blah");
+  ui_test_utils::NavigateToURL(http_app_browser, url);
+  EXPECT_FALSE(
+      http_app_browser->SupportsWindowFeature(Browser::FEATURE_LOCATIONBAR));
+  ui_test_utils::NavigateToURL(https_app_browser, url);
+  EXPECT_FALSE(
+      https_app_browser->SupportsWindowFeature(Browser::FEATURE_LOCATIONBAR));
+
+  // Navigate to the http version of the site; the location bar should
+  // be visible for the https version as it is now on a less secure version
+  // of its host.
+  url = GURL("http://www.example.com/blah");
+  ui_test_utils::NavigateToURL(http_app_browser, url);
+  EXPECT_FALSE(
+      http_app_browser->SupportsWindowFeature(Browser::FEATURE_LOCATIONBAR));
+  ui_test_utils::NavigateToURL(https_app_browser, url);
+  EXPECT_TRUE(
+      https_app_browser->SupportsWindowFeature(Browser::FEATURE_LOCATIONBAR));
+
+  // Navigate to different origin; the location bar should now be visible.
+  url = GURL("http://www.foo.com/blah");
+  ui_test_utils::NavigateToURL(http_app_browser, url);
+  EXPECT_TRUE(
+      http_app_browser->SupportsWindowFeature(Browser::FEATURE_LOCATIONBAR));
+  ui_test_utils::NavigateToURL(https_app_browser, url);
+  EXPECT_TRUE(
+      https_app_browser->SupportsWindowFeature(Browser::FEATURE_LOCATIONBAR));
+
+  // Navigate back to the app's origin; the location bar should now be hidden.
+  url = GURL("http://www.example.com/blah");
+  ui_test_utils::NavigateToURL(http_app_browser, url);
+  EXPECT_FALSE(
+      http_app_browser->SupportsWindowFeature(Browser::FEATURE_LOCATIONBAR));
+  url = GURL("https://www.example.com/blah");
+  ui_test_utils::NavigateToURL(https_app_browser, url);
+  EXPECT_FALSE(
+      https_app_browser->SupportsWindowFeature(Browser::FEATURE_LOCATIONBAR));
+}
 #endif
 
 // Open a normal browser window, a hosted app window, a legacy packaged app
 // window and a dev tools window, and check that the web app frame feature is
 // supported correctly.
 IN_PROC_BROWSER_TEST_F(BrowserTest, ShouldUseWebAppFrame) {
   ASSERT_TRUE(test_server()->Start());
   base::CommandLine::ForCurrentProcess()->AppendSwitch(
       switches::kEnableWebAppFrame);
 
@@ skipping 1379 matching lines @@
 #endif
   EXPECT_EQ(exp_commit_size, rwhv_commit_size2);
   EXPECT_EQ(exp_commit_size, wcv_commit_size2);
   gfx::Size exp_final_size(initial_wcv_size);
   exp_final_size.Enlarge(wcv_resize_insets.width(),
                          wcv_resize_insets.height() + height_inset);
   EXPECT_EQ(exp_final_size,
             web_contents->GetRenderWidgetHostView()->GetViewBounds().size());
   EXPECT_EQ(exp_final_size, web_contents->GetContainerBounds().size());
 }