WebApp: Use GURL for WebApp::launch_url data member.

To ensure URL correctness.

Bug: 891172
Change-Id: If2fad77d59a3675f30c168e55c376a5c53d43262
Reviewed-on: https://chromium-review.googlesource.com/c/1325573
Commit-Queue: Alexey Baskakov <loyso@chromium.org>
Reviewed-by: Alan Cutter <alancutter@chromium.org>
Cr-Commit-Position: refs/heads/master@{#606356}

chrome/browser/web_applications/web_app.cc

@@ -4,6 +4,7 @@
 
 #include <ostream>
 
+#include "base/logging.h"
 #include "chrome/browser/web_applications/web_app.h"
 
 namespace web_app {
@@ -20,7 +21,8 @@ void WebApp::SetDescription(const std::string& description) {
   description_ = description;
 }
 
-void WebApp::SetLaunchUrl(const std::string& launch_url) {
+void WebApp::SetLaunchUrl(const GURL& launch_url) {
+  DCHECK(!launch_url.is_empty() && launch_url.is_valid());
   launch_url_ = launch_url;
 }
 

chrome/browser/web_applications/web_app.h

@@ -10,6 +10,7 @@
 
 #include "base/macros.h"
 #include "chrome/browser/web_applications/components/web_app_helpers.h"
+#include "url/gurl.h"
 
 namespace web_app {
 
@@ -22,18 +23,18 @@ class WebApp {
 
   const std::string& name() const { return name_; }
   const std::string& description() const { return description_; }
-  const std::string& launch_url() const { return launch_url_; }
+  const GURL& launch_url() const { return launch_url_; }
 
   void SetName(const std::string& name);
   void SetDescription(const std::string& description);
-  void SetLaunchUrl(const std::string& launch_url);
+  void SetLaunchUrl(const GURL& launch_url);
 
  private:
   const AppId app_id_;
 
   std::string name_;
   std::string description_;
-  std::string launch_url_;
+  GURL launch_url_;
 
   DISALLOW_COPY_AND_ASSIGN(WebApp);
 };

chrome/browser/web_applications/web_app_database.cc

@@ -66,7 +66,7 @@ std::unique_ptr<WebAppProto> WebAppDatabase::CreateWebAppProto(
   proto->set_app_id(web_app.app_id());
   proto->set_name(web_app.name());
   proto->set_description(web_app.description());
-  proto->set_launch_url(web_app.launch_url());
+  proto->set_launch_url(web_app.launch_url().spec());
 
   return proto;
 }
@@ -75,9 +75,16 @@ std::unique_ptr<WebAppProto> WebAppDatabase::CreateWebAppProto(
 std::unique_ptr<WebApp> WebAppDatabase::CreateWebApp(const WebAppProto& proto) {
   auto web_app = std::make_unique<WebApp>(proto.app_id());
 
+  GURL launch_url(proto.launch_url());
+  if (launch_url.is_empty() || !launch_url.is_valid()) {
+    LOG(ERROR) << "WebApp proto launch_url parse error: "
+               << launch_url.possibly_invalid_spec();
+    return nullptr;
+  }
+
+  web_app->SetLaunchUrl(launch_url);
   web_app->SetName(proto.name());
   web_app->SetDescription(proto.description());
-  web_app->SetLaunchUrl(proto.launch_url());
 
   return web_app;
 }

chrome/browser/web_applications/web_app_database_unittest.cc

@@ -79,7 +79,7 @@ class WebAppDatabaseTest : public testing::Test {
 
     app->SetName(name);
     app->SetDescription(description);
-    app->SetLaunchUrl(launch_url);
+    app->SetLaunchUrl(GURL(launch_url));
 
     return app;
   }

chrome/browser/web_applications/web_app_install_manager.cc

@@ -147,7 +147,7 @@ void WebAppInstallManager::OnDidPerformInstallableCheck(
 
   web_app->SetName(base::UTF16ToUTF8(web_app_info_->title));
   web_app->SetDescription(base::UTF16ToUTF8(web_app_info_->description));
-  web_app->SetLaunchUrl(web_app_info_->app_url.spec());
+  web_app->SetLaunchUrl(web_app_info_->app_url);
 
   registrar_->RegisterApp(std::move(web_app));
 

chrome/browser/web_applications/web_app_registrar_unittest.cc

@@ -64,7 +64,7 @@ TEST(WebAppRegistrar, CreateRegisterUnregister) {
 
   web_app->SetName(name);
   web_app->SetDescription(description);
-  web_app->SetLaunchUrl(launch_url.spec());
+  web_app->SetLaunchUrl(launch_url);
 
   EXPECT_EQ(nullptr, registrar->GetAppById(app_id));
   EXPECT_EQ(nullptr, registrar->GetAppById(app_id2));