Merge 145639 to M21 - Fix r145632.

chrome/common/chrome_content_client.cc

 // Copyright (c) 2012 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/common/chrome_content_client.h"
 
 #include "base/command_line.h"
 #include "base/cpu.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
@@ skipping 243 matching lines @@
   if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kPpapiFlashPath))
     return false;
 
   bool force_disable = CommandLine::ForCurrentProcess()->HasSwitch(
       switches::kDisableBundledPpapiFlash);
   if (force_disable)
     return false;
 
 // For Linux ia32, Flapper requires SSE2.
 #if defined(OS_LINUX) && defined(ARCH_CPU_X86)
-  if (!base::CPU()::has_sse2())
+  if (!base::CPU().has_sse2())
     return false;
 #endif  // ARCH_CPU_X86
 
   FilePath flash_path;
   if (!PathService::Get(chrome::FILE_PEPPER_FLASH_PLUGIN, &flash_path))
     return false;
   // It is an error to have FLAPPER_AVAILABLE defined but then not having the
   // plugin file in place, but this happens in Chrome OS builds.
   // Use --disable-bundled-ppapi-flash to skip this.
   DCHECK(file_util::PathExists(flash_path));
@@ skipping 232 matching lines @@
 
 bool ChromeContentClient::GetBundledFieldTrialPepperFlash(
     content::PepperPluginInfo* plugin,
     bool* override_npapi_flash) {
   if (!ConductingPepperFlashFieldTrial())
     return false;
   return GetBundledPepperFlash(plugin, override_npapi_flash);
 }
 
 }  // namespace chrome