A Procter & Gamble potato chip brand will become part of Diamond Foods in a deal valued at $2.35 billion.