Move the parsing of app.launch related keys out of Extension class.

chrome/browser/ui/tabs/tab_strip_model_unittest.cc

Index: chrome/browser/ui/tabs/tab_strip_model_unittest.cc
diff --git a/chrome/browser/ui/tabs/tab_strip_model_unittest.cc b/chrome/browser/ui/tabs/tab_strip_model_unittest.cc
index 0a0b9624e4729df33df10c3f988a858e14af9eb8..e6d273022d233d38bc442cd07810171393aa0c35 100644
--- a/chrome/browser/ui/tabs/tab_strip_model_unittest.cc
+++ b/chrome/browser/ui/tabs/tab_strip_model_unittest.cc
@@ -26,6 +26,7 @@
 #include "chrome/browser/ui/tabs/test_tab_strip_model_delegate.h"
 #include "chrome/browser/ui/webui/ntp/new_tab_ui.h"
 #include "chrome/common/chrome_notification_types.h"
+#include "chrome/common/extensions/app_launch_manifest_handler.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/test/base/chrome_render_view_host_test_harness.h"
@@ -112,6 +113,18 @@ class TabStripModelTest : public ChromeRenderViewHostTestHarness {
   TabStripModelTest() : browser_thread_(BrowserThread::UI, &message_loop_) {
   }
 
+  virtual void SetUp() OVERRIDE {
+    ChromeRenderViewHostTestHarness::SetUp();
+    std::vector<std::string> app_launch_keys(
+        extensions::AppLaunchManifestHandler::keys());
+    linked_ptr<extensions::AppLaunchManifestHandler> app_launch_handler(
+        new extensions::AppLaunchManifestHandler);
+    for (size_t i = 0; i < app_launch_keys.size(); ++i) {
+      extensions::ManifestHandler::Register(app_launch_keys[i],
+                                            app_launch_handler);
+    }
+  }

[Yoyo Zhou, 2013/02/27 02:43:33]

Please also add a TearDown() to call
ManifestHandler::ClearRegistryForTesting();

[Joe Thomas, 2013/03/01 23:26:57]

Done.

+
   WebContents* CreateWebContents() {
     return WebContents::Create(WebContents::CreateParams(profile()));
   }
@@ -1715,11 +1728,12 @@ TEST_F(TabStripModelTest, Apps) {
   DictionaryValue manifest;
   manifest.SetString("name", "hi!");
   manifest.SetString("version", "1");
+  manifest.SetString("app.launch.web_url", "http://www.google.com");
   std::string error;
   scoped_refptr<Extension> extension_app(
       Extension::Create(path, extensions::Manifest::INVALID_LOCATION,
                         manifest, Extension::NO_FLAGS, &error));
-  extension_app->launch_web_url_ = "http://www.google.com";
+
   WebContents* contents1 = CreateWebContents();
   extensions::TabHelper::CreateForWebContents(contents1);
   extensions::TabHelper::FromWebContents(contents1)->