Move Tuple to base namespace.

Namespace change only, no functionality change.

The only non-search-and-replace change is in generate_gmock_mutant.py which changes some line wrapping logic for the generated gmock_mutant header.

NOPRESUBMIT=true
(No presubmit due to long lines in the generated gmock_mutant.h header).
R=sky

Review URL: https://codereview.chromium.org/1159553007

Cr-Commit-Position: refs/heads/master@{#332058}

4 files changed, 6 insertions, 6 deletions

diff --git a/extensions/browser/api/alarms/alarms_api_unittest.cc b/extensions/browser/api/alarms/alarms_api_unittest.cc
index 541b8ff..6f9b26441 100644
--- a/extensions/browser/api/alarms/alarms_api_unittest.cc
+++ b/extensions/browser/api/alarms/alarms_api_unittest.cc
@@ -297,8 +297,8 @@ TEST_F(ExtensionAlarmsTest, CreateDelayBelowMinimum) {
   ASSERT_TRUE(warning);
   ExtensionMsg_AddMessageToConsole::Param params;
   ExtensionMsg_AddMessageToConsole::Read(warning, &params);
-  content::ConsoleMessageLevel level = get<0>(params);
-  std::string message = get<1>(params);
+  content::ConsoleMessageLevel level = base::get<0>(params);
+  std::string message = base::get<1>(params);
   EXPECT_EQ(content::CONSOLE_MESSAGE_LEVEL_WARNING, level);
   EXPECT_THAT(message, testing::HasSubstr("delay is less than minimum of 1"));
 }
diff --git a/extensions/browser/sandboxed_unpacker.cc b/extensions/browser/sandboxed_unpacker.cc
index de7267f..38a7cd9a 100644
--- a/extensions/browser/sandboxed_unpacker.cc
+++ b/extensions/browser/sandboxed_unpacker.cc
@@ -742,8 +742,8 @@ bool SandboxedUnpacker::RewriteImageFiles(SkBitmap* install_icon) {
       return false;
     }
 
-    const SkBitmap& image = get<0>(images[i]);
-    base::FilePath path_suffix = get<1>(images[i]);
+    const SkBitmap& image = base::get<0>(images[i]);
+    base::FilePath path_suffix = base::get<1>(images[i]);
     if (path_suffix.MaybeAsASCII() == install_icon_path)
       *install_icon = image;
 
diff --git a/extensions/common/extension_utility_messages.h b/extensions/common/extension_utility_messages.h
index 8c0fd30..1d14047 100644
--- a/extensions/common/extension_utility_messages.h
+++ b/extensions/common/extension_utility_messages.h
@@ -16,7 +16,7 @@
 #ifndef EXTENSIONS_COMMON_EXTENSION_UTILITY_MESSAGES_H_
 #define EXTENSIONS_COMMON_EXTENSION_UTILITY_MESSAGES_H_
 
-typedef std::vector<Tuple<SkBitmap, base::FilePath>> DecodedImages;
+typedef std::vector<base::Tuple<SkBitmap, base::FilePath>> DecodedImages;
 
 #endif  //  EXTENSIONS_COMMON_EXTENSION_UTILITY_MESSAGES_H_
 
diff --git a/extensions/utility/unpacker.cc b/extensions/utility/unpacker.cc
index c61faa2..a65aabb 100644
--- a/extensions/utility/unpacker.cc
+++ b/extensions/utility/unpacker.cc
@@ -264,7 +264,7 @@ bool Unpacker::AddDecodedImage(const base::FilePath& path) {
     return false;
   }
 
-  internal_data_->decoded_images.push_back(MakeTuple(image_bitmap, path));
+  internal_data_->decoded_images.push_back(base::MakeTuple(image_bitmap, path));
   return true;
 }