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

chrome/browser/ui/tabs/tab_strip_model_unittest.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/tabs/tab_strip_model.h"
 
 #include <map>
 #include <string>
 
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/path_service.h"
 #include "base/stl_util.h"
 #include "base/string_split.h"
 #include "base/string_util.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/defaults.h"
 #include "chrome/browser/extensions/tab_helper.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_tabstrip.h"
 #include "chrome/browser/ui/tabs/tab_strip_model_delegate.h"
 #include "chrome/browser/ui/tabs/tab_strip_model_order_controller.h"
 #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"
 #include "chrome/test/base/testing_profile.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/browser/render_process_host.h"
@@ skipping 66 matching lines @@
   int id_;
 };
 
 }  // namespace
 
 class TabStripModelTest : public ChromeRenderViewHostTestHarness {
  public:
   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()));
   }
 
   WebContents* CreateWebContentsWithSharedRPH(WebContents* web_contents) {
     WebContents::CreateParams create_params(
         profile(), web_contents->GetRenderViewHost()->GetSiteInstance());
     WebContents* retval = WebContents::Create(create_params);
     EXPECT_EQ(retval->GetRenderProcessHost(),
               web_contents->GetRenderProcessHost());
@@ skipping 1583 matching lines @@
 
 #if defined(OS_WIN)
   base::FilePath path(FILE_PATH_LITERAL("c:\\foo"));
 #elif defined(OS_POSIX)
   base::FilePath path(FILE_PATH_LITERAL("/foo"));
 #endif
 
   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)->
       SetExtensionApp(extension_app);
   WebContents* contents2 = CreateWebContents();
   extensions::TabHelper::CreateForWebContents(contents2);
   extensions::TabHelper::FromWebContents(contents2)->
       SetExtensionApp(extension_app);
   WebContents* contents3 = CreateWebContents();
 
@@ skipping 600 matching lines @@
   strip.ActivateTabAt(1, true);
   ASSERT_EQ(1, observer.GetStateCount());
   State s(contents2, 1, MockTabStripModelObserver::SELECT);
   s.src_contents = contents2;
   s.src_index = 1;
   s.user_gesture = false;
   EXPECT_TRUE(observer.StateEquals(0, s));
   strip.RemoveObserver(&observer);
   strip.CloseAllTabs();
 }