Add a component updater for the CLD2 data file.

chrome/browser/translate/translate_tab_helper.cc

 // Copyright 2011 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/browser/translate/translate_tab_helper.h"
 
 #include "base/logging.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/string_split.h"
 #include "chrome/browser/chrome_notification_types.h"
@@ skipping 25 matching lines @@
 #if defined(CLD2_DYNAMIC_MODE)
 #include "base/files/file.h"
 #include "base/path_service.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_paths.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/render_view_host.h"
 #endif
 
+#if defined(CLD2_IS_COMPONENT)
+#include "chrome/browser/component_updater/cld_component_installer.h"
+#endif
+
 namespace {
 
 // The maximum number of attempts we'll do to see if the page has finshed
 // loading before giving up the translation
 const int kMaxTranslateLoadCheckAttempts = 20;
 
 }  // namespace
 
 DEFINE_WEB_CONTENTS_USER_DATA_KEY(TranslateTabHelper);
 
@@ skipping 324 matching lines @@
   DCHECK(!content::BrowserThread::CurrentlyOn(content::BrowserThread::IO));
   DCHECK(!content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
 
   {
     base::AutoLock lock(s_file_lock_.Get());
     if (s_cached_file_)
       return; // Already done, duplicate request
   }
 
   base::FilePath path;
+#if defined(CLD2_IS_COMPONENT)
+  if (!component_updater::GetLatestCldDataFile(&path))
+    return;
+#else
   if (!PathService::Get(chrome::DIR_USER_DATA, &path)) {
     LOG(WARNING) << "Unable to locate user data directory";
     return; // Chrome isn't properly installed.
   }
-
   // If the file exists, we can send an IPC-safe construct back to the
   // renderer process immediately.
   path = path.Append(chrome::kCLDDataFilename);
   if (!base::PathExists(path))
     return;
+#endif
 
   // Attempt to open the file for reading.
   scoped_ptr<base::File> file(
       new base::File(path, base::File::FLAG_OPEN | base::File::FLAG_READ));
   if (!file->IsValid()) {
     LOG(WARNING) << "CLD data file exists but cannot be opened";
     return;
   }
 
   base::File::Info file_info;
@@ skipping 112 matching lines @@
     if (GetLanguageState().InTranslateNavigation())
       return;
   }
 
   TranslateBubbleFactory::Show(
       browser->window(), web_contents(), step, error_type);
 #else
   NOTREACHED();
 #endif
 }