Revert 48186, 48196, 48198

chrome/browser/extensions/extension_uitest.cc

-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2009 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 "base/command_line.h"
 #include "base/json/json_reader.h"
 #include "base/json/json_writer.h"
 #include "base/values.h"
 #include "chrome/browser/automation/extension_automation_constants.h"
 #include "chrome/browser/extensions/extension_tabs_module_constants.h"
 #include "chrome/common/chrome_switches.h"
@@ skipping 144 matching lines @@
   std::string result;
   ASSERT_TRUE(message_dict->GetString(keys::kAutomationNameKey, &result));
   EXPECT_EQ(result, "tabs.remove");
 
   result = "";
   ASSERT_TRUE(message_dict->GetString(keys::kAutomationArgsKey, &result));
   EXPECT_NE(result, "");
 
   int callback_id = 0xBAADF00D;
   message_dict->GetInteger(keys::kAutomationRequestIdKey, &callback_id);
-  EXPECT_NE(callback_id, static_cast<int>(0xBAADF00D));
+  EXPECT_NE(callback_id, 0xBAADF00D);
 
   bool has_callback = true;
   EXPECT_TRUE(message_dict->GetBoolean(keys::kAutomationHasCallbackKey,
                                        &has_callback));
   EXPECT_FALSE(has_callback);
 }
 
 // A test that loads a basic extension that makes an API call that does
 // not require a response.
 class ExtensionTestRoundtripApiCall : public ExtensionUITest {
@@ skipping 62 matching lines @@
       tab_->HandleMessageFromExternalHost(
         response_json,
         keys::kAutomationOrigin,
         keys::kAutomationResponseTarget);
     } else if (messages_received_ == 2) {
       EXPECT_EQ(function_name, "tabs.remove");
       EXPECT_FALSE(has_callback);
 
       std::string args;
       EXPECT_TRUE(request_dict->GetString(keys::kAutomationArgsKey, &args));
-      EXPECT_NE(std::string::npos, args.find("42"));
+      EXPECT_NE(args.find("42"), -1);
       loop_.Quit();
     } else {
       FAIL();
       loop_.Quit();
     }
   }
 
 private:
   int messages_received_;
   DISALLOW_COPY_AND_ASSIGN(ExtensionTestRoundtripApiCall);
@@ skipping 222 matching lines @@
   ASSERT_EQ(arraysize(events_), event_count_.size());
   for (std::map<std::string, int>::iterator i = event_count_.begin();
       i != event_count_.end(); ++i) {
     const std::pair<std::string, int>& value = *i;
     EXPECT_EQ(1, value.second);
   }
 }
 #endif  // defined(OS_WIN)
 
 }  // namespace