10 files changed, 18 insertions, 17 deletions
diff --git a/AUTHORS b/AUTHORS
index 31dde10..ee8d7b3 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -242,6 +242,7 @@ Mohamed I. Hammad <ibraaaa@gmail.com>
 Mohamed Mansour <m0.interactive@gmail.com>
 Mrunal Kapade <mrunal.kapade@intel.com>
 Myles C. Maxfield <mymax@amazon.com>
+Naiem Shaik <naiem.shaik@gmail.com>
 Naoki Takano <takano.naoki@gmail.com>
 Naveen Bobbili <naveenbobbili@motorola.com>
 Naveen Bobbili <qghc36@motorola.com>
diff --git a/chrome/chrome_renderer.gypi b/chrome/chrome_renderer.gypi
index 9d6ef22..f90fe39 100644
--- a/chrome/chrome_renderer.gypi
+++ b/chrome/chrome_renderer.gypi
@@ -19,7 +19,7 @@
         '../components/components.gyp:startup_metric_utils',
         '../components/components.gyp:plugins_renderer',
         '../components/components.gyp:translate_core_common',
-        '../components/components.gyp:translate_language_detection',
+        '../components/components.gyp:translate_core_language_detection',
         '../components/components.gyp:visitedlink_renderer',
         '../content/content.gyp:content_renderer',
         '../extensions/extensions.gyp:extensions_renderer',
diff --git a/chrome/renderer/DEPS b/chrome/renderer/DEPS
index b607af8..d2a8594 100644
--- a/chrome/renderer/DEPS
+++ b/chrome/renderer/DEPS
@@ -9,7 +9,7 @@ include_rules = [
   "+components/signin/core/common",
   "+components/translate/content/common",
   "+components/translate/core/common",
-  "+components/translate/language_detection",
+  "+components/translate/core/language_detection",
   "+components/visitedlink/renderer",
   "+content/public/child",
   "+content/public/renderer",
diff --git a/chrome/renderer/translate/translate_helper.cc b/chrome/renderer/translate/translate_helper.cc
index 788dc73..f4af9dd 100644
--- a/chrome/renderer/translate/translate_helper.cc
+++ b/chrome/renderer/translate/translate_helper.cc
@@ -23,7 +23,7 @@
 #include "components/translate/core/common/translate_constants.h"
 #include "components/translate/core/common/translate_metrics.h"
 #include "components/translate/core/common/translate_util.h"
-#include "components/translate/language_detection/language_detection_util.h"
+#include "components/translate/core/language_detection/language_detection_util.h"
 #include "content/public/renderer/render_view.h"
 #include "extensions/common/constants.h"
 #include "extensions/renderer/extension_groups.h"
diff --git a/components/components_tests.gyp b/components/components_tests.gyp
index ebc37b1..f51868a 100644
--- a/components/components_tests.gyp
+++ b/components/components_tests.gyp
@@ -161,7 +161,7 @@
             'translate/core/browser/translate_script_unittest.cc',
             'translate/core/common/translate_metrics_unittest.cc',
             'translate/core/common/translate_util_unittest.cc',
-            'translate/language_detection/language_detection_util_unittest.cc',
+            'translate/core/language_detection/language_detection_util_unittest.cc',
             'url_matcher/regex_set_matcher_unittest.cc',
             'url_matcher/string_pattern_unittest.cc',
             'url_matcher/substring_set_matcher_unittest.cc',
@@ -281,7 +281,7 @@
             # Dependencies of translate.
             'components.gyp:translate_core_browser',
             'components.gyp:translate_core_common',
-            'components.gyp:translate_language_detection',
+            'components.gyp:translate_core_language_detection',
 
             # Dependencies of variations
             'components.gyp:variations',
diff --git a/components/translate.gypi b/components/translate.gypi
index dde833f..295ab96fcd 100644
--- a/components/translate.gypi
+++ b/components/translate.gypi
@@ -80,7 +80,7 @@
       ],
     },
     {
-      'target_name': 'translate_language_detection',
+      'target_name': 'translate_core_language_detection',
       'type': 'static_library',
       'dependencies': [
         'translate_core_common',
@@ -91,8 +91,8 @@
         '..',
       ],
       'sources': [
-        'translate/language_detection/language_detection_util.cc',
-        'translate/language_detection/language_detection_util.h',
+        'translate/core/language_detection/language_detection_util.cc',
+        'translate/core/language_detection/language_detection_util.h',
       ],
       'conditions': [
         ['cld_version==0 or cld_version==1', {
@@ -132,7 +132,7 @@
           'type': 'static_library',
           'dependencies': [
             'translate_core_common',
-            'translate_language_detection',
+            'translate_core_language_detection',
             '../base/base.gyp:base',
             '../content/content.gyp:content_common',
             '../ipc/ipc.gyp:ipc',
diff --git a/components/translate/language_detection/DEPS b/components/translate/core/language_detection/DEPS
index a8cdc15..a8cdc15 100644
--- a/components/translate/language_detection/DEPS
+++ b/components/translate/core/language_detection/DEPS
diff --git a/components/translate/language_detection/language_detection_util.cc b/components/translate/core/language_detection/language_detection_util.cc
index 5532112..0280aa6 100644
--- a/components/translate/language_detection/language_detection_util.cc
+++ b/components/translate/core/language_detection/language_detection_util.cc
@@ -1,8 +1,8 @@
-// Copyright 2013 The Chromium Authors. All rights reserved.
+// 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.
 
-#include "components/translate/language_detection/language_detection_util.h"
+#include "components/translate/core/language_detection/language_detection_util.h"
 
 #include "base/logging.h"
 #include "base/metrics/field_trial.h"
diff --git a/components/translate/language_detection/language_detection_util.h b/components/translate/core/language_detection/language_detection_util.h
index d7aa14d..aa3f0bc 100644
--- a/components/translate/language_detection/language_detection_util.h
+++ b/components/translate/core/language_detection/language_detection_util.h
@@ -1,9 +1,9 @@
-// Copyright 2013 The Chromium Authors. All rights reserved.
+// 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.
 
-#ifndef COMPONENTS_TRANSLATE_LANGUAGE_DETECTION_LANGUAGE_DETECTION_UTIL_H_
-#define COMPONENTS_TRANSLATE_LANGUAGE_DETECTION_LANGUAGE_DETECTION_UTIL_H_
+#ifndef COMPONENTS_TRANSLATE_CORE_LANGUAGE_DETECTION_LANGUAGE_DETECTION_UTIL_H_
+#define COMPONENTS_TRANSLATE_CORE_LANGUAGE_DETECTION_LANGUAGE_DETECTION_UTIL_H_
 
 #include <string>
 
@@ -41,4 +41,4 @@ bool MaybeServerWrongConfiguration(const std::string& page_language,
 
 }  // namespace translate
 
-#endif  // COMPONENTS_TRANSLATE_LANGUAGE_DETECTION_LANGUAGE_DETECTION_UTIL_H_
+#endif  // COMPONENTS_TRANSLATE_CORE_LANGUAGE_DETECTION_LANGUAGE_DETECTION_UTIL_H_
diff --git a/components/translate/language_detection/language_detection_util_unittest.cc b/components/translate/core/language_detection/language_detection_util_unittest.cc
index ba15fc8..135a759 100644
--- a/components/translate/language_detection/language_detection_util_unittest.cc
+++ b/components/translate/core/language_detection/language_detection_util_unittest.cc
@@ -1,8 +1,8 @@
-// Copyright 2013 The Chromium Authors. All rights reserved.
+// 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.
 
-#include "components/translate/language_detection/language_detection_util.h"
+#include "components/translate/core/language_detection/language_detection_util.h"
 
 #include "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"