Add the Chrome version as one of the things we check to see if...

ceee/ie/common/ceee_module_util_unittest.cc

 // Copyright (c) 2010 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.
 //
 // Unit tests for the CEEE module-wide utilities.
 
 #include "ceee/ie/common/ceee_module_util.h"
 
 #include <wtypes.h>
 #include <string>
 
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/path_service.h"
 #include "base/win/registry.h"
 #include "base/string_util.h"
 #include "ceee/common/process_utils_win.h"
 #include "ceee/ie/testing/mock_broker_and_friends.h"
 #include "ceee/testing/utils/mock_com.h"
 #include "ceee/testing/utils/mock_window_utils.h"
 #include "ceee/testing/utils/mock_win32.h"
 #include "ceee/testing/utils/test_utils.h"
 #include "chrome/installer/util/google_update_constants.h"
-#include "testing/gmock/include/gmock/gmock.h"
-#include "testing/gtest/include/gtest/gtest.h"
+#include "gmock/gmock.h"
+#include "gtest/gtest.h"
 
 namespace {
 
 using testing::_;
 using testing::DoAll;
 using testing::NotNull;
 using testing::SetArgumentPointee;
 using testing::StrictMock;
 using testing::Return;
 
@@ skipping 86 matching lines @@
   ASSERT_TRUE(file_util::CreateTemporaryFileInDir(full_path, &temp_file_path));
   ASSERT_TRUE(file_util::Move(temp_file_path, crx_path));
   EXPECT_CALL(mock_path, Get(base::DIR_PROGRAM_FILES, NotNull())).
       WillOnce(DoAll(SetArgumentPointee<1>(temp_path), Return(true)));
   EXPECT_EQ(crx_path.value(), cmu::GetExtensionPath());
 
   // Clean up.
   file_util::Delete(temp_path, true);
 }
 
-TEST_F(CeeeModuleUtilTest, ExtensionPathTest) {
+// http://code.google.com/p/chromium/issues/detail?id=62856
+TEST_F(CeeeModuleUtilTest, FLAKY_ExtensionPathTest) {
   namespace cmu = ceee_module_util;
 
   // The FilePath::Get method shouldn't be called if we take the value
   // from the registry.
   StrictMock<MockPathService> mock_path;
 
   // Creates a registry key
   base::win::RegKey hkcu(HKEY_CURRENT_USER, L"SOFTWARE\\Google\\CEEE",
                          KEY_WRITE);
   base::win::RegKey hklm(HKEY_LOCAL_MACHINE, L"SOFTWARE\\Google\\CEEE",
@@ skipping 134 matching lines @@
   ASSERT_TRUE(ceee_module_util::GetCollectStatsConsent());
 
   ASSERT_TRUE(hkcu.WriteValue(google_update::kRegUsageStatsField, kFalse));
   EXPECT_FALSE(ceee_module_util::GetCollectStatsConsent());
 
   ASSERT_TRUE(hkcu.DeleteValue(google_update::kRegUsageStatsField));
   ASSERT_TRUE(hklm.DeleteValue(google_update::kRegUsageStatsField));
 }
 
 }  // namespace