Allow browser tests to run with dynamic CLD data.

chrome/browser/component_updater/cld_component_installer.cc

 // 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 "chrome/browser/component_updater/cld_component_installer.h"
 
 #include <string>
 #include <vector>
 
 #include "base/bind.h"
@@ skipping 11 matching lines @@
 
 using component_updater::ComponentUpdateService;
 using content::BrowserThread;
 
 namespace {
 
 // Once we have acquired a valid file from the component installer, we need to
 // make the path available to other parts of the system such as the
 // translation libraries. We create a global to hold onto the path, and a
 // lock to guard it. See GetLatestCldDataFile(...) for more info.
-base::LazyInstance<base::Lock> cld_file_lock = LAZY_INSTANCE_INITIALIZER;
-base::LazyInstance<base::FilePath> cld_file = LAZY_INSTANCE_INITIALIZER;
+static base::LazyInstance<base::Lock> cld_file_lock = LAZY_INSTANCE_INITIALIZER;

[Sorin Jianu, 2014/05/15 17:16:13]

Is there a reason we have the static keyword here?

In general static is not needed in these declarations (these members already
have file scope and their visibility is restricted to this module due to the
anon namespace).

[Andrew Hayden (chromium.org), 2014/05/16 17:53:20]

Done.

+static base::LazyInstance<base::FilePath> cld_file = LAZY_INSTANCE_INITIALIZER;
 
 }
 
 namespace component_updater {
 
 // The SHA256 of the SubjectPublicKeyInfo used to sign the extension.
 // The extension id is: dpedmmgabcgnikllifiidmijgoiihfgf
 const uint8 kPublicKeySHA256[32] = {
     0x3f, 0x43, 0xcc, 0x60, 0x12, 0x6d, 0x8a, 0xbb,
     0x85, 0x88, 0x3c, 0x89, 0x6e, 0x88, 0x75, 0x65,
@@ skipping 79 matching lines @@
 }
 
 base::FilePath GetLatestCldDataFile() {
   base::AutoLock lock(cld_file_lock.Get());
   // cld_file is an empty path by default, meaning "file not available yet",
   // so we can simply return by value (making a copy).
   return cld_file.Get();
 }
 
 }  // namespace component_updater