Convert GetSearchProviderInstallState to Mojo

chrome/renderer/external_extension.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/renderer/external_extension.h"
 
 #include <stdint.h>
 
 #include "base/macros.h"
 #include "chrome/common/render_messages.h"

[Sam McNally, 2016/06/23 03:05:35]

Remove.

[tibell, 2016/06/23 03:44:39]

Done.

 #include "chrome/common/search_provider.h"

[Sam McNally, 2016/06/23 03:05:36]

Remove.

[tibell, 2016/06/23 03:44:39]

Done.

+#include "chrome/common/search_provider.mojom.h"
+#include "content/public/common/service_registry.h"

[Sam McNally, 2016/06/23 03:05:35]

Remove.

[tibell, 2016/06/23 03:44:39]

Done.

+#include "content/public/renderer/render_thread.h"
 #include "content/public/renderer/render_view.h"

[Sam McNally, 2016/06/23 03:05:36]

Remove.

[tibell, 2016/06/23 03:44:39]

Done.

+#include "services/shell/public/cpp/interface_provider.h"
 #include "third_party/WebKit/public/web/WebDocument.h"
 #include "third_party/WebKit/public/web/WebLocalFrame.h"
 #include "third_party/WebKit/public/web/WebView.h"

[Sam McNally, 2016/06/23 03:05:36]

Remove.

[tibell, 2016/06/23 03:44:39]

Done.

 #include "v8/include/v8.h"
 
 using blink::WebLocalFrame;
 using blink::WebView;
 using content::RenderView;
 
 namespace extensions_v8 {
 
 namespace {
 
@@ skipping 66 matching lines @@
 void ExternalExtensionWrapper::IsSearchProviderInstalled(
     const v8::FunctionCallbackInfo<v8::Value>& args) {
   if (!args.Length() || !args[0]->IsString())
     return;
 
   v8::String::Utf8Value utf8name(args[0]);
   if (!utf8name.length())
     return;
 
   std::string name(*utf8name);
   RenderView* render_view = GetRenderView();

[Sam McNally, 2016/06/23 03:05:36]

Remove this and GetRenderView().

[tibell, 2016/06/23 03:44:39]

Done.

   if (!render_view)
     return;
 
   WebLocalFrame* webframe = WebLocalFrame::frameForCurrentContext();
   if (!webframe)
     return;
 
-  search_provider::InstallState install = search_provider::DENIED;
+  chrome::mojom::InstallState install = chrome::mojom::InstallState::DENIED;
   GURL inquiry_url = GURL(webframe->document().url()).Resolve(name);
   if (!inquiry_url.is_empty()) {
     webframe->didCallIsSearchProviderInstalled();
-    render_view->Send(new ChromeViewHostMsg_GetSearchProviderInstallState(
-        render_view->GetRoutingID(), webframe->document().url(), inquiry_url,
-        &install));
+    chrome::mojom::SearchProviderInstallStatePtr search_provider_service;
+    content::RenderThread::Get()->GetRemoteInterfaces()->GetInterface(
+        mojo::GetProxy(&search_provider_service));
+    if (!search_provider_service->GetInstallState(webframe->document().url(),
+                                                  inquiry_url, &install)) {
+      DLOG(ERROR) << "Can't fetch search provider install state";
+    }
   }
 
-  if (install == search_provider::DENIED) {
+  if (install == chrome::mojom::InstallState::DENIED) {
     // FIXME: throw access denied exception.
     v8::Isolate* isolate = args.GetIsolate();
     isolate->ThrowException(v8::Exception::Error(v8::String::Empty(isolate)));
     return;
   }
   args.GetReturnValue().Set(static_cast<int32_t>(install));
 }
 
 v8::Extension* ExternalExtension::Get() {
   return new ExternalExtensionWrapper();
 }
 
 }  // namespace extensions_v8