Set Browser::app_name_ in a reasonable way for extension apps.

chrome/browser/browser_browsertest.cc

 // 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.
 
 #include <string>
 
 #include "app/l10n_util.h"
 #include "base/compiler_specific.h"
 #include "base/file_path.h"
 #include "base/sys_info.h"
@@ skipping 397 matching lines @@
   ASSERT_EQ(initial_tab, browser()->GetTabContentsAt(0));
 
   // Check that the appliaction browser has a single tab, and that tab contains
   // the content that we app-ified.
   ASSERT_EQ(1, app_browser->tab_count());
   ASSERT_EQ(app_tab, app_browser->GetTabContentsAt(0));
 
   // Normal tabs should accept load drops.
   EXPECT_TRUE(initial_tab->GetMutableRendererPrefs()->can_accept_load_drops);
 
-  // The tab in an aopp window should not.
+  // The tab in an app window should not.
   EXPECT_FALSE(app_tab->GetMutableRendererPrefs()->can_accept_load_drops);
 }
 
 #endif  // !defined(OS_MACOSX)
 
 // Test RenderView correctly send back favicon url for web page that redirects
 // to an anchor in javascript body.onload handler.
 IN_PROC_BROWSER_TEST_F(BrowserTest, FaviconOfOnloadRedirectToAnchorPage) {
   ASSERT_TRUE(test_server()->Start());
   GURL url(test_server()->GetURL("files/onload_redirect_to_anchor.html"));
@@ skipping 55 matching lines @@
   ExtensionService* service = browser()->profile()->GetExtensionService();
   service->UninstallExtension(GetExtension()->id(), false);
   EXPECT_EQ(1, observer.closing_count());
 
   model->RemoveObserver(&observer);
 
   // There should only be one tab now.
   ASSERT_EQ(1, browser()->tab_count());
 }
 
+#if !defined(OS_MACOSX)
+// Open with --app-id=<id>, and see that an app window opens.
+IN_PROC_BROWSER_TEST_F(BrowserTest, AppIdSwitch) {
+  ASSERT_TRUE(test_server()->Start());
+
+  // Load an app.
+  host_resolver()->AddRule("www.example.com", "127.0.0.1");
+  ASSERT_TRUE(LoadExtension(test_data_dir_.AppendASCII("app/")));
+  const Extension* extension_app = GetExtension();
+
+  CommandLine command_line(CommandLine::NO_PROGRAM);
+  command_line.AppendSwitchASCII(switches::kAppId, extension_app->id());
+
+  BrowserInit::LaunchWithProfile launch(FilePath(), command_line);
+  ASSERT_TRUE(launch.OpenApplicationWindow(browser()->profile()));
+
+  // Check that the new browser has an app name.
+  // The launch should have created a new browser.
+  ASSERT_EQ(2u, BrowserList::GetBrowserCount(browser()->profile()));
+
+  // Find the new browser.
+  Browser* new_browser = NULL;
+  for (BrowserList::const_iterator i = BrowserList::begin();
+       i != BrowserList::end() && !new_browser; ++i) {
+    if (*i != browser())
+      new_browser = *i;
+  }
+  ASSERT_TRUE(new_browser);
+  ASSERT_TRUE(new_browser != browser());
+
+  // The browser's app_name should include the app's ID.
+  ASSERT_NE(
+      new_browser->app_name_.find(extension_app->id()),
+      std::string::npos) << new_browser->app_name_;
+
+}
+#endif
+
 #if defined(OS_WIN)
 // http://crbug.com/46198. On XP/Vista, the failure rate is 5 ~ 6%.
 #define MAYBE_PageLanguageDetection FLAKY_PageLanguageDetection
 #else
 #define MAYBE_PageLanguageDetection PageLanguageDetection
 #endif
 // Tests that the CLD (Compact Language Detection) works properly.
 IN_PROC_BROWSER_TEST_F(BrowserTest, MAYBE_PageLanguageDetection) {
   ASSERT_TRUE(test_server()->Start());
 
@@ skipping 139 matching lines @@
   Browser* new_browser = NULL;
   for (BrowserList::const_iterator i = BrowserList::begin();
        i != BrowserList::end() && !new_browser; ++i) {
     if (*i != browser())
       new_browser = *i;
   }
   ASSERT_TRUE(new_browser);
   ASSERT_TRUE(new_browser != browser());
 
   EXPECT_EQ(Browser::TYPE_APP, new_browser->type());
+
+  // The browser's app name should include the extension's id.
+  std::string app_name = new_browser->app_name_;
+  EXPECT_NE(app_name.find(extension_app->id()), std::string::npos)
+      << "Name " << app_name << " should contain id "<< extension_app->id();
 }
 #endif  // !defined(OS_MACOSX)
 
 // TODO(ben): this test was never enabled. It has bit-rotted since being added.
 // It originally lived in browser_unittest.cc, but has been moved here to make
 // room for real browser unit tests.
 #if 0
 class BrowserTest2 : public InProcessBrowserTest {
  public:
   BrowserTest2() {
@@ skipping 67 matching lines @@
 
   // The normal browser should now have four.
   EXPECT_EQ(4, browser()->tab_count());
 
   // Close the additional browsers.
   popup_browser->CloseAllTabs();
   app_browser->CloseAllTabs();
   app_popup_browser->CloseAllTabs();
 }
 #endif