Added simple url fixer for blimp toolbar

blimp/client/app/android/toolbar.cc

 // Copyright 2015 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 "blimp/client/app/android/toolbar.h"
 
 #include "base/android/jni_string.h"
 #include "blimp/client/app/android/blimp_client_session_android.h"
+#include "components/url_formatter/url_fixer.h"
 #include "jni/Toolbar_jni.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/gfx/android/java_bitmap.h"
 #include "url/gurl.h"
 
 namespace blimp {
 namespace client {
 
 namespace {
 
@@ skipping 30 matching lines @@
   navigation_feature_->RemoveDelegate(kDummyTabId);
 }
 
 void Toolbar::Destroy(JNIEnv* env, const JavaParamRef<jobject>& jobj) {
   delete this;
 }
 
 void Toolbar::OnUrlTextEntered(JNIEnv* env,
                                const JavaParamRef<jobject>& jobj,
                                const JavaParamRef<jstring>& text) {
-  navigation_feature_->NavigateToUrlText(
-      kDummyTabId, base::android::ConvertJavaStringToUTF8(env, text));
+  std::string url = base::android::ConvertJavaStringToUTF8(env, text);
+
+  // Build a search query, if |url| doesn't have a '.' anywhere.
+  if (url.find(".") == std::string::npos)
+    url = "http://www.google.com/search?q=" + url;
+
+  GURL fixed_url = url_formatter::FixupURL(url, std::string());
+  navigation_feature_->NavigateToUrlText(kDummyTabId, fixed_url.spec());
 }
 
 void Toolbar::OnReloadPressed(JNIEnv* env, const JavaParamRef<jobject>& jobj) {
   navigation_feature_->Reload(kDummyTabId);
 }
 
 void Toolbar::OnForwardPressed(JNIEnv* env, const JavaParamRef<jobject>& jobj) {
   navigation_feature_->GoForward(kDummyTabId);
 }
 
@@ skipping 41 matching lines @@
   JNIEnv* env = base::android::AttachCurrentThread();
 
   Java_Toolbar_onEngineSentPageLoadStatusUpdate(
       env,
       java_obj_.obj(),
       static_cast<jboolean>(completed));
 }
 
 }  // namespace client
 }  // namespace blimp