Upstream ios/web_view source code.

ios/web_view/internal/criwv_web_client.mm

Index: ios/web_view/internal/criwv_web_client.mm
diff --git a/ios/web_view/internal/criwv_web_client.mm b/ios/web_view/internal/criwv_web_client.mm
new file mode 100644
index 0000000000000000000000000000000000000000..dc8abf014fa1e8811fb0e3f0ee1a991ea57f3ee0
--- /dev/null
+++ b/ios/web_view/internal/criwv_web_client.mm
@@ -0,0 +1,38 @@
+// Copyright 2014 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.
+
+#import "ios/web_view/internal/criwv_web_client.h"
+
+#include "base/strings/sys_string_conversions.h"
+#include "ios/web/public/user_agent.h"
+#include "ios/web_view/internal/criwv_browser_state.h"
+#import "ios/web_view/internal/criwv_web_main_parts.h"
+#import "ios/web_view/public/criwv_delegate.h"
+
+namespace ios_web_view {
+
+CRIWVWebClient::CRIWVWebClient(id<CRIWVDelegate> delegate)
+    : delegate_(delegate) {}
+
+CRIWVWebClient::~CRIWVWebClient() {}
+
+web::WebMainParts* CRIWVWebClient::CreateWebMainParts() {
+  web_main_parts_.reset(new CRIWVWebMainParts(delegate_));

[sdefresne, 2017/01/20 10:28:12]

This is seriously incorrect as this will cause two std::unique_ptr<> to owns the
same object.

Look, this is how web calls CreateWebMainParts:

  void WebMainLoop::Init() {
    parts_.reset(web::GetWebClient()->CreateWebMainParts());
  }

So the value returned by this factory method will be owned by WebMainLoop. It
should not be owned by CRIWVWebClient otherwise it will lead to undefined
behaviour when the last of those two objects is detroyed (I guess this never
happen currently because there is no clean shutdown of the app).

BTW, this is why factory method should be defined to return std::unique_ptr<> to
make it clear what code owns the object. Please fix CRIWVWebClient to not own
the object and create a bug to fix CreateWebMainParts() API.

[michaeldo, 2017/01/20 18:43:30]

Done. I've filed crbug.com/683207 to fix the return value.

+  return web_main_parts_.get();
+}
+
+CRIWVBrowserState* CRIWVWebClient::browser_state() const {
+  return web_main_parts_->browser_state();
+}
+
+std::string CRIWVWebClient::GetProduct() const {
+  return base::SysNSStringToUTF8([delegate_ partialUserAgent]);
+}
+
+std::string CRIWVWebClient::GetUserAgent(bool desktop_user_agent) const {
+  std::string product = GetProduct();
+  return web::BuildUserAgentFromProduct(product);
+}
+
+}  // namespace ios_web_view